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

# Conflicts:
#	SetVersion.cmd
#	Version.h

diff --cc Installer/InnoSetup/WinMerge.iss
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 SetVersion.cmd
index 1829c8f,e89e991..a003d18
--- 1/SetVersion.cmd
--- 2/SetVersion.cmd
+++ b/SetVersion.cmd
@@@ -1,8 -1,8 +1,8 @@@
  set MAJOR=2
  set MINOR=16
 -set REVISION=15
 -set PATCHLEVEL=0
 -set STRPRIVATEBUILD=""
 +set REVISION=14
- set PATCHLEVEL=4
- set STRPRIVATEBUILD="jp-4"
++set PATCHLEVEL=5
++set STRPRIVATEBUILD="jp-5"
  
  set RCVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
  rem set STRVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%

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

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

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

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

diff --cc Version.h
index e58c6f2,b14aae4..59b7aa7
--- 1/Version.h
--- 2/Version.h
+++ b/Version.h
@@@ -1,5 -1,5 +1,5 @@@
- #define FILEVER        2,16,14,4\r
- #define PRODUCTVER     2,16,14,4\r
- #define STRFILEVER     "2.16.14.4"\r
- #define STRPRODUCTVER  "2.16.14.4"\r
- #define STRPRIVATEBUILD "jp-4"\r
 -#define FILEVER        2,16,15,0\r
 -#define PRODUCTVER     2,16,15,0\r
 -#define STRFILEVER     "2.16.15.0"\r
 -#define STRPRODUCTVER  "2.16.15.0"\r
 -#define STRPRIVATEBUILD ""\r
++#define FILEVER        2,16,14,5\r
++#define PRODUCTVER     2,16,14,5\r
++#define STRFILEVER     "2.16.14.5"\r
++#define STRPRODUCTVER  "2.16.14.5"\r
++#define STRPRIVATEBUILD "jp-5"\r