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

# Conflicts:
#	SetVersion.cmd
#	Translations/WinMerge/English.pot
#	Translations/WinMerge/Portuguese.po
#	Version.h

diff --cc SetVersion.cmd
index afe27ed,8e95936..c4e6a2b
--- 1/SetVersion.cmd
--- 2/SetVersion.cmd
+++ b/SetVersion.cmd
@@@ -1,8 -1,8 +1,8 @@@
  set MAJOR=2
  set MINOR=16
- set REVISION=12
- set PATCHLEVEL=4
- set STRPRIVATEBUILD="jp-4"
+ set REVISION=14
 -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/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/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
index a22ea9b,cdf3c40..c0434e3
--- 1/Translations/WinMerge/Portuguese.po
--- 2/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@@ -3887,83 -3884,7 +3887,83 @@@ msgstr "Nome de plugin ausente no pipel
  
  #, c-format
  msgid "Missing quotation mark in plugin pipeline: %1"
- msgstr "Marca de cotação ausente no pipeline plugin: %1"
+ msgstr "Marca de cotação em falta no plugin pipeline: %1"
  
  msgid "Specify plugin arguments"
- msgstr "Especifique argumentos de plugin"
+ msgstr "Especificar argumentos de plugin"
 +
 +msgid "Make characters uppercase"
 +msgstr ""
 +
 +msgid "Make characters lowercase"
 +msgstr ""
 +
 +msgid "Remove duplicate lines"
 +msgstr ""
 +
 +msgid "Count duplicate lines"
 +msgstr ""
 +
 +msgid "Sort lines ascending"
 +msgstr ""
 +
 +msgid "Sort lines descending"
 +msgstr ""
 +
 +msgid "Reverse columns"
 +msgstr ""
 +
 +msgid "Reverse lines"
 +msgstr ""
 +
 +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n  FIND    - text to find\r\n  REPLACE - text to replace\r\n  -i - ignore case (only for -e)\r\n  -e - treat the specified text as a regular expression"
 +msgstr ""
 +
 +#, c-format
 +msgid "Apply filter command. \r\nUsage: ExecFilterCommand COMMAND\r\n  COMMAND - command to execute. %1 in the command is replaced with the filename."
 +msgstr ""
 +
 +msgid "Tokenize selection. \r\nUsage: Tokenize PATTERNS\r\n  PATTERNS - regular expression for tokenizing. (e.g. [^\\w]+)"
 +msgstr ""
 +
 +msgid "Trim spaces"
 +msgstr ""
 +
 +msgid "Select some columns.\r\nUsage: SelectColumns RANGES\r\n   or: SelectColumns [-v] [-i] [-g] -e PATTERNS\r\n  RANGES   - list of column ranges to select. (e.g. -3,5-10,30-)\r\n  PATTERNS - regular expression\r\n  -v - select non-matching columns\r\n  -i - ignore case\r\n  -g - enable global flag\r\n  -e - use PATTERNS for matching"
 +msgstr ""
 +
 +msgid "Select some lines.\r\nUsage: SelectLines RANGES\r\n   or: SelectLines [-v] [-i] -e PATTERNS\r\n  RANGES   - list of line ranges to select. (e.g. -3,5-10,30-)\r\n  PATTERNS - regular expression\r\n  -v - select non-matching lines\r\n  -i - ignore case\r\n  -e - use PATTERNS for matching"
 +msgstr ""
 +
 +msgid "HTML Prettier with tidy-html5. \r\nArguments: Command line options passed to the tidy command."
 +msgstr ""
 +
 +msgid "JSON Prettier with jq command. \r\nArguments: Filter or command line options passed to the jq command."
 +msgstr ""
 +
 +msgid "XML Prettier with tidy-html5. \r\nArguments: Command line options passed to the tidy command."
 +msgstr ""
 +
 +msgid "YAML Prettier with yq command. \r\nArguments: Filter or command line options passed to the yq command."
 +msgstr ""
 +
 +msgid "Graphviz Visualizer. \r\nArguments: Command line options passed to the dot command."
 +msgstr ""
 +
 +msgid "CSV Querier with q command. \r\nArguments: SQL statement or command line options passed to the q command."
 +msgstr ""
 +
 +msgid "TSV Querier with q command. \r\nArguments: SQL statement or command line options passed to the q command."
 +msgstr ""
 +
 +msgid "JSON Querier with jq command. \r\nArguments: Filter or command line options passed to the jq command."
 +msgstr ""
 +
 +msgid "YAML Querier with yq command. \r\nArguments: Filter or command line options passed to the yq command."
 +msgstr ""
 +
 +msgid "HTML Validator with tidy-html5. \r\nArguments: Command line options passed to the tidy command."
 +msgstr ""
 +
 +msgid "General content extractor with Apache Tika. \r\nArguments: Command line options passed to the tika-app.jar."
 +msgstr ""

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 e79ec31,db08ba8..34c80f2
--- 1/Version.h
--- 2/Version.h
+++ b/Version.h
@@@ -1,5 -1,5 +1,5 @@@
- #define FILEVER        2,16,12,4\r
- #define PRODUCTVER     2,16,12,4\r
- #define STRFILEVER     "2.16.12.4"\r
- #define STRPRODUCTVER  "2.16.12.4"\r
- #define STRPRIVATEBUILD "jp-4"\r
 -#define FILEVER        2,16,14,0\r
 -#define PRODUCTVER     2,16,14,0\r
 -#define STRFILEVER     "2.16.14.0"\r
 -#define STRPRODUCTVER  "2.16.14.0"\r
 -#define STRPRIVATEBUILD ""\r
++#define FILEVER        2,16,14,1\r
++#define PRODUCTVER     2,16,14,1\r
++#define STRFILEVER     "2.16.14.1"\r
++#define STRPRODUCTVER  "2.16.14.1"\r
++#define STRPRIVATEBUILD "jp-1"\r