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

# Conflicts:
#	SetVersion.cmd
#	Translations/TranslationsStatus.md
#	Version.h

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/TranslationsStatus.md
index 80d5681,3bd7479..26fd4d2
--- 1/Translations/TranslationsStatus.md
--- 2/Translations/TranslationsStatus.md
+++ b/Translations/TranslationsStatus.md
@@@ -6,43 -6,43 +6,43 @@@ Status from **2022-03-27**
  
  | Language             | Total | Translated | Fuzzy | Untranslated | Complete | Last Update |
  |:---------------------|------:|-----------:|------:|-------------:|---------:|:-----------:|
- | Arabic               |  1201 |        900 |     0 |          301 |     74 % |  2019-12-30 |
- | Basque               |  1201 |        640 |     0 |          561 |     53 % |  2013-02-03 |
- | Brazilian            |  1201 |       1085 |     0 |          116 |     90 % |  2021-08-09 |
- | Bulgarian            |  1201 |        965 |     0 |          236 |     80 % |  2021-06-28 |
- | Catalan              |  1201 |        567 |     0 |          634 |     47 % |             |
- | ChineseSimplified    |  1201 |       1182 |     0 |           19 |     98 % |             |
- | ChineseTraditional   |  1201 |       1128 |     0 |           73 |     93 % |  2022-02-19 |
- | Corsican             |  1201 |       1200 |     0 |            1 |     99 % |  2022-02-19 |
- | Croatian             |  1201 |        632 |     1 |          568 |     52 % |  2009-02-13 |
- | Czech                |  1201 |        606 |     0 |          595 |     50 % |             |
- | Danish               |  1201 |        640 |     0 |          561 |     53 % |  2013-01-13 |
- | Dutch                |  1201 |       1199 |     0 |            2 |     99 % |  2018-09-06 |
- | English              |  1201 |       1201 |     0 |            0 |    100 % |  2022-02-20 |
- | Finnish              |  1201 |        900 |     0 |          301 |     74 % |             |
- | French               |  1201 |       1199 |     0 |            2 |     99 % |  2022-01-24 |
- | Galician             |  1201 |       1135 |     0 |           66 |     94 % |  2021-12-18 |
- | German               |  1201 |       1200 |     0 |            1 |     99 % |  2022-01-23 |
- | Greek                |  1201 |        605 |     0 |          596 |     50 % |             |
- | Hungarian            |  1201 |       1200 |     0 |            1 |     99 % |  2021-03-15 |
- | Italian              |  1201 |        990 |     0 |          211 |     82 % |  2021-08-09 |
- | Japanese             |  1201 |       1200 |     0 |            1 |     99 % |  2022-01-28 |
- | Korean               |  1201 |       1199 |     0 |            2 |     99 % |  2022-02-02 |
- | Lithuanian           |  1201 |       1158 |     0 |           43 |     96 % |  2022-02-19 |
- | Norwegian            |  1201 |        731 |     0 |          470 |     60 % |             |
- | Persian              |  1201 |        643 |     0 |          558 |     53 % |  2013-08-15 |
- | Polish               |  1201 |       1109 |     0 |           92 |     92 % |             |
- | Portuguese           |  1201 |       1199 |     0 |            2 |     99 % |  2022-02-02 |
- | Romanian             |  1201 |        562 |    44 |          595 |     50 % |             |
- | Russian              |  1201 |       1156 |     0 |           45 |     96 % |  2022-01-27 |
- | Serbian              |  1201 |        633 |     0 |          568 |     52 % |             |
- | Sinhala              |  1201 |        567 |    59 |          575 |     52 % |  2010-12-12 |
- | Slovak               |  1201 |       1199 |     0 |            2 |     99 % |  2022-02-17 |
- | Slovenian            |  1201 |       1200 |     0 |            1 |     99 % |  2022-02-21 |
- | Spanish              |  1201 |        869 |     0 |          332 |     72 % |  2020-04-03 |
- | Swedish              |  1201 |       1093 |     0 |          108 |     91 % |  2021-09-15 |
- | Turkish              |  1201 |       1135 |     0 |           66 |     94 % |  2021-12-21 |
- | Ukrainian            |  1201 |        638 |     0 |          563 |     53 % |  2009-06-13 |
 -| Arabic               |  1206 |        898 |     0 |          308 |     74 % |  2019-12-30 |
 -| Basque               |  1206 |        639 |     0 |          567 |     52 % |  2013-02-03 |
 -| Brazilian            |  1206 |       1084 |     0 |          122 |     89 % |  2021-08-09 |
 -| Bulgarian            |  1206 |        974 |     0 |          232 |     80 % |  2021-06-28 |
 -| Catalan              |  1206 |       1188 |     0 |           18 |     98 % |             |
 -| ChineseSimplified    |  1206 |       1202 |     0 |            4 |     99 % |             |
 -| ChineseTraditional   |  1206 |       1126 |     0 |           80 |     93 % |  2022-02-19 |
 -| Corsican             |  1206 |       1203 |     0 |            3 |     99 % |  2022-03-19 |
 -| Croatian             |  1206 |        631 |     1 |          574 |     52 % |  2009-02-13 |
 -| Czech                |  1206 |        606 |     0 |          600 |     50 % |             |
 -| Danish               |  1206 |        640 |     0 |          566 |     53 % |  2013-01-13 |
 -| Dutch                |  1206 |       1198 |     0 |            8 |     99 % |  2018-09-06 |
 -| English              |  1206 |       1206 |     0 |            0 |    100 % |  2022-03-26 |
 -| Finnish              |  1206 |        899 |     0 |          307 |     74 % |             |
 -| French               |  1206 |       1199 |     0 |            7 |     99 % |  2022-02-26 |
 -| Galician             |  1206 |       1134 |     0 |           72 |     94 % |  2021-12-18 |
 -| German               |  1206 |       1203 |     0 |            3 |     99 % |  2022-03-19 |
 -| Greek                |  1206 |        605 |     0 |          601 |     50 % |             |
 -| Hungarian            |  1206 |       1206 |     0 |            0 |    100 % |  2021-03-15 |
 -| Italian              |  1206 |        989 |     0 |          217 |     82 % |  2021-08-09 |
 -| Japanese             |  1206 |       1206 |     0 |            0 |    100 % |  2022-01-28 |
 -| Korean               |  1206 |       1198 |     0 |            8 |     99 % |  2022-02-02 |
 -| Lithuanian           |  1206 |       1161 |     0 |           45 |     96 % |  2022-03-20 |
 -| Norwegian            |  1206 |        731 |     0 |          475 |     60 % |             |
 -| Persian              |  1206 |        642 |     0 |          564 |     53 % |  2013-08-15 |
 -| Polish               |  1206 |       1147 |     0 |           59 |     95 % |             |
 -| Portuguese           |  1206 |       1203 |     0 |            3 |     99 % |  2022-03-25 |
 -| Romanian             |  1206 |        561 |    44 |          601 |     50 % |             |
 -| Russian              |  1206 |       1155 |     0 |           51 |     95 % |  2022-01-27 |
 -| Serbian              |  1206 |        633 |     0 |          573 |     52 % |             |
 -| Sinhala              |  1206 |        564 |    58 |          584 |     51 % |  2010-12-12 |
 -| Slovak               |  1206 |       1198 |     0 |            8 |     99 % |  2022-02-17 |
 -| Slovenian            |  1206 |       1203 |     0 |            3 |     99 % |  2022-03-19 |
 -| Spanish              |  1206 |        868 |     0 |          338 |     71 % |  2020-04-03 |
 -| Swedish              |  1206 |       1092 |     0 |          114 |     90 % |  2021-09-15 |
 -| Turkish              |  1206 |       1203 |     0 |            3 |     99 % |  2022-03-20 |
 -| Ukrainian            |  1206 |        637 |     0 |          569 |     52 % |  2009-06-13 |
++| Arabic               |  1207 |        898 |     0 |          309 |     74 % |  2019-12-30 |
++| Basque               |  1207 |        639 |     0 |          568 |     52 % |  2013-02-03 |
++| Brazilian            |  1207 |       1084 |     0 |          123 |     89 % |  2021-08-09 |
++| Bulgarian            |  1207 |        974 |     0 |          233 |     80 % |  2021-06-28 |
++| Catalan              |  1207 |       1188 |     0 |           19 |     98 % |             |
++| ChineseSimplified    |  1207 |       1202 |     0 |            5 |     99 % |             |
++| ChineseTraditional   |  1207 |       1126 |     0 |           81 |     93 % |  2022-02-19 |
++| Corsican             |  1207 |       1203 |     0 |            4 |     99 % |  2022-03-19 |
++| Croatian             |  1207 |        631 |     1 |          575 |     52 % |  2009-02-13 |
++| Czech                |  1207 |        606 |     0 |          601 |     50 % |             |
++| Danish               |  1207 |        640 |     0 |          567 |     53 % |  2013-01-13 |
++| Dutch                |  1207 |       1198 |     0 |            9 |     99 % |  2018-09-06 |
++| English              |  1207 |       1207 |     0 |            0 |    100 % |  2022-03-26 |
++| Finnish              |  1207 |        899 |     0 |          308 |     74 % |             |
++| French               |  1207 |       1199 |     0 |            8 |     99 % |  2022-02-26 |
++| Galician             |  1207 |       1134 |     0 |           73 |     93 % |  2021-12-18 |
++| German               |  1207 |       1203 |     0 |            4 |     99 % |  2022-03-19 |
++| Greek                |  1207 |        605 |     0 |          602 |     50 % |             |
++| Hungarian            |  1207 |       1206 |     0 |            1 |     99 % |  2021-03-15 |
++| Italian              |  1207 |        989 |     0 |          218 |     81 % |  2021-08-09 |
++| Japanese             |  1207 |       1207 |     0 |            0 |    100 % |  2022-02-23 |
++| Korean               |  1207 |       1198 |     0 |            9 |     99 % |  2022-02-02 |
++| Lithuanian           |  1207 |       1161 |     0 |           46 |     96 % |  2022-03-20 |
++| Norwegian            |  1207 |        731 |     0 |          476 |     60 % |             |
++| Persian              |  1207 |        642 |     0 |          565 |     53 % |  2013-08-15 |
++| Polish               |  1207 |       1147 |     0 |           60 |     95 % |             |
++| Portuguese           |  1207 |       1203 |     0 |            4 |     99 % |  2022-03-25 |
++| Romanian             |  1207 |        561 |    44 |          602 |     50 % |             |
++| Russian              |  1207 |       1155 |     0 |           52 |     95 % |  2022-01-27 |
++| Serbian              |  1207 |        633 |     0 |          574 |     52 % |             |
++| Sinhala              |  1207 |        564 |    58 |          585 |     51 % |  2010-12-12 |
++| Slovak               |  1207 |       1198 |     0 |            9 |     99 % |  2022-02-17 |
++| Slovenian            |  1207 |       1203 |     0 |            4 |     99 % |  2022-03-19 |
++| Spanish              |  1207 |        868 |     0 |          339 |     71 % |  2020-04-03 |
++| Swedish              |  1207 |       1092 |     0 |          115 |     90 % |  2021-09-15 |
++| Turkish              |  1207 |       1203 |     0 |            4 |     99 % |  2022-03-20 |
++| Ukrainian            |  1207 |        637 |     0 |          570 |     52 % |  2009-06-13 |
  
  ## ShellExtension
  

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
index 17e291e,1e2d920..5967195
--- 1/Translations/WinMerge/Catalan.po
--- 2/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@@ -417,14 -420,11 +420,14 @@@ msgstr "Notes de la v&ersió
  
  #, c-format
  msgid "&Translations"
- msgstr ""
+ msgstr "&Traduccions"
  
 +msgid "&Check For Updates"
 +msgstr ""
 +
  #, c-format
  msgid "C&onfiguration"
- msgstr ""
+ msgstr "C&onfiguració"
  
  #, c-format
  msgid "&GNU General Public License"

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

diff --cc Translations/WinMerge/ChineseTraditional.po
index 2c27648,d156b17..a01c05a
--- 1/Translations/WinMerge/ChineseTraditional.po
--- 2/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@@ -4917,8 -4885,14 +4888,14 @@@ msgid "Prediff Line Filter
  msgstr ""
  
  msgid "Basic text functions for the context menu"
 -msgstr ""
 +msgstr "指定外掛程式參數"
  
+ msgid "HTTP URL Scheme Handler with curl. \r\nArguments: Command line options passed to the curl command."
+ msgstr ""
+ 
+ msgid "Windows Registry URL Scheme Handler. \r\nArguments: Command line options passed to the reg.exe command."
+ msgstr ""
+ 
  msgid "Filter applied"
  msgstr ""
  

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