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

# Conflicts:
#	SetVersion.cmd
#	Src/Constants.h
#	Translations/WinMerge/ChineseTraditional.po
#	Version.h

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 SetVersion.cmd
index 55814e2,9e29b0d..5abee48
--- 1/SetVersion.cmd
--- 2/SetVersion.cmd
+++ b/SetVersion.cmd
@@@ -1,8 -1,8 +1,8 @@@
  set MAJOR=2
  set MINOR=16
 -set REVISION=29
 -set PATCHLEVEL=0
 -set STRPRIVATEBUILD=""
 +set REVISION=28
- set PATCHLEVEL=3
- set STRPRIVATEBUILD="jp-3"
++set PATCHLEVEL=4
++set STRPRIVATEBUILD="jp-4"
  
  set RCVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
  rem set STRVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%

diff --cc Src/Constants.h
index 62dd857,e730078..c29928a
--- 1/Src/Constants.h
--- 2/Src/Constants.h
+++ b/Src/Constants.h
@@@ -6,44 -6,37 +6,44 @@@
   */
  #pragma once
  
- #include <tchar.h>
+ #include "utils/ctchar.h"
  
  /** @brief URL for hyperlink in About-dialog. */
- inline const TCHAR WinMergeURL[] = _T("https://winmergejp.bitbucket.io");
 -inline const tchar_t WinMergeURL[] = _T("https://winmerge.org/");
++inline const tchar_t 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).
   */
- inline const TCHAR DocsURL[] = _T("https://manual.winmerge.org/index.html");
+ inline const tchar_t DocsURL[] = _T("https://manual.winmerge.org/index.html");
  
  /** @brief URL to translations page in internet. */
- inline const TCHAR TranslationsUrl[] = _T("https://winmerge.org/translations/");
+ inline const tchar_t TranslationsUrl[] = _T("https://winmerge.org/translations/");
  
  /** @brief URL of the GPL license. */
- inline const TCHAR LicenceUrl[] = _T("http://www.gnu.org/licenses/gpl-2.0.html");
+ inline const tchar_t LicenceUrl[] = _T("http://www.gnu.org/licenses/gpl-2.0.html");
  
- const TCHAR DownloadUrl[] = _T("https://winmergejp.bitbucket.io/#downloads");
- const TCHAR DownloadUrlOld[] = _T("http://www.geocities.co.jp/SiliconValley-SanJose/8165/winmerge.html#downloads");
 +/** @brief WinMerge download page URL. */
- 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");
++const tchar_t DownloadUrl[] = _T("https://winmergejp.bitbucket.io/#downloads");
++const tchar_t DownloadUrlOld[] = _T("http://www.geocities.co.jp/SiliconValley-SanJose/8165/winmerge.html#downloads");
 +
++const tchar_t CurrentVersionURL[] = _T("https://winmergejp.bitbucket.io/winmerge-jp_current_version.txt");
++const tchar_t 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. */
- inline const TCHAR DocsPath[] = _T("Docs/WinMerge%s.chm");
+ inline const tchar_t DocsPath[] = _T("Docs/WinMerge%s.chm");
  
  /** @brief Contributors list. */
- inline const TCHAR ContributorsPath[] = _T("contributors.txt");
+ inline const tchar_t ContributorsPath[] = _T("contributors.txt");
  
  /** @brief Release notes in HTML format. */
- inline const TCHAR RelNotes[] = _T("\\Docs\\ReleaseNotes%s.html");
+ inline const tchar_t RelNotes[] = _T("\\Docs\\ReleaseNotes%s.html");
  
  /** @brief GPL Licence local file name. */
- inline const TCHAR LicenseFile[] = _T("Copying");
+ inline const tchar_t LicenseFile[] = _T("Copying");
  
  /** @brief WinMerge folder in My Folders-folder. */
- inline const TCHAR WinMergeDocumentsFolder[] = _T("WinMerge");
+ inline const tchar_t 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 Src/OptionsDef.h
Simple merge

diff --cc Src/OptionsInit.cpp
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
Simple merge

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

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

diff --cc Version.h
index c679737,cd4b230..4246de1
--- 1/Version.h
--- 2/Version.h
+++ b/Version.h
@@@ -1,5 -1,5 +1,5 @@@
- #define FILEVER        2,16,28,3\r
- #define PRODUCTVER     2,16,28,3\r
- #define STRFILEVER     "2.16.28.3"\r
- #define STRPRODUCTVER  "2.16.28.3"\r
- #define STRPRIVATEBUILD "jp-3"\r
 -#define FILEVER        2,16,29,0\r
 -#define PRODUCTVER     2,16,29,0\r
 -#define STRFILEVER     "2.16.29.0"\r
 -#define STRPRODUCTVER  "2.16.29.0"\r
 -#define STRPRIVATEBUILD ""\r
++#define FILEVER        2,16,28,4\r
++#define PRODUCTVER     2,16,28,4\r
++#define STRFILEVER     "2.16.28.4"\r
++#define STRPRODUCTVER  "2.16.28.4"\r
++#define STRPRIVATEBUILD "jp-4"\r