Update IDD_MERGE7ZMISMATCH resource in localized RC files

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 8ef94d5..0296cb9 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -1016,38 +1016,48 @@ BEGIN
     GROUPBOX        "Default codepage for ANSI files",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Archive support is disabled. In order to enable archive support, please install a version of 7-Zip that WinMerge can interface, and place a copy of the appropriate interface plugin (Merge7z*.dll) in your WinMerge directory.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge can interface 7-Zip 3.11 and above, provided the appropriate interface plugin is available. Please use the version of 7-Zip recommended below until interface plugins for later versions become available.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugin required:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of 7-Zip currently installed on your computer:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of local 7-Zip components found in WinMerge directory:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugins found in WinMerge directory:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Don't display this &message again.\n(You can allways recall this message from help menu.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index a603678..7988fdd 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -1013,38 +1013,48 @@ BEGIN
     GROUPBOX        "Default codepage for ANSI files",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Archive support is disabled. In order to enable archive support, please install a version of 7-Zip that WinMerge can interface, and place a copy of the appropriate interface plugin (Merge7z*.dll) in your WinMerge directory.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge can interface 7-Zip 3.11 and above, provided the appropriate interface plugin is available. Please use the version of 7-Zip recommended below until interface plugins for later versions become available.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugin required:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of 7-Zip currently installed on your computer:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of local 7-Zip components found in WinMerge directory:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugins found in WinMerge directory:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Don't display this &message again.\n(You can allways recall this message from help menu.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 025ba99..6fadec2 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -1013,38 +1013,48 @@ BEGIN
     GROUPBOX        "Pàgina de codis predefinida per a fitxers ANSI",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "El suport d'arxivament està inhabilitat. Per tal d'habilitar-lo instal·leu-hi una versió del 7-Zip amb la qual es pugui enllaçar el WinMerge, i poseu una còpia del connector d'enllaç apropiat (Merge7z*.dll) al directori del WinMerge.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "El WinMerge pot enllaçar-se al 7-Zip 3.11 i superior si el connector d'enllaç apropiat està disponible. Useu la versió del 7-Zip recomanada a continuació fins que hi hagi connectors d'enllaç disponibles per a versions posteriors.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Versió recomanada del 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Connector d'enllaç requerit:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Versió del 7-Zip instal·lada actualment al vostre ordinador:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Versió dels components locals del 7-Zip al directori del WinMerge:",
-                    IDC_STATIC,2,110,212,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Connectors d'enllaç trobats al directori del WinMerge:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "&No tornis a mostrar aquest missatge.\n(Sempre podeu recuperar aquest missatge des de l'ajuda)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "D'acord",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index c12a56f..ed6933e 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -1002,38 +1002,48 @@ BEGIN
     GROUPBOX        "Default codepage for ANSI files",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Archive support is disabled. In order to enable archive support, please install a version of 7-Zip that WinMerge can interface, and place a copy of the appropriate interface plugin (Merge7z*.dll) in your WinMerge directory.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge can interface 7-Zip 3.11 and above, provided the appropriate interface plugin is available. Please use the version of 7-Zip recommended below until interface plugins for later versions become available.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugin required:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of 7-Zip currently installed on your computer:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of local 7-Zip components found in WinMerge directory:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugins found in WinMerge directory:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Don't display this &message again.\n(You can allways recall this message from help menu.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 3b5cda0..1a26ef6 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -1002,38 +1002,48 @@ BEGIN
     GROUPBOX        "Default codepage for ANSI files",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Archive support is disabled. In order to enable archive support, please install a version of 7-Zip that WinMerge can interface, and place a copy of the appropriate interface plugin (Merge7z*.dll) in your WinMerge directory.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge can interface 7-Zip 3.11 and above, provided the appropriate interface plugin is available. Please use the version of 7-Zip recommended below until interface plugins for later versions become available.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugin required:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of 7-Zip currently installed on your computer:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of local 7-Zip components found in WinMerge directory:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugins found in WinMerge directory:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Don't display this &message again.\n(You can allways recall this message from help menu.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 0b8f337..704027b 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -1013,38 +1013,48 @@ BEGIN
     GROUPBOX        "Default codepage for ANSI files",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Archive support is disabled. In order to enable archive support, please install a version of 7-Zip that WinMerge can interface, and place a copy of the appropriate interface plugin (Merge7z*.dll) in your WinMerge directory.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge can interface 7-Zip 3.11 and above, provided the appropriate interface plugin is available. Please use the version of 7-Zip recommended below until interface plugins for later versions become available.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugin required:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of 7-Zip currently installed on your computer:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of local 7-Zip components found in WinMerge directory:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugins found in WinMerge directory:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Don't display this &message again.\n(You can allways recall this message from help menu.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 45d2dca..2e90526 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -1013,38 +1013,48 @@ BEGIN
     GROUPBOX        "Standard codepage for ANSI filer",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Support for arkivering er afbrudt. For at aktivere den, skal man installerer en version af 7-zip som WinMerge kender, og placere en kopi af den tilhørende plugin (Merge7z*.dll) i din WinMerge mappe.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge kender 7-Zip 3.11 og opefter, forudsat en passende plugin er til stede. Brug venligst den version af 7-zip der er anbefalet herunder indtil plugin for senere versioner bliver tilgængelige.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Anbefalet version af 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Nødvendig brugerflade plugin:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version af 7-Zip der er installeret på din computer:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version af lokale 7-Zip komponenter fundet i WinMerge mappen:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Brugerflade plugins fundet i WinMerge mappen:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT |
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Vis ikke denne &besked igen.\n(Du kan altid få beskeden igen fra hjælp menuen.)",
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
                     106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 759365d..c567f2b 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -1015,38 +1015,48 @@ BEGIN
     GROUPBOX        "Default codepage for ANSI files",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Archive support is disabled. In order to enable archive support, please install a version of 7-Zip that WinMerge can interface, and place a copy of the appropriate interface plugin (Merge7z*.dll) in your WinMerge directory.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge can interface 7-Zip 3.11 and above, provided the appropriate interface plugin is available. Please use the version of 7-Zip recommended below until interface plugins for later versions become available.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugin required:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of 7-Zip currently installed on your computer:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of local 7-Zip components found in WinMerge directory:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugins found in WinMerge directory:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Don't display this &message again.\n(You can allways recall this message from help menu.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 8c943e8..7de0051 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -1014,38 +1014,48 @@ BEGIN
     GROUPBOX        "Default codepage for ANSI files",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Archive support is disabled. In order to enable archive support, please install a version of 7-Zip that WinMerge can interface, and place a copy of the appropriate interface plugin (Merge7z*.dll) in your WinMerge directory.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge can interface 7-Zip 3.11 and above, provided the appropriate interface plugin is available. Please use the version of 7-Zip recommended below until interface plugins for later versions become available.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugin required:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of 7-Zip currently installed on your computer:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of local 7-Zip components found in WinMerge directory:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugins found in WinMerge directory:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Don't display this &message again.\n(You can allways recall this message from help menu.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 65d2a78..5eb27e1 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -1021,38 +1021,48 @@ BEGIN
     GROUPBOX        "Standard-Zeichensatz für ANSI-Dateien",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Die Archiv-Unterstützung ist deaktiviert. Um die Unterstützung zu ermöglichen, installieren Sie eine Version von 7-Zip, die WinMerge ansteuern kann, und legen eine Kopie des passenden Schnittstellen-Plugin (Merge7z*.dll) im WinMerge-Verzeichnis ab.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge kann 7-Zip 3.11 und höher ansteuern, vorausgesetzt das passende Schnittstellen-Plugin ist vorhanden. Verwenden Sie bitte die Version von 7-Zip, die unten empfohlen wird, bis Schnittstellen-Plugins für neuere Versionen vorhanden sind.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Empfohlene Version von 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Benötigtes Schnittstellen-Plugin:",IDC_STATIC,2,82,106,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Zurzeit installierte Version von 7-Zip auf Ihrem Computer:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version von 7-Zip Komponenten im WinMerge-Verzeichnis:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Gefundenes Schnittstellen-Plugin im WinMerge-Verzeichnis:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Diese &Meldung nicht erneut anzeigen.\n(Sie können diese Meldung jederzeit vom Hilfe-Menü erneut aufrufen.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc
index fab3845..d909361 100644 (file)
--- a/Src/Languages/Hungarian/MergeHungarian.rc
+++ b/Src/Languages/Hungarian/MergeHungarian.rc
@@ -1014,38 +1014,48 @@ BEGIN
     GROUPBOX        "Alapértelmezett kódlap ANSI fájloknál",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Az Archívum támogatás nem engedélyezett. Amennyiben szeretnéd engedélyezni, elõször telepítened kell a 7-Zip programot, ami integrálható a WinMerge programmal, majd szerezd be a következõ bõvítményt (Merge7z*.dll) és helyezd el a WInMerge könyvtárában.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "A WinMerge a 7-Zip 3.11 vagy annál újabb verzióit tudja integrálni, feltéve, hogy a megfeleõ bõvítmény is rendelkezésre áll. Kérlek, használd az alább látható verziót, amíg újabb bõvítmény nem lesz elérhetõ.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "A 7-Zip javasolt verziója:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Szükséges interfész bõvítmény:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "A jelenleg telepített 7-Zip verziója:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "A WinMerge könyvtárában talált helyi 7-Zip összetevõk verziója:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "A WinMerge könyvtárában talált interfész bõvítmények:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "&Ne jelenjen meg többet ez a figyelmeztetés.\n(Késõbb a Súgó menübõl újra engedélyezheted.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "Rendben",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 7a0f445..782ed90 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -1015,38 +1015,48 @@ BEGIN
     GROUPBOX        "Codice di pagina predefinito per file ANSI",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Il supporto per gli archivi è inattivo. Per attivarlo, installa per favore una versione di 7-Zip con la quale WinMerge possa interfacciarsi e copia il plugin adeguato (Merge7z*.dll) nella tua cartella di WinMerge.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge può interfacciarsi con 7-Zip 3.11 o superiore, a patto che il plugin adeguato sia disponibile. Utilizza la versione di 7-Zip raccomandata qui sotto fino alla disponibilità di plugin per versioni successive.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Versione raccomandata di 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Plugin richiesto:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Versione di 7-Zip installata attualmente sul tuo computer:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Vers. componenti 7-Zip locale nella cartella di WinMerge:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Plugin trovati nella cartella di WinMerge:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Non visualizzare più questo &messaggio.\n(Puoi comunque richiamarlo dal menu di Aiuto)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index e9f307a..9f9667c 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -1015,38 +1015,48 @@ BEGIN
     GROUPBOX        "\94ñUnicode\83t\83@\83C\83\8b\82Ì\83f\83t\83H\83\8b\83g\83R\81[\83h\83y\81[\83W",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "\83A\81[\83J\83C\83u\83T\83|\81[\83g\82Í\96³\8cø\82É\82È\82Á\82Ä\82¢\82Ü\82·\81B\83A\81[\83J\83C\83u\83T\83|\81[\83g\82ð\97L\8cø\82É\82·\82é\82½\82ß\82É\82Í\81AWinMerge \82Æ\98A\8cg\82Å\82«\82é 7-Zip \82Ì\83o\81[\83W\83\87\83\93\82ð\83C\83\93\83X\83g\81[\83\8b\82µ\81A\93K\90Ø\82È\83C\83\93\83^\81[\83t\83F\81[\83X\83v\83\89\83O\83C\83\93(Merge7z*.dll)\82ðWinMerge \83f\83B\83\8c\83N\83g\83\8a\82É\83R\83s\81[\82µ\82Ä\82­\82¾\82³\82¢\81B",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge \82Í\81A7-Zip 3.11\88È\8fã\82Æ\98A\8cg\82Å\82«\81A\8eg\97p\89Â\94\\82Å\93K\90Ø\82È\83C\83\93\83^\81[\83t\83F\81[\83X\83v\83\89\83O\83C\83\93\82ð\92ñ\8b\9f\82µ\82Ü\82·\81B\8dÅ\90V\82Ì\83o\81[\83W\83\87\83\93\82Ì\83C\83\93\83^\81[\83t\83F\81[\83X\83v\83\89\83O\83C\83\93\82ª\97\98\97p\89Â\94\\82É\82È\82é\82Ü\82Å\81A\88È\89º\82Ì\90\84\8f§\82³\82ê\82é7-Zip \82Ì\83o\81[\83W\83\87\83\93\82ð\8eg\97p\82µ\82Ä\82­\82¾\82³\82¢\81B",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "7-Zip \82Ì\90\84\8f§\83o\81[\83W\83\87\83\93:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "\95K\97v\82È\83C\83\93\83^\81[\83t\83F\81[\83X\83v\83\89\83O\83C\83\93:",IDC_STATIC,2,82,208,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "\8c»\8dÝ\83C\83\93\83X\83g\81[\83\8b\82³\82ê\82Ä\82¢\82é 7-Zip \82Ì\83o\81[\83W\83\87\83\93:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "WinMerge \83f\83B\83\8c\83N\83g\83\8a\93à\82Å\8c©\82Â\82©\82Á\82½ 7-Zip \82Ì\83o\81[\83W\83\87\83\93:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "WinMerge \83f\83B\83\8c\83N\83g\83\8a\93à\82Å\8c©\82Â\82©\82Á\82½\83C\83\93\83^\81[\83t\83F\81[\83X\83v\83\89\83O\83C\83\93:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "\8dÄ\93x\82±\82Ì\83\81\83b\83Z\81[\83W\82ð\95\\8e¦\82µ\82È\82¢(&M)\81B\n(\83w\83\8b\83v\83\81\83j\83\85\81[\82©\82ç\82±\82Ì\83\81\83b\83Z\81[\83W\82ð\95\\8e¦\82Å\82«\82Ü\82·\81B)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 0b10060..9e1e2f6 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -1010,38 +1010,48 @@ BEGIN
     GROUPBOX        "ANSI ÆÄÀÏÀÇ ±âº» codepage",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "¾ÐÃàÁö¿ø ±â´ÉÀÌ ²¨Á®ÀÖ½À´Ï´Ù. »ç¿ëÇϱâ À§Çؼ­´Â Winmere°¡ ÀÎÅÍÆäÀ̽ºÇÒ ¼ö ÀÖ´Â ¹öÀüÀÇ 7-Zip À» ÀνºÅçÇÏ°í, Winmerge µð·ºÅ丮¿¡ plugin(Merge7z*.dll)À» º¹»çÇϼ¼¿ä.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "Winmere ´Â 7-Zip 3.11 ÀÌ»ó ¹öÀü¿¡¼­ Á¦°øÇÏ´Â ÀÎÅÍÆäÀ̽º Ç÷¯±×ÀÎÀ» »ç¿ëÇÒ ¼ö ÀÖ½À´Ï´Ù. ¾Æ·¡¿¡¼­ ±ÇÀåÇÏ´Â 7-Zip ÀÎÅÍÆäÀ̽º Ç÷¯±×ÀÎÀ» »ç¿ëÇϼ¼¿ä.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "±ÇÀåÇÏ´Â 7-Zip ¹öÀü:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "ÇÊ¿äÇÑ ÀÎÅÍÆäÀ̽º Ç÷¯±×ÀÎ:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "ÇöÀç ¼³Ä¡µÇ¾î ÀÖ´Â 7-Zip ¹öÀü:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "WinMerge µð·ºÅ丮¼­ ¹ß°ßµÈ 7-Zip ÄÄÆ÷³ÍÆ® ¹öÀü:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "WinMerge µð·ºÅ丮¼­ ¹ß°ßµÈ ÀÎÅÍÆäÀ̽º Ç÷¯±×ÀÎ:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "ÀÌ ¸Þ½ÃÁö¸¦ ´Ù½Ã Ç¥½ÃÇÏÁö ¾Ê½À´Ï´Ù(&M)\n(µµ¿ò¸» ¸Þ´º¿¡¼­ ¸Þ¼¼Áö¸¦ ´Ù½Ã Ç¥½ÃÇÏ°Ô ÇÒ ¼ö ÀÖ½À´Ï´Ù.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,216,20
-    DEFPUSHBUTTON   "OK",IDOK,222,168,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index ea087b4..c23b605 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -1012,38 +1012,48 @@ BEGIN
     GROUPBOX        "Standard codepage for ANSI-filer",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Arkivstøtte er ikke aktivert. For å aktivere arkivstøtte, installer en versjon av 7-Zip som WinMerge kan bruke, og plasser en kopi av grensesnittprogramtillegget (Merge7z*.dll) i din WinMerge mappe.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge kan bruke 7-Zip 3.11 og over, gitt at den riktig grensesnittprogramtillegget er tilgjengelig. Bruk den versjonen av 7-Zip anbefalt nedenfor.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Anbefalt versjon av 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Grensesnittprogramtillegg påkrevd:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Versjon av 7-Zip installert på din datamaskin:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Versjon av lokale 7-Zip komponenter funnet i WinMerge mappen:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Grensesnittprogramtillegg funnet i WinMerge mappen:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT |
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Ikke vis denne meldingen igjen.\n(Du kan alltid vise melding på nytt fra hjelpmenyen.)",
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
                     106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 040464d..7940a8b 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -1013,38 +1013,48 @@ BEGIN
     GROUPBOX        "Default codepage for ANSI files",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Archive support is disabled. In order to enable archive support, please install a version of 7-Zip that WinMerge can interface, and place a copy of the appropriate interface plugin (Merge7z*.dll) in your WinMerge directory.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge can interface 7-Zip 3.11 and above, provided the appropriate interface plugin is available. Please use the version of 7-Zip recommended below until interface plugins for later versions become available.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugin required:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of 7-Zip currently installed on your computer:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of local 7-Zip components found in WinMerge directory:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugins found in WinMerge directory:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Don't display this &message again.\n(You can allways recall this message from help menu.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index b4b4c6d..b5e7f0e 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -1023,38 +1023,48 @@ BEGIN
     GROUPBOX        "Default codepage for ANSI files",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Archive support is disabled. In order to enable archive support, please install a version of 7-Zip that WinMerge can interface, and place a copy of the appropriate interface plugin (Merge7z*.dll) in your WinMerge directory.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge can interface 7-Zip 3.11 and above, provided the appropriate interface plugin is available. Please use the version of 7-Zip recommended below until interface plugins for later versions become available.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugin required:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of 7-Zip currently installed on your computer:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of local 7-Zip components found in WinMerge directory:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugins found in WinMerge directory:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Don't display this &message again.\n(You can allways recall this message from help menu.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 7a6368c..c4b6358 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -1013,38 +1013,48 @@ BEGIN
     GROUPBOX        "Default codepage for ANSI files",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Archive support is disabled. In order to enable archive support, please install a version of 7-Zip that WinMerge can interface, and place a copy of the appropriate interface plugin (Merge7z*.dll) in your WinMerge directory.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge can interface 7-Zip 3.11 and above, provided the appropriate interface plugin is available. Please use the version of 7-Zip recommended below until interface plugins for later versions become available.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugin required:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of 7-Zip currently installed on your computer:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version of local 7-Zip components found in WinMerge directory:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Interface plugins found in WinMerge directory:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Don't display this &message again.\n(You can allways recall this message from help menu.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 4aebc36..3f3ae1a 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -1013,38 +1013,48 @@ BEGIN
     GROUPBOX        "Página de códigos por defecto para ficheros ANSI",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN    
-    LTEXT           "El soporte para archivado está deshabilitado.Para activarlo, por favor instale una versión de 7-Zip que Winmerge pueda manejar y copie el complemento de interface adecuado (Merge7z*.dll) en el directorio de Winmerge.",
-                    IDC_STATIC,2,2,272,32    
-    LTEXT           "WinMerge puede manejar 7-Zip 3.11 y superior, siempre que el complemento de interface adecuado esté disponible. Por favor, use la versión de 7-Zip recomendada debajo hasta que nuevos complementos de interface estén disponibles.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Versión recomendada de 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Plugin de interface requerido:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Versión de 7-Zip instalada actualmente en su PC:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Versión de componentes de 7-Zip en el directorio de WinMerge",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Plugins de interface encontrados en el directorio de WinMerge:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "No mostrar este &mensaje de nuevo.\n(Siempre puede volver a mostrar este mensaje desde el menú de ayuda.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+BEGIN
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 8c3ce9c..495a7b9 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -1012,38 +1012,48 @@ BEGIN
     GROUPBOX        "Standard codepage för ANSI filer",IDC_STATIC,7,7,221,58
 END
 
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "WinMerge"
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Arkivstöd är avstängt. För att starta arkivstöd, var god och installera en version av 7-Zip som WinMerge kan använda, och kopiera en kopia av det lämpliga gränssnitts-pluginet (Merge7z*.dll) i din WinMerge katalog.",
-                    IDC_STATIC,2,2,272,32
-    LTEXT           "WinMerge kan använda 7-Zip 3.11 och högre, förutsatt att lämpligt gränssnitts-plugin finns. Var god och använd den version av 7-Zip som rekommenderas nedan tills gränssnitts-plugins för senare versioner blir tillgängliga.",
-                    IDC_STATIC,2,34,272,32
-    LTEXT           "Rekommenderad version av 7-Zip:",IDC_STATIC,2,70,131,8
-    EDITTEXT        101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "WinMerge plugin krävd:",IDC_STATIC,2,82,86,8
-    EDITTEXT        102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version av 7-Zip nu installerad i din dator:",
-                    IDC_STATIC,2,98,208,8
-    EDITTEXT        103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "Version av lokala 7-Zip komponenter hittades i WinMerge katalog:",
-                    IDC_STATIC,2,110,208,8
-    EDITTEXT        104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER | WS_GROUP | NOT WS_TABSTOP
-    LTEXT           "WinMerge plugins hittades i WinMerge katalog:",
-                    IDC_STATIC,2,130,168,28
-    LISTBOX         105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_GROUP
-    CONTROL         "Visa inte detta &meddelande igen.\n(Du kan alltid få tillbaka detta meddelande från hjälpmenyn.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
-                    WS_TABSTOP,2,164,202,20
-    DEFPUSHBUTTON   "OK",IDOK,208,170,50,14,WS_GROUP
+    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,2,296,20
+    CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,26,296,1
+    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.\nThere must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+                    IDC_STATIC,2,30,296,28
+    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+                    IDC_STATIC,2,58,296,18
+    CTEXT           "Version",IDC_STATIC,146,78,56,20,SS_CENTERIMAGE |
+                    SS_SUNKEN
+    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,78,94,20,
+                    SS_SUNKEN
+    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,100,142,10,
+                    SS_CENTERIMAGE
+    CTEXT           "0.00",110,146,100,20,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "present",109,168,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,100,58,10,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+    CTEXT           "present",112,264,100,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+                    2,112,142,10,SS_CENTERIMAGE
+    CTEXT           "none",120,146,112,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",121,204,112,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "missing",122,264,112,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+                    2,124,142,10,SS_CENTERIMAGE
+    CTEXT           "none",130,146,124,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "",131,204,124,58,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "outdated",132,264,124,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Plugins on path:",9001,2,140,100,8
+    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+                    WS_TABSTOP,2,225,218,18
+    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+                    236,140,62,10
+    LISTBOX         105,2,150,296,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+                    WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 #ifndef _MAC