[jmorlan] 40144: Replace hard-coded English string constants with translatable resource strings. (Bug 3718)
Author: jmorlan Date: Sat Mar 21 02:16:12 2009 New Revision: 40144
URL: http://svn.reactos.org/svn/reactos?rev=40144&view=rev Log: Replace hard-coded English string constants with translatable resource strings. (Bug 3718)
Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/parser.c trunk/reactos/base/shell/cmd/resource.h trunk/reactos/base/shell/cmd/ver.c
Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=40... ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -1462,7 +1462,7 @@ { if (bMore) { - ConOutPrintf(_T("More? ")); + ConOutResPrintf(STRING_MORE); } else { @@ -1812,7 +1812,7 @@ if (ShowVersion) { /* Display a simple version string */ - ConOutPrintf(_T("ReactOS Operating System [Version %s-%s]\n"), + ConOutResPrintf(STRING_REACTOS_VERSION, _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR));
Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.r... ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -680,7 +680,8 @@ STRING_REPLACE_ERROR5, "Zugriff verweigert - %s\n" STRING_REPLACE_ERROR6, "Keine Dateien gefunden - %s\n" STRING_REPLACE_ERROR7, "Erweiterter Fehler 32\n" -STRING_CMD_SHELLINFO, "\nReactOS Befehlszeilen Interpreter" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Befehlszeilen Interpreter\nVersion %s %s" STRING_VERSION_RUNVER, " läuft in %s" STRING_COPY_FILE , " %d Datei(en) kopiert\n" STRING_DELETE_WIPE, "gewiped" @@ -691,6 +692,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Ja/Nein/Alle) " STRING_INVALID_OPERAND, "Ungültiger Operand." STRING_EXPECTED_CLOSE_PAREN, "Erwartet ')'." STRING_EXPECTED_NUMBER_OR_VARIABLE,"Erwartet Nummer oder Variablennamen."
Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.r... ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -697,7 +697,8 @@ STRING_REPLACE_ERROR6, "Äå âñÝèçêáí áñ÷åßá - %s\n" STRING_REPLACE_ERROR7, "Extended Error 32\n"
-STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d file(s) copied\n" STRING_DELETE_WIPE, "wiped" @@ -708,6 +709,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) "
STRING_INVALID_OPERAND, "Invalid operand." STRING_EXPECTED_CLOSE_PAREN, "Áíáìåíüôáí ')'."
Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.r... ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -701,7 +701,8 @@ STRING_REPLACE_ERROR6, "No files found - %s\n" STRING_REPLACE_ERROR7, "Extended Error 32\n"
-STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d file(s) copied\n" STRING_DELETE_WIPE, "wiped" @@ -712,6 +713,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) "
STRING_INVALID_OPERAND, "Invalid operand." STRING_EXPECTED_CLOSE_PAREN, "Expected ')'."
Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.r... ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -649,7 +649,8 @@
STRING_PATH_ERROR, "CMD: No está en el entorno '%s'\n"
-STRING_CMD_SHELLINFO, "\nIntérprete de comandos de ReactOS" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nIntérprete de comandos de ReactOS\nVersion %s %s" STRING_VERSION_RUNVER, " corriendo en %s" STRING_COPY_FILE , " %d archivo(s) copado(s)\n" STRING_DELETE_WIPE, "Limpiado" @@ -660,6 +661,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Si/No/Todos) "
STRING_INVALID_OPERAND, "Operador erróneo.\n" STRING_EXPECTED_CLOSE_PAREN, "Se esperaba ')'.\n"
Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.r... ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -715,7 +715,8 @@ STRING_REPLACE_ERROR6, "Aucun fichier trouvé - %s\n" STRING_REPLACE_ERROR7, "Erreur étendue 32\n"
-STRING_CMD_SHELLINFO, "\n Interpréteur de ligne de commandes ReactOS" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\n Interpréteur de ligne de commandes ReactOS\nVersion %s %s" STRING_VERSION_RUNVER, " tournant sur %s" STRING_COPY_FILE, " %d fichier(s) copié(s)\n" STRING_DELETE_WIPE, "effacé(s)" @@ -726,6 +727,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Oui/Non/Tous) "
STRING_INVALID_OPERAND, "Opérande invalide." STRING_EXPECTED_CLOSE_PAREN, "Attendu ')'."
Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.r... ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -629,7 +629,8 @@
STRING_PATH_ERROR, "CMD: Not in environment '%s'\n"
-STRING_CMD_SHELLINFO, "\nReactOS Parancssor értelmezõ" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Parancssor értelmezõ\nVersion %s %s" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d állomány másolva\n" STRING_DELETE_WIPE, "wiped" @@ -640,4 +641,7 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Igen/Nem/Mind) " + END
Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.r... ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -651,7 +651,8 @@
STRING_PATH_ERROR, "CMD: Tidak dalam lingkungan '%s'\n"
-STRING_CMD_SHELLINFO, "\nInterpreter Baris Perintah ReactOS" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nInterpreter Baris Perintah ReactOS\nVersion %s %s" STRING_VERSION_RUNVER, " berjalan pada %s" STRING_COPY_FILE , " %d file di-copy\n" STRING_DELETE_WIPE, "dihapus" @@ -662,6 +663,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Ya/Tidak/Semua) "
STRING_INVALID_OPERAND, "Operand tidak benar." STRING_EXPECTED_CLOSE_PAREN, "Diharapkan ')'."
Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.r... ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -705,7 +705,8 @@ STRING_REPLACE_ERROR6, "Nessun file trovato - %s\n" STRING_REPLACE_ERROR7, "Errore esteso 32\n"
-STRING_CMD_SHELLINFO, "\nInterprete di linea di comando di ReactOS" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nInterprete di linea di comando di ReactOS\nVersion %s %s" STRING_VERSION_RUNVER, " in esecuzione su %s" STRING_COPY_FILE , " %d file copiati\n" STRING_DELETE_WIPE, "resi illeggibili" @@ -716,6 +717,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Si/No/Tutti) "
STRING_INVALID_OPERAND, "Operando non valido." STRING_EXPECTED_CLOSE_PAREN, "Attesa una ')'."
Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.r... ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -658,7 +658,8 @@
STRING_PATH_ERROR, "CMD: Not in environment '%s'\n"
-STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d ÂÌt@CªRs[³êܵ½\n" STRING_DELETE_WIPE, "®SÉÁ³êܵ½B" @@ -669,6 +670,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) "
STRING_INVALID_OPERAND, "³øÈIyhÅ·B" STRING_EXPECTED_CLOSE_PAREN, "Expected ')'"
Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.r... ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -643,7 +643,8 @@
STRING_PATH_ERROR, "CMD: Ikke i miljøet '%s'\n"
-STRING_CMD_SHELLINFO, "\nReactOS Kommandotolk" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Kommandotolk\nVersion %s %s" STRING_VERSION_RUNVER, " kjører på %s" STRING_COPY_FILE , " %d file(r) kopiert\n" STRING_DELETE_WIPE, "slettet" @@ -654,6 +655,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) "
STRING_INVALID_OPERAND, "Ugyldig operand." STRING_EXPECTED_CLOSE_PAREN, "Forventet ')'."
Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.r... ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -649,7 +649,8 @@
STRING_PATH_ERROR, "CMD: Poza rodowiskiem '%s'\n"
-STRING_CMD_SHELLINFO, "\nInterpreter linii poleceñ ReactOS " +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nInterpreter linii poleceñ ReactOS\nVersion %s %s" STRING_VERSION_RUNVER, " dzia³aj¹cy na %s" STRING_COPY_FILE , " %d plik(ów) skopiowano\n" STRING_DELETE_WIPE, "skasowano" @@ -660,6 +661,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Tak/Nie/Zawsze) "
STRING_INVALID_OPERAND, "Nieprawid³owy argument operatora." STRING_EXPECTED_CLOSE_PAREN, "Oczekiwano ')'."
Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.r... ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -656,7 +656,8 @@
STRING_PATH_ERROR, "CMD: Íå â ñðåäå îêðóæåíèÿ '%s'\n"
-STRING_CMD_SHELLINFO, "\nÈíòåðïðåòàòîð êîìàíäíîé ñòðîêè ReactOS" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nÈíòåðïðåòàòîð êîìàíäíîé ñòðîêè ReactOS\nVersion %s %s" STRING_VERSION_RUNVER, " çàïóùåí íà %s" STRING_COPY_FILE , " %d ôàéë(îâ) ñêîïèðîâàíî\n" STRING_DELETE_WIPE, "wiped" @@ -667,6 +668,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) "
STRING_INVALID_OPERAND, "Íåâåðíûé îïåðàíä." STRING_EXPECTED_CLOSE_PAREN, "Îæèäàåòñÿ ')'."
Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.r... ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -705,7 +705,8 @@ STRING_REPLACE_ERROR6, "No files found - %s\n" STRING_REPLACE_ERROR7, "Extended Error 32\n"
-STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d ôàéë(³â) ñêîï³éîâàíî\n" STRING_DELETE_WIPE, "wiped" @@ -716,6 +717,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) "
STRING_INVALID_OPERAND, "Íåâ³ðíèé îïåðàíä." STRING_EXPECTED_CLOSE_PAREN, "Î÷³êóºòüñÿ ')'."
Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=4... ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -153,6 +153,7 @@ BOOL CheckCtrlBreak (INT mode) { static BOOL bLeaveAll = FALSE; /* leave all batch files */ + TCHAR options[4]; /* Yes, No, All */ TCHAR c;
switch (mode) @@ -168,18 +169,22 @@ if (!bCtrlBreak) return FALSE;
+ LoadString(CMD_ModuleHandle, STRING_COPY_OPTION, options, 4); + /* we need to be sure the string arrives on the screen! */ do - ConOutPuts (_T("\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) ")); - while (!_tcschr (_T("YNA\3"), c = _totupper (cgetchar())) || !c); + { + ConOutResPuts(STRING_CANCEL_BATCH_FILE); + c = _totupper(cgetchar()); + } while (!(_tcschr(options, c) || c == _T('\3')) || !c);
ConOutPuts (_T("\r\n"));
- if (c == _T('N')) + if (c == options[1]) return bCtrlBreak = FALSE; /* ignore */
/* leave all batch files */ - bLeaveAll = ((c == _T('A')) || (c == _T('\3'))); + bLeaveAll = ((c == options[2]) || (c == _T('\3'))); break;
case BREAK_INPUT:
Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?rev... ============================================================================== --- trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -84,10 +84,7 @@
static void ParseError() { - if (CurrentTokenType == TOK_END) - ConOutResPuts(STRING_SYNTAX_COMMAND_INCORRECT); - else - ConOutPrintf(_T("%s was unexpected at this time.\n"), CurrentToken); + error_syntax(CurrentTokenType != TOK_END ? CurrentToken : NULL); bParseError = TRUE; }
Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?r... ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -91,6 +91,7 @@ #define STRING_ASSOC_HELP 616 #define STRING_MKLINK_HELP 617
+#define STRING_REACTOS_VERSION 623 #define STRING_CMD_SHELLINFO 624
#define STRING_COLOR_HELP1 625 @@ -247,6 +248,9 @@ #define STRING_MKLINK_CREATED_HARD 739 #define STRING_MKLINK_CREATED_JUNCTION 740
+#define STRING_MORE 741 +#define STRING_CANCEL_BATCH_FILE 742 + /* These strings are language independent (cmd.rc) */ #define STRING_FREEDOS_DEV 800 #define STRING_REACTOS_DEV 801
Modified: trunk/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=40... ============================================================================== --- trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -30,10 +30,8 @@ unsigned RosVersionLen; LPTSTR RosVersion;
- ConOutResPuts (STRING_CMD_SHELLINFO ); + ConOutResPrintf(STRING_CMD_SHELLINFO, _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - - ConOutPrintf(_T("Version %s %s"), _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR));
memset(VersionInfo.szCSDVersion, 0, sizeof(VersionInfo.szCSDVersion)); if (GetVersionEx(&VersionInfo))
-
jmorlan＠svn.reactos.org