PATCH: [ 1423461 ] Rearrange language select dialog

  Revise patch applied earlier: put Ok on left and Cancel on right.
  (Also fix French dialog which was left out before.)
  Src: Merge.rc
  Src/Languages: */Merge*.rc

diff --git a/Src/Changes.txt b/Src/Changes.txt
index a8ccaa8..1b96b69 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -6,6 +6,11 @@
  BUG: [ 1383052 ] warning C4005: 'COMPILE_MULTIMON_STUBS' : macro redefinition
   (Wrap multimon def with ifndef
   Src: MainFrm.cpp
+ PATCH: [ 1423461 ] Rearrange language select dialog
+  Revise patch applied earlier: put Ok on left and Cancel on right.
+  (Also fix French dialog which was left out before.)
+  Src: Merge.rc
+  Src/Languages: */Merge*.rc
   
 2006-02-03 Perry
  PATCH: [ 1409651 ] fix diffutils handling trailing whitespace

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 2eb06bf..1ef2574 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Idiomas"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,115,123,52,14
-    PUSHBUTTON      "Cancelar",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "Cancelar",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Idiomas disponíveis:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index 6db6e1a..1f7757d 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Åçèê"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "Äîáðå",IDOK,115,123,52,14
-    PUSHBUTTON      "Ïðåêðàòè",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "Äîáðå",IDOK,30,123,52,14
+    PUSHBUTTON      "Ïðåêðàòè",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Âúçìîæíè åçèöè:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 829fe3f..6c06cb0 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Idioma"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "D'acord",IDOK,115,123,52,14
-    PUSHBUTTON      "Cancel·la",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "D'acord",IDOK,30,123,52,14
+    PUSHBUTTON      "Cancel·la",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Idiomes disponibles:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 742c000..707beab 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -724,8 +724,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "ÓïÑÔ"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "È·¶¨",IDOK,115,123,52,14
-    PUSHBUTTON      "È¡Ïû",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "È·¶¨",IDOK,30,123,52,14
+    PUSHBUTTON      "È¡Ïû",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "¿ÉÓõÄÓïÑÔ:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 76cbb25..596e027 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "»y¨¥"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "½T©w",IDOK,115,123,52,14
-    PUSHBUTTON      "¨ú®ø",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "½T©w",IDOK,30,123,52,14
+    PUSHBUTTON      "¨ú®ø",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "¥i¥Îªº»y¨¥:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index bd1c013..1133783 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Jazyk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,115,123,52,14
-    PUSHBUTTON      "Storno",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "Storno",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Dostupné jazyky:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index a528722..ae12b54 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Sprog"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,115,123,52,14
-    PUSHBUTTON      "Afbryd",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "Afbryd",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Tilgængelige sprog:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 8a2dad9..e54fc61 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Taalkeuze"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,115,123,52,14
-    PUSHBUTTON      "Annuleren",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "Annuleren",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Beschikbare talen",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 6df223e..35200a4 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -714,15 +714,15 @@ BEGIN
                     IDC_STATIC,7,124,168,31
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 111
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU
 CAPTION "Langage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,154,16,52,14
-    PUSHBUTTON      "Ann&uler",IDCANCEL,154,33,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT |
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "Ann&uler",IDCANCEL,115,123,52,14
+    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Langages disponibles :",IDC_STATIC,7,7,140,8
 END

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index f7783ff..ee75ff9 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Sprache"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,115,123,52,14
-    PUSHBUTTON      "Abbrechen",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "Abbrechen",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Verfügbare Sprachen:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc
index 9ad3995..0809d16 100644 (file)
--- a/Src/Languages/Hungarian/MergeHungarian.rc
+++ b/Src/Languages/Hungarian/MergeHungarian.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Nyelv"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "Rendben",IDOK,115,123,52,14
-    PUSHBUTTON      "Mégsem",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "Rendben",IDOK,30,123,52,14
+    PUSHBUTTON      "Mégsem",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Választható nyelvek:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 1a88370..760541d 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Lingua"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,115,123,52,14
-    PUSHBUTTON      "Annulla",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "Annulla",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Lingue disponibili:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index 09e7c4d..1df8222 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "\8c¾\8cê"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,115,123,52,14
-    PUSHBUTTON      "\83L\83\83\83\93\83Z\83\8b",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "\83L\83\83\83\93\83Z\83\8b",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "\8eg\97p\89Â\94\\82È\8c¾\8cê:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 88ee491..1a8eda6 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "¾ð¾î"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "È®ÀÎ",IDOK,115,123,52,14
-    PUSHBUTTON      "Ãë¼Ò",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "È®ÀÎ",IDOK,30,123,52,14
+    PUSHBUTTON      "Ãë¼Ò",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                 WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "¼±Åà °¡´ÉÇÑ ¾ð¾î:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 086fc2b..74bc783 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Språk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,115,123,52,14
-    PUSHBUTTON      "Avbryt",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "Avbryt",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Tilgjengelige språk:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index c7ee7df..97680cd 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Jêzyk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,115,123,52,14
-    PUSHBUTTON      "Anuluj",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "Anuluj",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Dostêpne jêzyki:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index f2d3962..e784f27 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "ßçûê"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,115,123,52,14
-    PUSHBUTTON      "Îòìåíà",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "Îòìåíà",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Äîñòóïíûå ÿçûêè:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 4cc07e2..4e9eb1d 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Jazyk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,115,123,52,14
-    PUSHBUTTON      "Storno",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "Storno",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Dostupné jazyky:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index b0e53bf..220fe66 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Idioma"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "Aceptar",IDOK,115,123,52,14
-    PUSHBUTTON      "Cancelar",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "Aceptar",IDOK,30,123,52,14
+    PUSHBUTTON      "Cancelar",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Idiomas disponibles:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 2753309..b539d4b 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Språk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,115,123,52,14
-    PUSHBUTTON      "Avbryt",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "Avbryt",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Tillgängliga språk:",IDC_STATIC,7,7,140,8

diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc
index d148125..50c6738 100644 (file)
--- a/Src/Languages/Turkish/MergeTurkish.rc
+++ b/Src/Languages/Turkish/MergeTurkish.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Language"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,115,123,52,14
-    PUSHBUTTON      "Cancel",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "Cancel",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Available languages:",IDC_STATIC,7,7,140,8

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 7fc094c..ef84bfb 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -722,8 +722,8 @@ STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Language"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,115,123,52,14
-    PUSHBUTTON      "Cancel",IDCANCEL,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "Cancel",IDCANCEL,115,123,52,14
     LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Available languages:",IDC_STATIC,7,7,140,8