PATCH: [ 1025443 ] Add '1 Difference Found' text

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 561d9d5..599ccae 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -1549,7 +1549,8 @@ BEGIN
     IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d/%d  Ch: %d/%d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Diferença %1 de %2"
-    IDS_NO_DIFF_SEL_FMT     "%1 Diferença(s) encontrada(s)"
+    IDS_NO_DIFF_SEL_FMT     "%1 Diferenças encontradas"
+    IDS_1_DIFF_FOUND        "1 Diferença encontrada"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index 77e7529..e14a884 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -1434,6 +1434,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Ðàçëèêè %1 îò %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Íàìåðåíè ðàçëèêè"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/Bulgarian/resource.h b/Src/Languages/Bulgarian/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Bulgarian/resource.h
+++ b/Src/Languages/Bulgarian/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 8c63e6e..f36f2cf 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -1450,6 +1450,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Combina"
     IDS_DIFF_NUMBER_STATUS_FMT "Diferència %1 de %2"
     IDS_NO_DIFF_SEL_FMT     "S'han trobat %1 diferènces"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Catalan/resource.h
+++ b/Src/Languages/Catalan/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 1f06054..7730e47 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -1420,6 +1420,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "²»Í¬ %1 ÔÚ %2"
     IDS_NO_DIFF_SEL_FMT         "%1 ²»Í¬ÕÒµ½"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 18e03f5..fc2ea21 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -1534,6 +1534,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "¤£¦P %1 ¦b %2"
     IDS_NO_DIFF_SEL_FMT         "%1 ¤£¦P§ä¨ì"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 8262fb2..5f792dc 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -1547,6 +1547,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Differences Found"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 16edbea..3d8a8bb 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -1545,6 +1545,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Forskel %1 af %2"
     IDS_NO_DIFF_SEL_FMT     "%1 forskelle fundet"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index d9dc4c0..64ed28c 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -1549,6 +1549,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Differences Found"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 612ec42..ed09c31 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -1547,6 +1547,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Différence %1 parmi %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Différences Trouvées"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 3899bca..ca4e981 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -1553,6 +1553,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Unterschied %1 von %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Unterschiede gefunden"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 9246f60..e4ba5d4 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -1548,6 +1548,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Unione"
     IDS_DIFF_NUMBER_STATUS_FMT "Differenza %1 su %2"
     IDS_NO_DIFF_SEL_FMT     "%1 differenze trovate"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "SL"
 END
 

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index 4199baf..4398561 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -1437,6 +1437,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "\83}\81[\83W"
     IDS_DIFF_NUMBER_STATUS_FMT "\8d·\88Ù %1/%2"
     IDS_NO_DIFF_SEL_FMT     "%1\8cÂ\82Ì\8d·\88Ù\82ª\8c©\82Â\82©\82è\82Ü\82µ\82½"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/Japanese/resource.h b/Src/Languages/Japanese/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Japanese/resource.h
+++ b/Src/Languages/Japanese/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 0a55cc2..cf8ea01 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -1508,6 +1508,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "´Ù¸¥ ÆÄÀÏ(%1 Áß %2)"
     IDS_NO_DIFF_SEL_FMT     "´Ù¸¥ ºÎºÐ %1°³ ¹ß°ß"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 86c7e47..41bd182 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -1546,6 +1546,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Forskjell %1 av %2"
     IDS_NO_DIFF_SEL_FMT     "%1 forskjeller funnet"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 3b54bdf..d52d2ef 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -1547,6 +1547,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Differences Found"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Polish/resource.h
+++ b/Src/Languages/Polish/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index cc14bdd..a1c1573 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -1444,6 +1444,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Îòëè÷èå %1 îò %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Îòëè÷èé íàéäåíî"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Russian/resource.h
+++ b/Src/Languages/Russian/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index d6f960a..f77c4f9 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -1547,6 +1547,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Rozdiel %1 z %2"
     IDS_NO_DIFF_SEL_FMT     "Nájdených %1 rozdielov"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 0d5f48a..57f5e43 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -1547,6 +1547,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Differences Found"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 1779bbb..4dbdf08 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -1546,6 +1546,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge mode"
     IDS_DIFF_NUMBER_STATUS_FMT "Skillnad %1 av %2"
     IDS_NO_DIFF_SEL_FMT     "%1 skillnader funna"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "Skrivskyddad"
 END
 

diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/Languages/Swedish/resource.h
+++ b/Src/Languages/Swedish/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201

diff --git a/Src/Merge.rc b/Src/Merge.rc
index f9cf5c7..0c43b9d 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1432,6 +1432,7 @@ BEGIN
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Differences Found"
+    IDS_1_DIFF_FOUND        "1 Difference Found"
     IDS_STATUSBAR_READONLY  "RO"
 END
 

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 5aa37f6..1da386f 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -2105,8 +2105,13 @@ void CMergeDoc::OnUpdateStatusNum(CCmdUI* pCmdUI)
        // - show amount of diffs
        else if (GetCurrentDiff() < 0)
        {
-               sCnt.Format(_T("%ld"), m_nDiffs);
-               AfxFormatString1(s, IDS_NO_DIFF_SEL_FMT, sCnt); 
+               if (m_nDiffs == 1)
+                       VERIFY(s.LoadString(IDS_1_DIFF_FOUND));
+               else
+               {
+                       sCnt.Format(_T("%ld"), m_nDiffs);
+                       AfxFormatString1(s, IDS_NO_DIFF_SEL_FMT, sCnt);
+               }
        }
        
        // There are differences and diff selected

diff --git a/Src/readme.txt b/Src/readme.txt
index e5c447e..7609202 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,6 +1,9 @@
 2004-09-10 Kimmo
  PATCH: [ 1025411 ] Cleanup PropVSS.cpp
   Src: PropVss.cpp
+ PATCH: [ 1025443 ] Add '1 Difference Found' text
+  Src: Merge.rc MergeDoc.cpp resource.h
+  Src/Languages: *.rc resource.h
 
 2004-09-09 Kimmo
  PATCH: [ 1025052 ] Italian translation updated for latest experimental version

diff --git a/Src/resource.h b/Src/resource.h
index 383e25a..507597f 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -315,7 +315,8 @@
 #define IDS_MERGEMODE_MERGING           16835
 #define IDS_DIFF_NUMBER_STATUS_FMT      16836
 #define IDS_NO_DIFF_SEL_FMT             16837
-#define IDS_STATUSBAR_READONLY          16838
+#define IDS_1_DIFF_FOUND                16838
+#define IDS_STATUSBAR_READONLY          16839
 
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201