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

# Conflicts:
#	Translations/WinMerge/Galician.po

diff --cc BuildArc.cmd
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 Installer/InnoSetup/WinMergeX86.iss
Simple merge

diff --cc Src/MainFrm.cpp
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/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
index 1565c3d,0f5d78d..36dc7f7
--- 1/Translations/WinMerge/Galician.po
--- 2/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@@ -452,59 -389,42 +389,45 @@@ msgstr "Ordenar &verticalmente
  msgid "&Cascade"
  msgstr "&En fervenza"
  
- #, c-format
  msgid "&Help"
- msgstr "&Axuda"
+ msgstr "A&xuda"
  
- #, c-format
  msgid "&WinMerge Help\tF1"
- msgstr "&Axuda de WinMerge\tF1"
+ msgstr "Axuda de &WinMerge\tF1"
  
- #, c-format
  msgid "R&elease Notes"
- msgstr "&Notas da versión"
+ msgstr "Notas da v&ersión (online)"
  
- #, c-format
  msgid "&Translations"
- msgstr "&Traducións"
+ msgstr "&Traducións (online)"
  
- #, c-format
 +msgid "&Check For Updates"
 +msgstr ""
 +
  msgid "C&onfiguration"
- msgstr "&Configuración"
+ msgstr "Rexistro de c&onfiguración"
  
- #, c-format
  msgid "&GNU General Public License"
- msgstr "&Licenza Pública Xeral GNU"
+ msgstr "Licenza Pública Xeral &GNU (online)"
  
- #, c-format
  msgid "&About WinMerge..."
- msgstr "Acerca de &WinMerge…"
+ msgstr "&Acerca de WinMerge..."
  
- #, c-format
  msgid "&Read-only"
- msgstr "Só &lectura"
+ msgstr "Só lectu&ra"
  
- #, c-format
  msgid "L&eft Read-only"
- msgstr "&Esquerda só lectura"
+ msgstr "&Esquerdo só lectura"
  
- #, c-format
  msgid "M&iddle Read-only"
- msgstr "Cen&tro só lectura"
+ msgstr "Cen&tral só lectura"
  
- #, c-format
  msgid "Ri&ght Read-only"
- msgstr "&Dereita só lectura"
+ msgstr "&Dereito só lectura"
  
- #, c-format
  msgid "&File Encoding..."
- msgstr "Codificación de &ficheiro…"
+ msgstr "Codi&ficación de archivo..."
  
- #, c-format
  msgid "Select &All\tCtrl+A"
  msgstr "S&eleccionar todo\tCtrl+A"
  

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
index be31e4d,f351e95..349d7e4
--- 1/Translations/WinMerge/Spanish.po
--- 2/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@@ -398,19 -398,16 +398,19 @@@ msgid "&WinMerge Help\tF1
  msgstr "Ayuda de &WinMerge\tF1"
  
  msgid "R&elease Notes"
- msgstr "Notas d&e Lanzamiento"
+ msgstr "&Notas de la versión (online)"
  
  msgid "&Translations"
- msgstr "&Traducciones"
+ msgstr "&Traducciones (online)"
  
 +msgid "&Check For Updates"
 +msgstr ""
 +
  msgid "C&onfiguration"
- msgstr "C&onfiguración"
+ msgstr "Registro de c&onfiguración"
  
  msgid "&GNU General Public License"
- msgstr "Licencia Pública General &GNU"
+ msgstr "Licencia Pública General &GNU (online)"
  
  msgid "&About WinMerge..."
  msgstr "&Acerca de WinMerge..."

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

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

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