Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
#	Translations/WinMerge/Japanese.po

diff --cc Src/MainFrm.cpp
Simple merge

diff --cc Src/Merge.rc
Simple merge

diff --cc Src/OptionsDef.h
Simple merge

diff --cc Src/OptionsInit.cpp
Simple merge

diff --cc Src/resource.h
Simple merge

diff --cc Translations/WinMerge/Arabic.po
Simple merge

diff --cc Translations/WinMerge/Basque.po
Simple merge

diff --cc Translations/WinMerge/Brazilian.po
Simple merge

diff --cc Translations/WinMerge/Bulgarian.po
Simple merge

diff --cc Translations/WinMerge/Catalan.po
Simple merge

diff --cc Translations/WinMerge/ChineseSimplified.po
Simple merge

diff --cc Translations/WinMerge/ChineseTraditional.po
Simple merge

diff --cc Translations/WinMerge/Croatian.po
Simple merge

diff --cc Translations/WinMerge/Czech.po
Simple merge

diff --cc Translations/WinMerge/Danish.po
Simple merge

diff --cc Translations/WinMerge/Dutch.po
Simple merge

diff --cc Translations/WinMerge/English.pot
Simple merge

diff --cc Translations/WinMerge/Finnish.po
Simple merge

diff --cc Translations/WinMerge/French.po
Simple merge

diff --cc Translations/WinMerge/Galician.po
Simple merge

diff --cc Translations/WinMerge/German.po
Simple merge

diff --cc Translations/WinMerge/Greek.po
Simple merge

diff --cc Translations/WinMerge/Hungarian.po
Simple merge

diff --cc Translations/WinMerge/Italian.po
Simple merge

diff --cc Translations/WinMerge/Japanese.po
Simple merge

diff --cc Translations/WinMerge/Korean.po
Simple merge

diff --cc Translations/WinMerge/Lithuanian.po
Simple merge

diff --cc Translations/WinMerge/Norwegian.po
Simple merge

diff --cc Translations/WinMerge/Persian.po
Simple merge

diff --cc Translations/WinMerge/Polish.po
Simple merge

diff --cc Translations/WinMerge/Portuguese.po
Simple merge

diff --cc Translations/WinMerge/Romanian.po
Simple merge

diff --cc Translations/WinMerge/Russian.po
Simple merge

diff --cc Translations/WinMerge/Serbian.po
Simple merge

diff --cc Translations/WinMerge/Sinhala.po
Simple merge

diff --cc Translations/WinMerge/Slovak.po
Simple merge

diff --cc Translations/WinMerge/Slovenian.po
Simple merge

diff --cc Translations/WinMerge/Spanish.po
Simple merge

diff --cc Translations/WinMerge/Swedish.po
Simple merge

diff --cc Translations/WinMerge/Turkish.po
Simple merge

diff --cc Translations/WinMerge/Ukrainian.po
Simple merge