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
#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
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
#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
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
#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
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
#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
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
#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
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
#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
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
#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
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
#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
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
#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
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
#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
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
#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
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
#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
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
#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
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
#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
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
#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
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
#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
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
#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
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
#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
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
#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
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
// - 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
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
#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