Merge

diff --cc Src/Merge.rc
Simple merge

diff --cc Src/resource.h
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
index 0025890,31c4213..829869b
--- 1/Translations/WinMerge/Dutch.po
--- 2/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@@ -1116,12 -1121,12 +1116,12 @@@ msgstr "Rechts naar... (%1 van %2)
  #: Merge.rc:89AF4FA
  #, c-format
  msgid "&Delete"
 -msgstr "Ver&wijderen"
 +msgstr "Verwijderen"
  
- #: Merge.rc:43017E4B
+ #: Merge.rc:43017E4C
  #, c-format
  msgid "&Left"
 -msgstr "&Links"
 +msgstr "Links"
  
  #: Merge.rc:89AF4FB
  #, c-format
@@@ -1131,12 -1136,12 +1131,12 @@@ msgstr "Midden
  #: Merge.rc:1D2E49FA
  #, c-format
  msgid "&Right"
 -msgstr "&Rechts"
 +msgstr "Rechts"
  
- #: Merge.rc:43017E4C
+ #: Merge.rc:43017E4D
  #, c-format
  msgid "&Both"
 -msgstr "&Beide"
 +msgstr "Beide"
  
  #: Merge.rc:22956A8
  #, c-format
@@@ -1408,20 -1418,20 +1408,20 @@@ msgstr "Medewerkers
  msgid "Select Files or Folders"
  msgstr "Bestanden of mappen selecteren"
  
- #: Merge.rc:43017E4D
+ #: Merge.rc:43017E4E
  #, c-format
  msgid "&1st:"
 -msgstr ""
 +msgstr "1ste:"
  
  #: Merge.rc:68816EE7
  #, c-format
  msgid "&Browse..."
 -msgstr "&Zoeken"
 +msgstr "Bladeren..."
  
- #: Merge.rc:43017E4E
+ #: Merge.rc:43017E4F
  #, c-format
  msgid "&2nd:"
 -msgstr ""
 +msgstr "2de:"
  
  #: Merge.rc:78E0CE0E
  #, c-format
@@@ -1896,12 -1905,12 +1896,12 @@@ msgstr "Bestand 1:
  #: Merge.rc:59F5069F
  #, c-format
  msgid "File&2:"
 -msgstr "Bestand&2:"
 +msgstr "Bestand 2:"
  
- #: Merge.rc:43017E4F
+ #: Merge.rc:43017E50
  #, c-format
  msgid "&Swap"
 -msgstr "&Wisselen"
 +msgstr "Wisselen"
  
  #: Merge.rc:4B91C2D2
  #, c-format
@@@ -2608,10 -2613,10 +2608,10 @@@ msgstr "Mapnaam
  msgid "Result:"
  msgstr "Resultaat:"
  
- #: Merge.rc:43017E50
+ #: Merge.rc:43017E51
  #, c-format
  msgid "&Test"
 -msgstr "&Test"
 +msgstr "Testen"
  
  #: Merge.rc:1D2E49FD
  #, c-format
@@@ -3053,12 -3036,12 +3053,12 @@@ msgstr "Nee op alles
  #: Merge.rc:4DB1983A
  #, c-format
  msgid "&Continue"
 -msgstr "&Doorgaan"
 +msgstr "Doorgaan"
  
- #: Merge.rc:43017E51
+ #: Merge.rc:43017E52
  #, c-format
  msgid "&Skip"
 -msgstr "&Overslaan"
 +msgstr "Overslaan"
  
  #: Merge.rc:2D1160B0
  #, c-format

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/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 cfcb134,3400480..815f553
--- 1/Translations/WinMerge/Spanish.po
--- 2/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@@ -1118,10 -1123,10 +1123,10 @@@ msgstr "Lado derecho a... (%1 de %2)
  msgid "&Delete"
  msgstr "&Eliminar"
  
- #: Merge.rc:43017E4B
+ #: Merge.rc:43017E4C
  #, c-format
  msgid "&Left"
 -msgstr "&Derecha"
 +msgstr "&Izquierda"
  
  #: Merge.rc:89AF4FB
  #, c-format
@@@ -1131,9 -1136,9 +1136,9 @@@ msgstr "
  #: Merge.rc:1D2E49FA
  #, c-format
  msgid "&Right"
 -msgstr "&Izquierda"
 +msgstr "&Derecha"
  
- #: Merge.rc:43017E4C
+ #: Merge.rc:43017E4D
  #, c-format
  msgid "&Both"
  msgstr "&Ambos"

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

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

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