From 38dec447a26b118513df81fd7d965fbf27a83d21 Mon Sep 17 00:00:00 2001 From: Jeffrey Morlan Date: Fri, 20 Mar 2009 23:16:12 +0000 Subject: [PATCH] Replace hard-coded English string constants with translatable resource strings. (Bug 3718) svn path=/trunk/; revision=40144 --- reactos/base/shell/cmd/cmd.c | 4 ++-- reactos/base/shell/cmd/lang/de-DE.rc | 5 ++++- reactos/base/shell/cmd/lang/el-GR.rc | 5 ++++- reactos/base/shell/cmd/lang/en-US.rc | 5 ++++- reactos/base/shell/cmd/lang/es-ES.rc | 5 ++++- reactos/base/shell/cmd/lang/fr-FR.rc | 5 ++++- reactos/base/shell/cmd/lang/hu-HU.rc | 6 +++++- reactos/base/shell/cmd/lang/id-ID.rc | 5 ++++- reactos/base/shell/cmd/lang/it-IT.rc | 5 ++++- reactos/base/shell/cmd/lang/ja-JP.rc | 5 ++++- reactos/base/shell/cmd/lang/no-NO.rc | 5 ++++- reactos/base/shell/cmd/lang/pl-PL.rc | 5 ++++- reactos/base/shell/cmd/lang/ru-RU.rc | 5 ++++- reactos/base/shell/cmd/lang/uk-UA.rc | 5 ++++- reactos/base/shell/cmd/misc.c | 13 +++++++++---- reactos/base/shell/cmd/parser.c | 5 +---- reactos/base/shell/cmd/resource.h | 4 ++++ reactos/base/shell/cmd/ver.c | 4 +--- 18 files changed, 70 insertions(+), 26 deletions(-) diff --git a/reactos/base/shell/cmd/cmd.c b/reactos/base/shell/cmd/cmd.c index ada3f4027d6..c8728fa50b8 100644 --- a/reactos/base/shell/cmd/cmd.c +++ b/reactos/base/shell/cmd/cmd.c @@ -1462,7 +1462,7 @@ ReadLine (TCHAR *commandline, BOOL bMore) { if (bMore) { - ConOutPrintf(_T("More? ")); + ConOutResPrintf(STRING_MORE); } else { @@ -1812,7 +1812,7 @@ Initialize() 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)); diff --git a/reactos/base/shell/cmd/lang/de-DE.rc b/reactos/base/shell/cmd/lang/de-DE.rc index 77efbc59ec0..69ccdf8ed71 100644 --- a/reactos/base/shell/cmd/lang/de-DE.rc +++ b/reactos/base/shell/cmd/lang/de-DE.rc @@ -680,7 +680,8 @@ STRING_REPLACE_ERROR4, "Ung 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, " luft in %s" STRING_COPY_FILE , " %d Datei(en) kopiert\n" STRING_DELETE_WIPE, "gewiped" @@ -691,6 +692,8 @@ STRING_TIMER_TIME "Timer %d ist %s: " 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, "Ungltiger Operand." STRING_EXPECTED_CLOSE_PAREN, "Erwartet ')'." STRING_EXPECTED_NUMBER_OR_VARIABLE,"Erwartet Nummer oder Variablennamen." diff --git a/reactos/base/shell/cmd/lang/el-GR.rc b/reactos/base/shell/cmd/lang/el-GR.rc index fe903084f9c..4a2af9b5c1b 100644 --- a/reactos/base/shell/cmd/lang/el-GR.rc +++ b/reactos/base/shell/cmd/lang/el-GR.rc @@ -697,7 +697,8 @@ STRING_REPLACE_ERROR5, " 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_TIMER_TIME "Timer %d is %s: " 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, " ')'." diff --git a/reactos/base/shell/cmd/lang/en-US.rc b/reactos/base/shell/cmd/lang/en-US.rc index d5619beda2c..7beaa5593d7 100644 --- a/reactos/base/shell/cmd/lang/en-US.rc +++ b/reactos/base/shell/cmd/lang/en-US.rc @@ -701,7 +701,8 @@ STRING_REPLACE_ERROR5, "Access denied - %s\n" 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_TIMER_TIME "Timer %d is %s: " 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 ')'." diff --git a/reactos/base/shell/cmd/lang/es-ES.rc b/reactos/base/shell/cmd/lang/es-ES.rc index 13c4ae35c11..1029003cd65 100644 --- a/reactos/base/shell/cmd/lang/es-ES.rc +++ b/reactos/base/shell/cmd/lang/es-ES.rc @@ -649,7 +649,8 @@ STRING_ERROR_DRIVER_NOT_READY, "La unidad no est STRING_PATH_ERROR, "CMD: No est en el entorno '%s'\n" -STRING_CMD_SHELLINFO, "\nIntrprete de comandos de ReactOS" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nIntrprete 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_TIMER_TIME "El temporizador %d es %s: " 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 errneo.\n" STRING_EXPECTED_CLOSE_PAREN, "Se esperaba ')'.\n" diff --git a/reactos/base/shell/cmd/lang/fr-FR.rc b/reactos/base/shell/cmd/lang/fr-FR.rc index 308e0286b16..fa44918dbec 100644 --- a/reactos/base/shell/cmd/lang/fr-FR.rc +++ b/reactos/base/shell/cmd/lang/fr-FR.rc @@ -715,7 +715,8 @@ STRING_REPLACE_ERROR5, "Acc STRING_REPLACE_ERROR6, "Aucun fichier trouv - %s\n" STRING_REPLACE_ERROR7, "Erreur tendue 32\n" -STRING_CMD_SHELLINFO, "\n Interprteur de ligne de commandes ReactOS" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\n Interprteur 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_TIMER_TIME "Le timer n 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, "Oprande invalide." STRING_EXPECTED_CLOSE_PAREN, "Attendu ')'." diff --git a/reactos/base/shell/cmd/lang/hu-HU.rc b/reactos/base/shell/cmd/lang/hu-HU.rc index 0efe23b5b34..f43e9520611 100644 --- a/reactos/base/shell/cmd/lang/hu-HU.rc +++ b/reactos/base/shell/cmd/lang/hu-HU.rc @@ -629,7 +629,8 @@ STRING_ERROR_DRIVER_NOT_READY, "A meghajt 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 llomny msolva\n" STRING_DELETE_WIPE, "wiped" @@ -640,4 +641,7 @@ STRING_TIMER_TIME "Id 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 diff --git a/reactos/base/shell/cmd/lang/id-ID.rc b/reactos/base/shell/cmd/lang/id-ID.rc index 3dccfe31a8c..47caaa15ad7 100644 --- a/reactos/base/shell/cmd/lang/id-ID.rc +++ b/reactos/base/shell/cmd/lang/id-ID.rc @@ -651,7 +651,8 @@ STRING_ERROR_DRIVER_NOT_READY, "Drive tidak siap" 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_TIMER_TIME "Timer %d adalah %s: " 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 ')'." diff --git a/reactos/base/shell/cmd/lang/it-IT.rc b/reactos/base/shell/cmd/lang/it-IT.rc index 54a15667ace..272bfa10d7d 100644 --- a/reactos/base/shell/cmd/lang/it-IT.rc +++ b/reactos/base/shell/cmd/lang/it-IT.rc @@ -705,7 +705,8 @@ STRING_REPLACE_ERROR5, "Accesso negato - %s\n" 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_TIMER_TIME "Timer %d 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 ')'." diff --git a/reactos/base/shell/cmd/lang/ja-JP.rc b/reactos/base/shell/cmd/lang/ja-JP.rc index 6a235b0b861..aaa23628ce3 100644 --- a/reactos/base/shell/cmd/lang/ja-JP.rc +++ b/reactos/base/shell/cmd/lang/ja-JP.rc @@ -658,7 +658,8 @@ STRING_ERROR_DRIVER_NOT_READY, " 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@CRs[܂\n" STRING_DELETE_WIPE, "Sɏ܂B" @@ -669,6 +670,8 @@ STRING_TIMER_TIME " 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 ')'" diff --git a/reactos/base/shell/cmd/lang/no-NO.rc b/reactos/base/shell/cmd/lang/no-NO.rc index cc87faaf5dc..ff0d7c3e4c5 100644 --- a/reactos/base/shell/cmd/lang/no-NO.rc +++ b/reactos/base/shell/cmd/lang/no-NO.rc @@ -643,7 +643,8 @@ STRING_ERROR_DRIVER_NOT_READY, "Stasjonen er ikke klar" STRING_PATH_ERROR, "CMD: Ikke i miljet '%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, " kjrer p %s" STRING_COPY_FILE , " %d file(r) kopiert\n" STRING_DELETE_WIPE, "slettet" @@ -654,6 +655,8 @@ STRING_TIMER_TIME "Stoppeklokke %d er %s: " 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 ')'." diff --git a/reactos/base/shell/cmd/lang/pl-PL.rc b/reactos/base/shell/cmd/lang/pl-PL.rc index 974c8078626..b6f43b43ddf 100644 --- a/reactos/base/shell/cmd/lang/pl-PL.rc +++ b/reactos/base/shell/cmd/lang/pl-PL.rc @@ -649,7 +649,8 @@ STRING_ERROR_DRIVER_NOT_READY, "Nap 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, " dziaajcy na %s" STRING_COPY_FILE , " %d plik(w) skopiowano\n" STRING_DELETE_WIPE, "skasowano" @@ -660,6 +661,8 @@ STRING_TIMER_TIME "Stoper %d czas - %s: " 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, "Nieprawidowy argument operatora." STRING_EXPECTED_CLOSE_PAREN, "Oczekiwano ')'." diff --git a/reactos/base/shell/cmd/lang/ru-RU.rc b/reactos/base/shell/cmd/lang/ru-RU.rc index c9f36c25806..e37e954dc3b 100644 --- a/reactos/base/shell/cmd/lang/ru-RU.rc +++ b/reactos/base/shell/cmd/lang/ru-RU.rc @@ -656,7 +656,8 @@ STRING_ERROR_DRIVER_NOT_READY, " 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_TIMER_TIME "Timer %d is %s: " 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, " ')'." diff --git a/reactos/base/shell/cmd/lang/uk-UA.rc b/reactos/base/shell/cmd/lang/uk-UA.rc index bf5fd768e7b..735dad88f17 100644 --- a/reactos/base/shell/cmd/lang/uk-UA.rc +++ b/reactos/base/shell/cmd/lang/uk-UA.rc @@ -705,7 +705,8 @@ STRING_REPLACE_ERROR5, "Access denied - %s\n" 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_TIMER_TIME " 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, " ')'." diff --git a/reactos/base/shell/cmd/misc.c b/reactos/base/shell/cmd/misc.c index f25c3c7ad62..95446890306 100644 --- a/reactos/base/shell/cmd/misc.c +++ b/reactos/base/shell/cmd/misc.c @@ -153,6 +153,7 @@ VOID GetPathCase( TCHAR * Path, TCHAR * OutPath) 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 @@ BOOL CheckCtrlBreak (INT mode) 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: diff --git a/reactos/base/shell/cmd/parser.c b/reactos/base/shell/cmd/parser.c index 7da9f2dfde9..a0a09f8e170 100644 --- a/reactos/base/shell/cmd/parser.c +++ b/reactos/base/shell/cmd/parser.c @@ -84,10 +84,7 @@ restart: 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; } diff --git a/reactos/base/shell/cmd/resource.h b/reactos/base/shell/cmd/resource.h index 52cace43a93..a840ee223e3 100644 --- a/reactos/base/shell/cmd/resource.h +++ b/reactos/base/shell/cmd/resource.h @@ -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 diff --git a/reactos/base/shell/cmd/ver.c b/reactos/base/shell/cmd/ver.c index 55cbd25da8e..527f5187fc6 100644 --- a/reactos/base/shell/cmd/ver.c +++ b/reactos/base/shell/cmd/ver.c @@ -30,11 +30,9 @@ VOID ShortVersion (VOID) 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)) {