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

# Conflicts:
#	Externals/freeimage
#	Externals/frhed
#	Translations/TranslationsStatus.html
#	Translations/TranslationsStatus.md
#	Translations/TranslationsStatus.xml
#	Translations/WinMerge/English.pot
#	Translations/WinMerge/Galician.po
#	Translations/WinMerge/Japanese.po

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

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

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

diff --cc Src/Constants.h
Simple merge

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
index c92c841,822f089..6a7f404
--- 1/Translations/WinMerge/Galician.po
--- 2/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@@ -4498,71 -4529,7 +4532,71 @@@ msgstr "Falta o nome do complemento na 
  
  #, c-format
  msgid "Missing quotation mark in plugin pipeline: %1"
- msgstr ""
+ msgstr "Faltan comiñas na canalización de complementos. %1"
  
  msgid "Specify plugin arguments"
- msgstr ""
+ msgstr "Especificar os argumentos do complemento"
 +
 +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 "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 arugments passed to the tidy 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 "General content extractor with Apache Tika. \r\nArguments: Command line options passed to the tika-app.jar."
 +msgstr ""

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