PATCH: [ 856974 ] More space for numbers in dir compare statuswindow

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 12cf15a..13defd0 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -706,15 +706,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -722,35 +722,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 51ef3cc..36b0d35 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -704,15 +704,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -720,35 +720,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "&Atura",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "&Atura",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 054bcbe..7eb49e8 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -685,15 +685,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -701,35 +701,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 51576e4..09968b5 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -686,15 +686,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -702,35 +702,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index e6e1809..be90f95 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -702,15 +702,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -718,35 +718,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index e1ea34d..a75227b 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -700,15 +700,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -716,35 +716,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 293558d..f73d27d 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -704,15 +704,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -720,35 +720,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index b7262b6..d33f4a2 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -703,15 +703,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -719,35 +719,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index b7e7db2..2e85377 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -706,15 +706,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -722,35 +722,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 4590397..1d9ae99 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -699,15 +699,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -715,35 +715,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index e4f8095..a7b3617 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -667,15 +667,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -683,35 +683,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 59ae317..db2c1c2 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -700,15 +700,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -716,35 +716,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index c436acf..7ebe390 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -703,15 +703,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -719,35 +719,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index e15e851..454ced0 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -701,15 +701,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -717,35 +717,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE |
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 6d66937..0f920af 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -700,15 +700,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -716,35 +716,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/Merge.rc b/Src/Merge.rc
index ca6988f..9616399 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -708,15 +708,15 @@ BEGIN
                     ES_READONLY
 END
 
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 382, 41
+IDD_DIRCOMPSTATE DIALOGEX 0, 0, 410, 41
 STYLE WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,7,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,62,7,12,11,
+    CONTROL         213,IDC_STATIC,"Static",SS_BITMAP,60,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,62,22,12,11,
+    CONTROL         214,IDC_STATIC,"Static",SS_BITMAP,60,23,12,11,
                     WS_EX_STATICEDGE
     CONTROL         215,IDC_STATIC,"Static",SS_BITMAP,7,23,12,11,
                     WS_EX_STATICEDGE
@@ -724,35 +724,35 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,112,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,163,7,12,11,
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,164,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,22,12,11,
+    CONTROL         219,IDC_STATIC,"Static",SS_BITMAP,164,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,22,12,11,
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,112,23,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,213,7,12,11,
+    CONTROL         226,IDC_STATIC,"Static",SS_BITMAP,216,7,12,11,
                     WS_EX_STATICEDGE
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11,
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,216,23,12,11,
                     WS_EX_STATICEDGE
-    RTEXT           "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 
+    RTEXT           "",IDC_COUNT_LFOLDER,24,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFOLDER,24,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 
+    RTEXT           "",IDC_COUNT_EQUAL,76,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_NOTEQUAL,76,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 
+    RTEXT           "",IDC_COUNT_BINARYSAME,128,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 
+    RTEXT           "",IDC_COUNT_BINARYDIFF,128,25,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000
-    RTEXT           "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 
+    RTEXT           "",IDC_COUNT_LFILE,180,9,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_RFILE,180,25,26,8,SS_REALSIZEIMAGE | 0x2000
+    RTEXT           "",IDC_COUNT_FOLDERSKIP,232,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 
+    RTEXT           "",IDC_COUNT_FILESKIP,232,24,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    RTEXT           "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 
+    RTEXT           "",IDC_COUNT_UNKNOWN,284,9,26,8,SS_REALSIZEIMAGE | 
                     0x2000
-    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,317,14,60,14
+    PUSHBUTTON      "Stop",IDC_COMPARISON_STOP,320,13,83,14
 END
 
 

diff --git a/Src/readme.txt b/Src/readme.txt
index f14e77b..99018db 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -2,6 +2,9 @@
  PATCH: [ 857003 ] Move linediff messagebox text into resource
   WinMerge: Merge.rc MergeDocLineDiffs.cpp resource.h
   Languages: *.rc resource.h
+ PATCH: [ 856974 ] More space for numbers in dir compare statuswindow
+  WinMerge: Merge.rc
+  Languages: *.rc
 
 2003-12-09 Laoran
  BUG: [ 842812 ] Some extension filtering happening by default (fix for *.*)