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

# Conflicts:
#	SetVersion.cmd
#	Src/Constants.h
#	Version.h

diff --cc BuildArc.cmd
Simple merge

diff --cc Installer/InnoSetup/WinMergeARM64.is6.iss
Simple merge

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

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

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

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

diff --cc SetVersion.cmd
index 8a88d28,a76754a..62eed16
--- 1/SetVersion.cmd
--- 2/SetVersion.cmd
+++ b/SetVersion.cmd
@@@ -1,8 -1,8 +1,8 @@@
  set MAJOR=2
  set MINOR=16
- set REVISION=24
- set PATCHLEVEL=3
- set STRPRIVATEBUILD="jp-3"
+ set REVISION=26
 -set PATCHLEVEL=0
 -set STRPRIVATEBUILD=""
++set PATCHLEVEL=1
++set STRPRIVATEBUILD="jp-1"
  
  set RCVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
  rem set STRVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%

diff --cc Src/Constants.h
index 9a0c96f,0279546..62dd857
--- 1/Src/Constants.h
--- 2/Src/Constants.h
+++ b/Src/Constants.h
@@@ -6,44 -6,37 +6,44 @@@
   */
  #pragma once
  
- #include "UnicodeString.h"
+ #include <tchar.h>
  
  /** @brief URL for hyperlink in About-dialog. */
- const TCHAR WinMergeURL[] = _T("https://winmergejp.bitbucket.io");
 -inline const TCHAR WinMergeURL[] = _T("https://winmerge.org/");
++inline const TCHAR WinMergeURL[] = _T("https://winmergejp.bitbucket.io");
  
  /**
   * @brief URL to help index in internet.
   * We use internet help when local help file is not found (not installed).
   */
- const TCHAR DocsURL[] = _T("https://manual.winmerge.org/index.html");
+ inline const TCHAR DocsURL[] = _T("https://manual.winmerge.org/index.html");
  
  /** @brief URL to translations page in internet. */
- const TCHAR TranslationsUrl[] = _T("https://winmerge.org/translations/");
+ inline const TCHAR TranslationsUrl[] = _T("https://winmerge.org/translations/");
  
  /** @brief URL of the GPL license. */
- const TCHAR LicenceUrl[] = _T("http://www.gnu.org/licenses/gpl-2.0.html");
+ inline const TCHAR LicenceUrl[] = _T("http://www.gnu.org/licenses/gpl-2.0.html");
  
 +/** @brief WinMerge download page URL. */
 +const TCHAR DownloadUrl[] = _T("https://winmergejp.bitbucket.io/#downloads");
 +const TCHAR DownloadUrlOld[] = _T("http://www.geocities.co.jp/SiliconValley-SanJose/8165/winmerge.html#downloads");
 +
 +const TCHAR CurrentVersionURL[] = _T("https://winmergejp.bitbucket.io/winmerge-jp_current_version.txt");
 +const TCHAR CurrentVersionURLOld[] = _T("http://www.geocities.co.jp/SiliconValley-SanJose/8165/winmerge-jp_current_version.txt");
 +
  /** @brief Relative (to WinMerge executable ) path to local help file. */
- const TCHAR DocsPath[] = _T("Docs/WinMerge%s.chm");
+ inline const TCHAR DocsPath[] = _T("Docs/WinMerge%s.chm");
  
  /** @brief Contributors list. */
- const TCHAR ContributorsPath[] = _T("contributors.txt");
+ inline const TCHAR ContributorsPath[] = _T("contributors.txt");
  
  /** @brief Release notes in HTML format. */
- const TCHAR RelNotes[] = _T("\\Docs\\ReleaseNotes%s.html");
+ inline const TCHAR RelNotes[] = _T("\\Docs\\ReleaseNotes%s.html");
  
  /** @brief GPL Licence local file name. */
- const TCHAR LicenseFile[] = _T("Copying");
+ inline const TCHAR LicenseFile[] = _T("Copying");
  
  /** @brief WinMerge folder in My Folders-folder. */
- const TCHAR WinMergeDocumentsFolder[] = _T("WinMerge");
+ inline const TCHAR WinMergeDocumentsFolder[] = _T("WinMerge");
  
  /**
   * @brief Default relative path to "My Documents" for private filters.

diff --cc Src/MainFrm.cpp
Simple merge

diff --cc Src/MainFrm.h
Simple merge

diff --cc Src/Merge.rc
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/Corsican.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
index 7e67e13,f8ea08b..ddf6231
--- 1/Translations/WinMerge/Swedish.po
--- 2/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@@ -401,11 -401,8 +401,11 @@@ msgstr "Utgivningsnotis
  msgid "&Translations"
  msgstr "Översättningar"
  
 +msgid "&Check For Updates"
 +msgstr ""
 +
  msgid "C&onfiguration"
- msgstr "Konfiguration"
+ msgstr "Sättningar"
  
  msgid "&GNU General Public License"
  msgstr "GNU General Public License"

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

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

diff --cc Version.h
index 8a55e4b,e55473e..a3a1d72
--- 1/Version.h
--- 2/Version.h
+++ b/Version.h
@@@ -1,5 -1,5 +1,5 @@@
- #define FILEVER        2,16,24,3\r
- #define PRODUCTVER     2,16,24,3\r
- #define STRFILEVER     "2.16.24.3"\r
- #define STRPRODUCTVER  "2.16.24.3"\r
- #define STRPRIVATEBUILD "jp-3"\r
 -#define FILEVER        2,16,26,0\r
 -#define PRODUCTVER     2,16,26,0\r
 -#define STRFILEVER     "2.16.26.0"\r
 -#define STRPRODUCTVER  "2.16.26.0"\r
 -#define STRPRIVATEBUILD ""\r
++#define FILEVER        2,16,26,1\r
++#define PRODUCTVER     2,16,26,1\r
++#define STRFILEVER     "2.16.26.1"\r
++#define STRPRODUCTVER  "2.16.26.1"\r
++#define STRPRIVATEBUILD "jp-1"\r