PATCH: [ 1472622 ] Czech translation - update (apply dialog fixes)

 - submitted by: Jan Hryz

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 038f0aa..ea19e25 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -11,6 +11,9 @@ Add new items to top.
  PATCH: [ 1472622 ] Czech translation - update
   Submitted by: Jan Hryz
   Src/Languages/Czech/MergeCzec.rc
+ PATCH: [ 1472622 ] Czech translation - update (apply dialog fixes)
+  Submitted by: Jan Hryz
+  Src/Languages/*: Merge*.rc
 
 2006-04-22 Kimmo
  PATCH: [ 1473635 ] Move some results update code to DirDoc

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index e9b55ef..cfa867f 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,88,
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Idiomas"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,123,52,14
     PUSHBUTTON      "Cancelar",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Idiomas disponíveis:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Description:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index eaa5f81..686834d 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -735,12 +735,12 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,88,
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Îïèñàíèå:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 37b2162..21d0c1e 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Permet múltiples finestres de comparació per",IDC_STATIC,7,88,
+    GROUPBOX        "Permet múltiples finestres de comparació per",IDC_STATIC,7,87,
                     221,37
     CONTROL         "Comparació de &carpetes",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Comparació de &fitxers",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "El WinMerge permet ocultar alguns quadres de missatges comuns. Premeu el botó de Reinicialització per a fer visibles tots els quadres de missatges altre cop.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Reinicialitza",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Idioma"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "D'acord",IDOK,30,123,52,14
+    PUSHBUTTON      "D'acord",IDOK,47,123,52,14
     PUSHBUTTON      "Cancel·la",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Idiomes disponibles:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "&Descripció:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 3add967..723daf6 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -737,26 +737,26 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "ÔÊÐí¶à¸ö¶Ô±È´°¿Ú",IDC_STATIC,7,72,221,37
+    GROUPBOX        "ÔÊÐí¶à¸ö¶Ô±È´°¿Ú",IDC_STATIC,7,87,221,37
     CONTROL         "Îļþ¼Ð¶Ô±È(&F)",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Îļþ¶Ô±È(&E)",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "ÖØÖÃ",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "ÓïÑÔ"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "È·¶¨",IDOK,30,123,52,14
+    PUSHBUTTON      "È·¶¨",IDOK,47,123,52,14
     PUSHBUTTON      "È¡Ïû",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "¿ÉÓõÄÓïÑÔ:",IDC_STATIC,7,7,140,8
 END
@@ -1053,7 +1053,7 @@ BEGIN
     LTEXT           "ÃèÊö:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 11279a1..47a15c2 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,88,
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "­«³]",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "»y¨¥"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "½T©w",IDOK,30,123,52,14
+    PUSHBUTTON      "½T©w",IDOK,47,123,52,14
     PUSHBUTTON      "¨ú®ø",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "¥i¥Îªº»y¨¥:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "´y­z:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 4022820..024947c 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "Automatické &dokonèování:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Povolit více oken pro porovnání",IDC_STATIC,7,88,
+    GROUPBOX        "Povolit více oken pro porovnání",IDC_STATIC,7,87,
                     221,37
     CONTROL         "s&lo\9eek",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "&souborù",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "Nìkterá obecná okna se zprávami je mo\9eno skrýt.\nPo stisknutí tlaèítka Vrátit se v\9aechna tato okna opìt budou objevovat.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "V&rátit",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Jazyk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,123,52,14
     PUSHBUTTON      "Storno",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Dostupné jazyky:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Popis:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index f205ebd..67b5fa3 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,88,
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Nulstil",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Sprog"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,123,52,14
     PUSHBUTTON      "Afbryd",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Tilgængelige sprog:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Beskrivelse:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 2ea5029..a6e3370 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,88,
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Herstellen",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Taalkeuze"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,123,52,14
     PUSHBUTTON      "Annuleren",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Beschikbare talen",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Beschrijving:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 7f2049a..a502cdd 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -733,27 +733,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Qualifier plusieurs fenêtres pour",IDC_STATIC,7,88,
+    GROUPBOX        "Qualifier plusieurs fenêtres pour",IDC_STATIC,7,87,
                     221,37
     CONTROL         "comparaison de Répert&oires",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "comparaison de &Fichiers",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "&Initialiser",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Langage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,123,52,14
     PUSHBUTTON      "Ann&uler",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Langages disponibles :",IDC_STATIC,7,7,140,8
 END
@@ -1050,7 +1050,7 @@ BEGIN
     LTEXT           "Description:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index c349638..4e81d81 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Aktivieren mehrfacher Vergleichsfenster für",IDC_STATIC,7,88,
+    GROUPBOX        "Aktivieren mehrfacher Vergleichsfenster für",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Ordnervergleich",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "D&ateivergleich",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Zurücksetzen",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Sprache"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,123,52,14
     PUSHBUTTON      "Abbrechen",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Verfügbare Sprachen:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Beschreibung:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc
index 000316b..227ebc9 100644 (file)
--- a/Src/Languages/Hungarian/MergeHungarian.rc
+++ b/Src/Languages/Hungarian/MergeHungarian.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Többszörös összehasonlító ablakok engedélyezése:",IDC_STATIC,7,88,
+    GROUPBOX        "Többszörös összehasonlító ablakok engedélyezése:",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Mappa összehasonlításkor",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "&Fájl összehasonlításkor",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Visszaállít",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Nyelv"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "Rendben",IDOK,30,123,52,14
+    PUSHBUTTON      "Rendben",IDOK,47,123,52,14
     PUSHBUTTON      "Mégsem",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Választható nyelvek:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Leírás:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 79ae896..a60c789 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Attiva finestra di confronto multiplo per",IDC_STATIC,7,88,
+    GROUPBOX        "Attiva finestra di confronto multiplo per",IDC_STATIC,7,87,
                     221,37
     CONTROL         "Confron&to di cartelle",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Confronto di &file",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge ti permette di nascondere alcuni messaggi comuni. Premi il pulsante Ripristina per rendere di nuovo visibili tutti i messaggi.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Ripristina",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Lingua"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,123,52,14
     PUSHBUTTON      "Annulla",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Lingue disponibili:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Descrizione:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index d4f023e..402224b 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "\95¡\90\94\82Ì\94ä\8ar\83E\83C\83\93\83h\83E\82ð\97L\8cø",IDC_STATIC,7,88,
+    GROUPBOX        "\95¡\90\94\82Ì\94ä\8ar\83E\83C\83\93\83h\83E\82ð\97L\8cø",IDC_STATIC,7,87,
                     221,37
     CONTROL         "\83t\83H\83\8b\83_\94ä\8ar(&F)",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "\83t\83@\83C\83\8b\94ä\8ar(&E)",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "\83\8a\83Z\83b\83g",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "\8c¾\8cê"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,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 |
+    LISTBOX         IDC_LANGUAGE_LIST,7,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
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "\90à\96¾:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 7522315..825792b 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,88,
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "ÃʱâÈ­",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "¾ð¾î"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "È®ÀÎ",IDOK,30,123,52,14
+    PUSHBUTTON      "È®ÀÎ",IDOK,47,123,52,14
     PUSHBUTTON      "Ãë¼Ò",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                 WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "¼±Åà °¡´ÉÇÑ ¾ð¾î:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "¼³¸í:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 09a7207..1e06758 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,88,
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Nullstill",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Språk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,123,52,14
     PUSHBUTTON      "Avbryt",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Tilgjengelige språk:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Beskrivelse:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 6f74191..f438501 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "W³¹cz wiele okien porównania dla",IDC_STATIC,7,88,
+    GROUPBOX        "W³¹cz wiele okien porównania dla",IDC_STATIC,7,87,
                     221,37
     CONTROL         "Porównania &folderów",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Porównania &plików",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge pozwala ukryæ niektóre komunikaty. Naci\9cnij przycisk, aby wy\9cwietlaæ wszystkie komunikaty.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Resetuj",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Jêzyk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,123,52,14
     PUSHBUTTON      "Anuluj",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Dostêpne jêzyki:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Opis:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index cd05b88..17da114 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,88,
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Ñáðîñ",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "ßçûê"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,123,52,14
     PUSHBUTTON      "Îòìåíà",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Äîñòóïíûå ÿçûêè:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Îïèñàíèå:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index c017957..a121c80 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,88,
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Jazyk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,123,52,14
     PUSHBUTTON      "Storno",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Dostupné jazyky:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Description:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 40d6c8d..4fd699f 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,88,
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "M&ostrar",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Idioma"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "Aceptar",IDOK,30,123,52,14
+    PUSHBUTTON      "Aceptar",IDOK,47,123,52,14
     PUSHBUTTON      "Cancelar",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Idiomas disponibles:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Descripción:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 45d3aaa..88eda43 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Starta flera jämförfönster för",IDC_STATIC,7,88,
+    GROUPBOX        "Starta flera jämförfönster för",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Jämför kataloger",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Jäm&för filer",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge tillåter döljande av några meddelanderutor. Klicka på Återställ-knappen för att göra alla meddelanderutor synliga igen.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Återställ",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Språk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,123,52,14
     PUSHBUTTON      "Avbryt",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Tillgängliga språk:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Beskrivning:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc
index c75f3c2..af0b831 100644 (file)
--- a/Src/Languages/Turkish/MergeTurkish.rc
+++ b/Src/Languages/Turkish/MergeTurkish.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,88,
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Language"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,123,52,14
     PUSHBUTTON      "Cancel",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Available languages:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Description:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END
 

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 83a98a5..572bbb6 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -735,27 +735,27 @@ BEGIN
     LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
     COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,88,
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,87,
                     221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,110,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
                     IDC_STATIC,7,140,168,31
     PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT
                     WS_TABSTOP
 END
 
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU | WS_THICKFRAME
 CAPTION "Language"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "OK",IDOK,30,123,52,14
+    PUSHBUTTON      "OK",IDOK,47,123,52,14
     PUSHBUTTON      "Cancel",IDCANCEL,115,123,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "Available languages:",IDC_STATIC,7,7,140,8
 END
@@ -1052,7 +1052,7 @@ BEGIN
     LTEXT           "Description:",IDC_STATIC,7,43,63,8
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
                     ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_AUTOHSCROLL |
+    EDITTEXT        IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_READONLY
 END