Merge branch 'master' of https://github.com/winmerge/winmerge into jp

diff --cc BuildArc.cmd
Simple merge

diff --cc Src/MainFrm.cpp
index dc17597,7616761..91b96a0
--- 1/Src/MainFrm.cpp
--- 2/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@@ -2327,69 -2319,9 +2321,69 @@@ void CMainFrame::OnHelpReleasenotes(
   */
  void CMainFrame::OnHelpTranslations()
  {
-       ShellExecute(nullptr, _T("open"), TranslationsUrl, nullptr, nullptr, SW_SHOWNORMAL);
+       shell::Open(TranslationsUrl);
  }
  
 +void CMainFrame::OnHelpCheckForUpdates()
 +{
 +      CVersionInfo version(AfxGetResourceHandle());
 +      CInternetSession session;
 +      try
 +      {
 +              CHttpFile *file = (CHttpFile *)session.OpenURL(GetOptionsMgr()->GetString(OPT_CURRENT_VERSION_URL).c_str());
 +              if (!file)
 +                      return;
 +              char buf[256] = { 0 };
 +              file->Read(buf, sizeof(buf));
 +              file->Close();
 +              String current_version = ucr::toTString(buf);
 +              strutils::replace(current_version, _T("\r\n"), _T(""));
 +              delete file;
 +
 +              int exe_vers[4] = { 0 }, cur_vers[4] = { 0 };
 +              _stscanf_s(version.GetProductVersion().c_str(), _T("%d.%d.%d.%d"), &exe_vers[0], &exe_vers[1], &exe_vers[2], &exe_vers[3]);
 +              _stscanf_s(current_version.c_str(),             _T("%d.%d.%d.%d"), &cur_vers[0], &cur_vers[1], &cur_vers[2], &cur_vers[3]);
 +              String exe_version_hex = strutils::format(_T("%08x%08x%08x%08x"), exe_vers[0], exe_vers[1], exe_vers[2], exe_vers[3]);
 +              String cur_version_hex = strutils::format(_T("%08x%08x%08x%08x"), cur_vers[0], cur_vers[1], cur_vers[2], cur_vers[3]);
 +
 +              switch (exe_version_hex.compare(cur_version_hex))
 +              {
 +              case 1:
 +                      if (cur_version_hex == _T("00000000000000000000000000000000"))
 +                      {
 +                              String msg = _("Failed to download latest version information");
 +                              AfxMessageBox(msg.c_str(), MB_ICONERROR);
 +                              break;
 +                      }
 +                      // pass through
 +              case 0:
 +              {
 +                      String msg = _("Your software is up to date.");
 +                      AfxMessageBox(msg.c_str(), MB_ICONINFORMATION);
 +                      break;
 +              }
 +              case -1:
 +              {
 +                      String msg = strutils::format_string2(_("A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?"), current_version, version.GetProductVersion());
 +                      if (AfxMessageBox(msg.c_str(), MB_ICONINFORMATION | MB_YESNO) == IDYES)
 +                              ShellExecute(NULL, _T("open"), GetOptionsMgr()->GetString(OPT_DOWNLOAD_URL).c_str(), NULL, NULL, SW_SHOWNORMAL);
 +                      break;
 +              }
 +              }
 +      }
 +      catch (CException& e)
 +      {
 +              TCHAR msg[512];
 +              e.GetErrorMessage(msg, sizeof(msg)/sizeof(msg[0]));
 +              AfxMessageBox(msg, MB_ICONERROR);
 +      }
 +}
 +
 +void CMainFrame::OnUpdateHelpCheckForUpdates(CCmdUI* pCmdUI)
 +{
 +      pCmdUI->Enable(!GetOptionsMgr()->GetString(OPT_CURRENT_VERSION_URL).empty());
 +}
 +
  /**
   * @brief Called when user selects File/Open Conflict...
   */

diff --cc Src/MainFrm.h
Simple merge

diff --cc Src/Merge.rc
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