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

# Conflicts:
#	Translations/WinMerge/Turkish.po

diff --cc Src/Constants.h
Simple merge

diff --cc Src/MainFrm.cpp
Simple merge

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

diff --cc Translations/WinMerge/Turkish.po
index 23e3d8a,4cc2239..6c698fd
--- 1/Translations/WinMerge/Turkish.po
--- 2/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@@ -3873,78 -3873,74 +3876,150 @@@ msgstr "Eklenti bağlantı yolunda tır
  msgid "Specify plugin arguments"
  msgstr "Eklenti değişkenlerini belirtin"
  
+ #~ msgid "Cannot create a patch file from directories."
+ #~ msgstr "Klasörlerden yama dosyası hazırlanamaz."
+ 
+ #~ msgid "&Select Line Difference\tF4"
+ #~ msgstr "Satır &farkını seç\tF4"
+ 
+ #~ msgid "&XML"
+ #~ msgstr "&XML"
+ 
+ #~ msgid "&No prediffer"
+ #~ msgstr "Ö&n farklılaştırıcı yok"
+ 
+ #~ msgid "Auto prediffer"
+ #~ msgstr "Otomatik ön farklılaştırıcı"
+ 
+ #~ msgid "Select Unpacker"
+ #~ msgstr "Ayıklayıcı seçin"
+ 
+ #~ msgid "File unpacker:"
+ #~ msgstr "Dosya ayıklayıcı:"
+ 
+ #~ msgid "&Goto..."
+ #~ msgstr "&Git..."
+ 
+ #~ msgid "&New\tCtrl+N"
+ #~ msgstr "Ye&ni\tCtrl+N"
+ 
+ #~ msgid "E&xit"
+ #~ msgstr "Çı&kış"
+ 
+ #~ msgid "Cl&ose"
+ #~ msgstr "&Kapat"
+ 
+ #~ msgid "File En&coding..."
+ #~ msgstr "&Dosya Kodlaması..."
+ 
+ #~ msgid "&Print..."
+ #~ msgstr "&Yazdır..."
+ 
+ #~ msgid "Moved Block for &Current Diff"
+ #~ msgstr "İmleçteki Fark &Yerine Taşınmış Blok"
+ 
+ #~ msgid "Case sensi&tive"
+ #~ msgstr "BÜYÜK-küçük &harf ayrımı yapılsın"
+ 
+ #~ msgid "Go To"
+ #~ msgstr "Git"
+ 
+ #~ msgid "G&oto:"
+ #~ msgstr "&Git:"
+ 
+ #~ msgid "Comments"
+ #~ msgstr "Açıklamalar"
+ 
+ #~ msgid "Filefilters"
+ #~ msgstr "Dosya Süzgeçleri"
+ 
+ #~ msgid ""
+ #~ "Developers:\n"
+ #~ "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, "
+ #~ "Takashi Sawanaka, Gal Hammer, Alexander Skinner"
+ #~ msgstr ""
+ #~ "Geliştiriciler:\n"
+ #~ "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, "
+ #~ "Takashi Sawanaka, Gal Hammer, Alexander Skinner"
+ 
+ #~ msgid "Lua"
+ #~ msgstr "Lua"
+ 
+ #~ msgid "VHDL"
+ #~ msgstr "VHDL"
++
 +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 ""