Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-21 05:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace hard-coded English string constants with translatable resource strings. (Bug 3718)

Browse source 
svn path=/trunk/; revision=40144
This commit is contained in:
Jeffrey Morlan 2009-03-20 23:16:12 +00:00
parent 87e87cd3bf
commit 38dec447a2
18 changed files with 70 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/shell/cmd/cmd.c
View file

@ -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));

5
reactos/base/shell/cmd/lang/de-DE.rc
View file

@ -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, " läuft 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, "Ungültiger Operand."
STRING_EXPECTED_CLOSE_PAREN, "Erwartet ')'."
STRING_EXPECTED_NUMBER_OR_VARIABLE,"Erwartet Nummer oder Variablennamen."

5
reactos/base/shell/cmd/lang/el-GR.rc
View file

@ -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, "Áíáìåíüôáí ')'."

5
reactos/base/shell/cmd/lang/en-US.rc
View file

@ -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 ')'."

5
reactos/base/shell/cmd/lang/es-ES.rc
View file

@ -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, "\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_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 erróneo.\n"
STRING_EXPECTED_CLOSE_PAREN, "Se esperaba ')'.\n"

5
reactos/base/shell/cmd/lang/fr-FR.rc
View file

@ -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 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_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, "Opérande invalide."
STRING_EXPECTED_CLOSE_PAREN, "Attendu ')'."

6
reactos/base/shell/cmd/lang/hu-HU.rc
View file

@ -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 állomány másolva\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

5
reactos/base/shell/cmd/lang/id-ID.rc
View file

@ -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 ')'."

5
reactos/base/shell/cmd/lang/it-IT.rc
View file

@ -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 ')'."

5
reactos/base/shell/cmd/lang/ja-JP.rc
View file

@ -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 個のファイルがコピーされました\n"
STRING_DELETE_WIPE, "完全に消去されました。"
@ -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, "無効なオペランドです。"
STRING_EXPECTED_CLOSE_PAREN, "Expected ')'"

5
reactos/base/shell/cmd/lang/no-NO.rc
View file

@ -643,7 +643,8 @@ STRING_ERROR_DRIVER_NOT_READY, "Stasjonen er ikke klar"
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_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 ')'."

5
reactos/base/shell/cmd/lang/pl-PL.rc
View file

@ -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, " dzia³aj¹cy 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, "Nieprawid³owy argument operatora."
STRING_EXPECTED_CLOSE_PAREN, "Oczekiwano ')'."

5
reactos/base/shell/cmd/lang/ru-RU.rc
View file

@ -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, "Îæèäàåòñÿ ')'."

5
reactos/base/shell/cmd/lang/uk-UA.rc
View file

@ -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, "Î÷³êóºòüñÿ ')'."

13
reactos/base/shell/cmd/misc.c
View file

@ -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:

5
reactos/base/shell/cmd/parser.c
View file

@ -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;
}

4
reactos/base/shell/cmd/resource.h
View file

@ -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

4
reactos/base/shell/cmd/ver.c
View file

@ -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))
{