Merge with stable

--HG--
branch : jp

diff --cc .hgignore
index db59516,5a12e55..333f8ea
--- 1/.hgignore
--- 2/.hgignore
+++ b/.hgignore
@@@ -70,4 -77,4 +77,5 @@@ Docs/Users/Manual/build/saxo
  Docs/Users/Manual/build/xsl\r
  Docs/Users/Manual/build/xerces\r
  Docs/Users/Manual/build/Version.txt\r
 +Docs/Users/Manual/build/docbook\r
+ winmerge-cppcheck-build-dir\r

diff --cc DownloadDeps.cmd
index 7491473,5fc70cc..f67ff66
--- 1/DownloadDeps.cmd
--- 2/DownloadDeps.cmd
+++ b/DownloadDeps.cmd
@@@ -2,8 -2,8 +2,8 @@@ 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/ShellExtension-1.17.5.0.zip!Build ^
  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 ^

diff --cc Src/MainFrm.cpp
Simple merge

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

diff --cc Translations/WinMerge/Russian.po
index 14ea845,28093df..b44d917
--- 1/Translations/WinMerge/Russian.po
--- 2/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@@ -1687,9 -1684,9 +1688,9 @@@ msgstr "Включить маркеры
  #: Merge.rc:24A380
  #, c-format
  msgid "New"
- msgstr "Ð\9dовÑ\8bй"
+ msgstr "СоздаÑ\82Ñ\8c"
  
 -#: Merge.rc:3938FFC4
 +#: Merge.rc:3938FFC5
  #, c-format
  msgid "&Background color:"
  msgstr "Цвет фона:"