From: Perry Rapp Date: Sat, 1 May 2004 04:14:26 +0000 (+0000) Subject: PATCH: [ 941623 ] Propose moving IDC_COMPARISON_STOP to block with ...CLOSE X-Git-Tag: 2.16.5~6961 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=406a4582b4d7992e4b17047fdce3d9174bc45e91;p=winmerge-jp%2Fwinmerge-jp.git PATCH: [ 941623 ] Propose moving IDC_COMPARISON_STOP to block with ...CLOSE --- diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc index 14013bfe3..70f20d12c 100644 --- a/Src/Languages/Brazilian/MergeBrazilian.rc +++ b/Src/Languages/Brazilian/MergeBrazilian.rc @@ -1389,8 +1389,6 @@ END STRINGTABLE BEGIN - IDC_COMPARISON_STOP "Stop" - IDC_COMPARISON_CLOSE "Press any key" IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" END @@ -1472,6 +1470,13 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END +// IDC_COMPARISON_STOP SYNCHRO +STRINGTABLE +BEGIN + IDC_COMPARISON_STOP "Stop" + IDC_COMPARISON_CLOSE "Press any key" +END + STRINGTABLE BEGIN IDS_NUM_REPLACED "Substituindo %1 texto(s)." diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc index 8eed9c6fa..59b5a47b6 100644 --- a/Src/Languages/Bulgarian/MergeBulgarian.rc +++ b/Src/Languages/Bulgarian/MergeBulgarian.rc @@ -1283,8 +1283,6 @@ END STRINGTABLE BEGIN - IDC_COMPARISON_STOP "Ñïèðàíå" - IDC_COMPARISON_CLOSE "Íàòèñíè êëàâèø" IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" END @@ -1366,6 +1364,13 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END +// IDC_COMPARISON_STOP SYNCHRO +STRINGTABLE +BEGIN + IDC_COMPARISON_STOP "Ñïèðàíå" + IDC_COMPARISON_CLOSE "Íàòèñíè êëàâèø" +END + STRINGTABLE BEGIN IDS_NUM_REPLACED "Çàìåíÿ %1 íèçà." diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc index b978d476d..fa5b38fe2 100644 --- a/Src/Languages/Catalan/MergeCatalan.rc +++ b/Src/Languages/Catalan/MergeCatalan.rc @@ -1397,9 +1397,13 @@ BEGIN IDS_STATUSBAR_READONLY "RO" IDS_COLHDR_LENCODING "Left Encoding" IDS_COLHDR_RENCODING "Right Encoding" + IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" +END + +STRINGTABLE +BEGIN IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" - IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" END // IDS_PRIVATEBUILD_FMT SYNCHRO @@ -1479,6 +1483,7 @@ BEGIN IDC_MIXED_EOL "Permet la &barreja de tipus de marques de final de línia" END +// IDC_COMPARISON_STOP SYNCHRO STRINGTABLE BEGIN IDC_COMPARISON_STOP "Atura" diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index 55fb925bd..2b4b46aba 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -1251,9 +1251,13 @@ BEGIN IDS_STATUSBAR_READONLY "RO" IDS_COLHDR_LENCODING "Left Encoding" IDS_COLHDR_RENCODING "Right Encoding" + IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" +END + +STRINGTABLE +BEGIN IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" - IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" END // IDS_PRIVATEBUILD_FMT SYNCHRO @@ -1333,6 +1337,7 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END +// IDC_COMPARISON_STOP SYNCHRO STRINGTABLE BEGIN IDC_COMPARISON_STOP "Stop" @@ -1403,6 +1408,7 @@ BEGIN ID_DIR_COPY_RIGHT_TO_LEFT "¸´ÖÆÑ¡ÔñµÄÎļþµ½ÒÑÃüÃûµÄÎļþ¼Ð" END +// ID_DIR_COPY_LEFT_TO_RIGHT SYNCHRO STRINGTABLE BEGIN ID_DIR_COPY_LEFT_TO_RIGHT "¸´ÖÆÑ¡ÔñµÄÎļþµ½ÒÑÃüÃûµÄÎļþ¼Ð" diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index 31fcc16e7..f66e807f2 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -1365,9 +1365,13 @@ BEGIN IDS_STATUSBAR_READONLY "RO" IDS_COLHDR_LENCODING "Left Encoding" IDS_COLHDR_RENCODING "Right Encoding" + IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" +END + +STRINGTABLE +BEGIN IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" - IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" END // IDS_PRIVATEBUILD_FMT SYNCHRO @@ -1447,6 +1451,7 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END +// IDC_COMPARISON_STOP SYNCHRO STRINGTABLE BEGIN IDC_COMPARISON_STOP "Stop" diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc index 1021f997b..3ac2d37a9 100644 --- a/Src/Languages/Czech/MergeCzech.rc +++ b/Src/Languages/Czech/MergeCzech.rc @@ -1381,9 +1381,13 @@ BEGIN IDS_STATUSBAR_READONLY "RO" IDS_COLHDR_LENCODING "Left Encoding" IDS_COLHDR_RENCODING "Right Encoding" + IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" +END + +STRINGTABLE +BEGIN IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" - IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" END // IDS_PRIVATEBUILD_FMT SYNCHRO @@ -1463,6 +1467,7 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END +// IDC_COMPARISON_STOP SYNCHRO STRINGTABLE BEGIN IDC_COMPARISON_STOP "Stop" diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index 766ea17df..3bd1fdd21 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -1380,9 +1380,13 @@ BEGIN IDS_STATUSBAR_READONLY "RO" IDS_COLHDR_LENCODING "Left Encoding" IDS_COLHDR_RENCODING "Right Encoding" + IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" +END + +STRINGTABLE +BEGIN IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" - IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" END // IDS_PRIVATEBUILD_FMT SYNCHRO @@ -1462,7 +1466,8 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END -STRINGTABLE +// IDC_COMPARISON_STOP SYNCHRO +STRINGTABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index 79adebf5b..af920d267 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -1384,9 +1384,13 @@ BEGIN IDS_STATUSBAR_READONLY "RO" IDS_COLHDR_LENCODING "Left Encoding" IDS_COLHDR_RENCODING "Right Encoding" + IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" +END + +STRINGTABLE +BEGIN IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" - IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" END // IDS_PRIVATEBUILD_FMT SYNCHRO @@ -1466,6 +1470,7 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END +// IDC_COMPARISON_STOP SYNCHRO STRINGTABLE BEGIN IDC_COMPARISON_STOP "Stop" diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index 2afd47b11..8915c7e38 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -1383,9 +1383,13 @@ BEGIN IDS_STATUSBAR_READONLY "RO" IDS_COLHDR_LENCODING "Left Encoding" IDS_COLHDR_RENCODING "Right Encoding" + IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" +END + +STRINGTABLE +BEGIN IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" - IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" END // IDS_PRIVATEBUILD_FMT SYNCHRO @@ -1465,7 +1469,8 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END -STRINGTABLE +// IDC_COMPARISON_STOP SYNCHRO +STRINGTABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index 6ba165b1b..9f7eaa5da 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -1227,12 +1227,14 @@ BEGIN ID_EDIT_REDO "Wiederholt die vorher rückgängig gemachte Aktion.\nWiederherstellen (Strg+Y)" END +// ID_VIEW_TOOLBAR SYNCHRO STRINGTABLE BEGIN ID_VIEW_TOOLBAR "Blendet die Symbolleiste ein oder aus.\nSymbolleiste ein-/ausschalten" ID_VIEW_STATUS_BAR "Blendet die Statusleiste ein oder aus.\nStatusleiste ein-/ausschalten" END +// AFX_IDS_SCSIZE SYNCHRO STRINGTABLE BEGIN AFX_IDS_SCSIZE "Ändert die Fenstergröße." @@ -1265,6 +1267,7 @@ BEGIN IDS_ELAPSED_TIME "Ausführungszeit: %ld ms" END +// IDS_VERSION_FMT SYNCHRO STRINGTABLE BEGIN IDS_VERSION_FMT "Version %1 - Deutsch" @@ -1329,6 +1332,7 @@ BEGIN IDS_DEL_LEFT_FMT "Links (%1)" END +// IDS_DEL_RIGHT_FMT SYNCHRO STRINGTABLE BEGIN IDS_DEL_RIGHT_FMT "Rechts (%1)" @@ -1370,6 +1374,7 @@ BEGIN IDS_COLHDR_RVERSION "Rechte Dateiversion" END +// IDS_LEFTONLY SYNCHRO STRINGTABLE BEGIN IDS_LEFTONLY "Nur Links" @@ -1387,12 +1392,11 @@ END STRINGTABLE BEGIN - IDC_COMPARISON_STOP "Stop" - IDC_COMPARISON_CLOSE "Press any key" IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" END +// IDS_PRIVATEBUILD_FMT SYNCHRO STRINGTABLE BEGIN IDS_PRIVATEBUILD_FMT "Private Build: %1" @@ -1469,6 +1473,13 @@ BEGIN IDC_MIXED_EOL "Mischen der Zeilenumbruch-Formate erlauben" END +// IDC_COMPARISON_STOP SYNCHRO +STRINGTABLE +BEGIN + IDC_COMPARISON_STOP "Stop" + IDC_COMPARISON_CLOSE "Press any key" +END + STRINGTABLE BEGIN IDS_NUM_REPLACED "%1 Vorkommen ersetzt." @@ -1481,6 +1492,7 @@ BEGIN IDS_CANNOT_EXECUTE_FILE "%1 konnte nicht ausgeführt werden." END +// IDS_MESSAGEBOX_OK SYNCHRO STRINGTABLE BEGIN IDS_MESSAGEBOX_OK "&Ok" @@ -1505,6 +1517,7 @@ BEGIN IDS_MESSAGEBOX_DONT_ASK_AGAIN "Don't ask this &question again." END +// ID_L2R SYNCHRO STRINGTABLE BEGIN ID_L2R "Kopiert den ausgewählten Text in die rechte Datei.\nNach rechts kopieren (Alt+Rechts)" @@ -1537,6 +1550,7 @@ BEGIN "Kopiert die ausgewählte Datei ins angegebene Verzeichnis." END +// ID_DIR_COPY_LEFT_TO_RIGHT SYNCHRO STRINGTABLE BEGIN ID_DIR_COPY_LEFT_TO_RIGHT diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index ec14980cc..e5846e91c 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -1382,9 +1382,13 @@ BEGIN IDS_STATUSBAR_READONLY "RO" IDS_COLHDR_LENCODING "Left Encoding" IDS_COLHDR_RENCODING "Right Encoding" + IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" +END + +STRINGTABLE +BEGIN IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" - IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" END // IDS_PRIVATEBUILD_FMT SYNCHRO @@ -1464,6 +1468,7 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END +// IDC_COMPARISON_STOP SYNCHRO STRINGTABLE BEGIN IDC_COMPARISON_STOP "Stop" diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index e4c52dd96..941eb9676 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -1344,9 +1344,13 @@ BEGIN IDS_STATUSBAR_READONLY "RO" IDS_COLHDR_LENCODING "Left Encoding" IDS_COLHDR_RENCODING "Right Encoding" + IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" +END + +STRINGTABLE +BEGIN IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" - IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" END // IDS_PRIVATEBUILD_FMT SYNCHRO @@ -1426,6 +1430,7 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END +// IDC_COMPARISON_STOP SYNCHRO STRINGTABLE BEGIN IDC_COMPARISON_STOP "Stop" diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc index 467f6d5f2..466f24911 100644 --- a/Src/Languages/Norwegian/MergeNorwegian.rc +++ b/Src/Languages/Norwegian/MergeNorwegian.rc @@ -1381,9 +1381,13 @@ BEGIN IDS_STATUSBAR_READONLY "RO" IDS_COLHDR_LENCODING "Left Encoding" IDS_COLHDR_RENCODING "Right Encoding" + IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" +END + +STRINGTABLE +BEGIN IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" - IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" END // IDS_PRIVATEBUILD_FMT SYNCHRO @@ -1463,6 +1467,7 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END +// IDC_COMPARISON_STOP SYNCHRO STRINGTABLE BEGIN IDC_COMPARISON_STOP "Stop" diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc index 1d9a8cd4f..579e29a10 100644 --- a/Src/Languages/Polish/MergePolish.rc +++ b/Src/Languages/Polish/MergePolish.rc @@ -1382,9 +1382,13 @@ BEGIN IDS_STATUSBAR_READONLY "RO" IDS_COLHDR_LENCODING "Left Encoding" IDS_COLHDR_RENCODING "Right Encoding" + IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" +END + +STRINGTABLE +BEGIN IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" - IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" END // IDS_PRIVATEBUILD_FMT SYNCHRO @@ -1464,6 +1468,7 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END +// IDC_COMPARISON_STOP SYNCHRO STRINGTABLE BEGIN IDC_COMPARISON_STOP "Stop" diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc index cbf8c6b83..ddb3b4d55 100644 --- a/Src/Languages/Russian/MergeRussian.rc +++ b/Src/Languages/Russian/MergeRussian.rc @@ -1289,8 +1289,6 @@ END STRINGTABLE BEGIN - IDC_COMPARISON_STOP "Ñòîï" - IDC_COMPARISON_CLOSE "Íàæìèòå ëþáóþ êëàâèøó" IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. îòëè÷èé" END @@ -1372,6 +1370,13 @@ BEGIN IDC_MIXED_EOL "Ñîõðàíÿòü îðèãèíàëüíûå ñèìâîëû EOL" END +// IDC_COMPARISON_STOP SYNCHRO +STRINGTABLE +BEGIN + IDC_COMPARISON_STOP "Ñòîï" + IDC_COMPARISON_CLOSE "Íàæìèòå ëþáóþ êëàâèøó" +END + STRINGTABLE BEGIN IDS_NUM_REPLACED "Çàìåíåíî %1 ñòðîê." @@ -1409,6 +1414,7 @@ BEGIN IDS_MESSAGEBOX_DONT_ASK_AGAIN "Íå çàäàâàòü &áîëüøå ýòîò âîïðîñ" END +// ID_L2R SYNCHRO STRINGTABLE BEGIN ID_L2R "Ñêîïèðîâàòü âûáðàííûé òåêñò â ôàéë ñïðàâà\nCopy Right (Alt Right)" diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index bfd23cdb7..6cddd44cb 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -1380,9 +1380,13 @@ BEGIN IDS_STATUSBAR_READONLY "RO" IDS_COLHDR_LENCODING "Left Encoding" IDS_COLHDR_RENCODING "Right Encoding" + IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" +END + +STRINGTABLE +BEGIN IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" - IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" END // IDS_PRIVATEBUILD_FMT SYNCHRO @@ -1462,7 +1466,8 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END -STRINGTABLE +// IDC_COMPARISON_STOP SYNCHRO +STRINGTABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index 4a630bdd3..e264fccd8 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -1381,9 +1381,13 @@ BEGIN IDS_STATUSBAR_READONLY "RO" IDS_COLHDR_LENCODING "Left Encoding" IDS_COLHDR_RENCODING "Right Encoding" + IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" +END + +STRINGTABLE +BEGIN IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" - IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" END // IDS_PRIVATEBUILD_FMT SYNCHRO @@ -1463,7 +1467,8 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END -STRINGTABLE +// IDC_COMPARISON_STOP SYNCHRO +STRINGTABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc index f9ac0b238..fad78c4ac 100644 --- a/Src/Languages/Swedish/MergeSwedish.rc +++ b/Src/Languages/Swedish/MergeSwedish.rc @@ -1381,9 +1381,13 @@ BEGIN IDS_STATUSBAR_READONLY "Skrivskyddad" IDS_COLHDR_LENCODING "Vänster kodning" IDS_COLHDR_RENCODING "Höger kodning" + IDS_DIRECTORY_REPORT_TITLE "Jämför %1 med %2" +END + +STRINGTABLE +BEGIN IDS_COLHDR_NDIFFS "#skillnader" IDS_COLHDR_NSDIFFS "#antal skillnader" - IDS_DIRECTORY_REPORT_TITLE "Jämför %1 med %2" END // IDS_PRIVATEBUILD_FMT SYNCHRO @@ -1463,6 +1467,7 @@ BEGIN IDC_MIXED_EOL "Tillåt blandade EOL-typer" END +// IDC_COMPARISON_STOP SYNCHRO STRINGTABLE BEGIN IDC_COMPARISON_STOP "Stopp" diff --git a/Src/Merge.rc b/Src/Merge.rc index e82bc3339..087bd7638 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -1271,8 +1271,6 @@ END STRINGTABLE BEGIN - IDC_COMPARISON_STOP "Stop" - IDC_COMPARISON_CLOSE "Press any key" IDS_COLHDR_NDIFFS "#differences" IDS_COLHDR_NSDIFFS "#sig. differences" END @@ -1354,6 +1352,13 @@ BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END +// IDC_COMPARISON_STOP SYNCHRO +STRINGTABLE +BEGIN + IDC_COMPARISON_STOP "Stop" + IDC_COMPARISON_CLOSE "Press any key" +END + STRINGTABLE BEGIN IDS_NUM_REPLACED "Replaced %1 string(s)." diff --git a/Src/readme.txt b/Src/readme.txt index 5d6db1a10..fbc9e3bec 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -3,6 +3,14 @@ Src: MergeDoc.cpp PATCH: [ 927929 ] Reload language menus after resources hooked Src: Merge.cpp + PATCH: [ 941623 ] Propose moving IDC_COMPARISON_STOP to block with ...CLOSE + Src: + Merge.rc + Languages: MergeBrazilian.rc MergeBulgarian.rc MergeCatalan.rc + MergeChineseSimplified.rc MergeChineseTraditional.rc MergeCzech.rc + MergeDanish.rc MergeDutch.rc MergeFrench.rc MergeGerman.rc MergeItalian.rc + MergeKorean.rc MergeNorwegian.rc MergePolish.rc MergeRussian.rc + MergeSlovak.rc MergeSpanish.rc MergeSwedish.rc 2004-04-30 Christian PATCH: [ 941982 ] Fix VS6 compilation