Restore merge logging from Aaron's commit

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6781 b0d8beef-cb45-0410-a8e4-c0d495c3b779
STM now reports diff vs "theirs", not "base"

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6782 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Solve ID and link issues

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6783 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Mention Russian as a usable languages for TaaS

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6784 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Edit small typos

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6785 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Update documentation

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6786 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Font antialiasing 
https://sourceforge.net/p/omegat/documentation/314/

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6787 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Using TMX with alternative language pairs
https://sourceforge.net/p/omegat/documentation/265/

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6788 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Update documentation

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6789 b0d8beef-cb45-0410-a8e4-c0d495c3b779
RFE #1041: show dialog for unknown SVN errors

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6790 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Show dialog for unsupported SVN errors 
https://sourceforge.net/p/omegat/feature-requests/1041/

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6791 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Update SuperTMXMerge source

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6792 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Update translation

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6793 b0d8beef-cb45-0410-a8e4-c0d495c3b779
From Enrique Estevez:
PO comments also included as source text 
https://sourceforge.net/p/omegat/bugs/705/

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6794 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Update Japanese translation (UI)

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6795 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Allow configurable diff-style colours in fuzzy matching 
https://sourceforge.net/p/omegat/feature-requests/900/

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6796 b0d8beef-cb45-0410-a8e4-c0d495c3b779
From Alex:
Detailed debugging message for team project situation that is not supposed to happen, but yet happens sometimes

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6797 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Update copyright

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6798 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Update the Mac specific instructions to reflect changes since 3.0.8 update 2

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6799 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Update documentation

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6800 b0d8beef-cb45-0410-a8e4-c0d495c3b779