Fix GitHub issue #402: More space for some internationalized strings

diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd
index b53b778..c58fd25 100644 (file)
--- a/DownloadDeps.cmd
+++ b/DownloadDeps.cmd
@@ -8,7 +8,7 @@ https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.2/Merge7z1900
 https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.2/Merge7z1900.2-x64.zip!Build\X64 ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.4-win32.zip!Build ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.4-x64.zip!Build\X64 ^
-https://github.com/WinMerge/winimerge/releases/download/1.0.19.0/winimerge-1-0-19-0-exe.zip!Build ^
+https://github.com/WinMerge/winimerge/releases/download/1.0.20.0/winimerge-1-0-20-0-exe.zip!Build ^
 https://github.com/WinMerge/patch/releases/download/v2.5.9-7/patch-2.5.9-7-bin.zip!Build\GnuWin32 ^
 http://www.magicnotes.com/steelbytes/SBAppLocale_ENG.zip!Docs\Manual\Tools
 

diff --git a/Externals/versions.txt b/Externals/versions.txt
index 16e2951..cd2da34 100644 (file)
--- a/Externals/versions.txt
+++ b/Externals/versions.txt
@@ -7,7 +7,7 @@ POCO: 1.10.1
 boost: 1.72.0
 frhed: 0.10904.2017.4
 freeimage: 3.18.0
-WinIMerge: 1.0.19.0
+WinIMerge: 1.0.20.0
 Google C++ Testing Framework: 1.70
 GnuWin32 Patch for Windows: 2.5.9-7
 7-zip: 19.00

diff --git a/Externals/winimerge b/Externals/winimerge
index 5b2c848..1fd2ce3 160000 (submodule)
--- a/Externals/winimerge
+++ b/Externals/winimerge
@@ -1 +1 @@
-Subproject commit 5b2c848a7449956d144d93feba73f8fcae2d2552
+Subproject commit 1fd2ce3844de44e338a25d161dd98533fde7fdca

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 51f2cb6..e4bec68 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1012,7 +1012,7 @@ BEGIN
     PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,161,228,88,14,NOT WS_TABSTOP\r
 END\r
 \r
-IDD_EDIT_FIND DIALOGEX 30, 73, 293, 96\r
+IDD_EDIT_FIND DIALOGEX 30, 73, 305, 96\r
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Find"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
@@ -1022,12 +1022,12 @@ BEGIN
     CONTROL         "Match &whole word only",IDC_EDIT_WHOLE_WORD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,24,140,10\r
     CONTROL         "Match &case",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,36,140,10\r
     CONTROL         "Regular &expression",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,140,10\r
-    CONTROL         "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,140,10\r
+    CONTROL         "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,200,10\r
     CONTROL         "&Don't close this dialog box",IDC_FINDDLG_DONTCLOSE,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,140,10\r
-    DEFPUSHBUTTON   "&Find Next",IDOK,226,7,60,14,WS_GROUP\r
-    PUSHBUTTON      "Find &Prev",IDC_EDIT_FINDPREV,226,24,60,14,WS_GROUP\r
-    PUSHBUTTON      "Cancel",IDCANCEL,226,41,60,14\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,200,10\r
+    DEFPUSHBUTTON   "&Find Next",IDOK,226,7,72,14,WS_GROUP\r
+    PUSHBUTTON      "Find &Prev",IDC_EDIT_FINDPREV,226,24,72,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,226,41,72,14\r
 END\r
 \r
 IDD_DIR_FILTER DIALOGEX 30, 73, 293, 74\r
@@ -1057,7 +1057,7 @@ BEGIN
     CONTROL         "Match &case",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,140,10\r
     CONTROL         "Regular &expression",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,140,10\r
     CONTROL         "&Don't wrap end of file",IDC_EDIT_SCOPE_DONT_WRAP,\r
-                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,7,78,140,16\r
+                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,7,78,200,16\r
     GROUPBOX        "Replace in",IDC_STATIC,149,40,90,36,WS_GROUP\r
     CONTROL         "&Selection",IDC_EDIT_SCOPE_SELECTION,"Button",BS_AUTORADIOBUTTON | WS_GROUP,154,51,80,10\r
     CONTROL         "Wh&ole file",IDC_EDIT_SCOPE_WHOLE_FILE,"Button",BS_AUTORADIOBUTTON,154,61,80,10\r
@@ -1240,7 +1240,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,134,142,10\r
     CONTROL         "Case sensi&tive",IDC_DIFF_CASESENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,142,10\r
     CONTROL         "Igno&re carriage return differences (Windows/Unix/Mac)",IDC_DIFF_IGNOREEOL,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,156,221,10\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,156,281,10\r
     CONTROL         "Inclu&de command line",IDC_DIFF_INCLCMDLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,134,170,10\r
     CONTROL         "Open to e&xternal editor",IDC_DIFF_OPENTOEDITOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,145,170,10\r
     PUSHBUTTON      "Defaults",IDC_DIFF_DEFAULTS,7,170,70,14\r