Merge with stable

--HG--
branch : jp

diff --cc BuildArc.cmd
Simple merge

diff --cc DownloadDeps.cmd
index e5ac33e,7d53cc4..7491473
--- 1/DownloadDeps.cmd
--- 2/DownloadDeps.cmd
+++ b/DownloadDeps.cmd
@@@ -2,10 -2,10 +2,10 @@@ setloca
  set path="%ProgramFiles%\7-zip";"%ProgramFiles(x86)%\7-zip";%path%
  set downloadsdir=%~dp0\build\WinMergeDownloadDeps
  set urls_destdirs=^
 -https://bitbucket.org/winmerge/winmerge/downloads/winmerge_manual_build_tools_v1.zip!Docs\Users\Manual\build ^
 +https://bitbucket.org/sdottaka/winmerge-v2/downloads/winmerge_manual_another_build_tools_v1.zip!Docs\Users\Manual\build ^
  https://bitbucket.org/winmerge/winmerge/downloads/ShellExtension-1.17.4.0.zip!Build ^
- https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1805.1-win32.zip!Build ^
- https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1805.1-x64.zip!Build\X64 ^
+ https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1806.1-win32.zip!Build ^
+ https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1806.1-x64.zip!Build\X64 ^
  https://bitbucket.org/winmerge/frhed/downloads/frhed-0.10904.2017.1-win32.zip!Build ^
  https://bitbucket.org/winmerge/frhed/downloads/frhed-0.10904.2017.1-x64.zip!Build\X64 ^
  https://bitbucket.org/winmerge/winimerge/downloads/winimerge-1-0-7-0-exe.zip!Build ^

diff --cc Installer/InnoSetup/WinMerge.iss
Simple merge

diff --cc Installer/InnoSetup/WinMergeX64.iss
Simple merge

diff --cc Src/MainFrm.h
Simple merge

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