Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove doublecate string STRING_CHCP_ERROR3 and replace it with STRING_ERROR_INVALID_PARAM_FORMAT

Browse source 
Fr.rc
change STRING_CHCP_ERROR3 to STRING_ERROR_INVALID_PARAM_FORMAT

En.rc 
STRING_CHCP_ERROR3 been remove

svn path=/trunk/; revision=15180
This commit is contained in:
Magnus Olsen 2005-05-09 08:23:18 +00:00
parent 395512ca9a
commit 32bf2f5e5e
4 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/subsys/system/cmd/En.rc
View file

@ -497,7 +497,6 @@ STRING_ALIAS_ERROR, "Command line too long after alias expansion!\n"
STRING_BATCH_ERROR, "Error opening batch file\n" STRING_BATCH_ERROR, "Error opening batch file\n"
STRING_CHCP_ERROR1, "Active code page: %u\n" STRING_CHCP_ERROR1, "Active code page: %u\n"
STRING_CHCP_ERROR2, "Invalid parameter format - %s\n" STRING_CHCP_ERROR2, "Invalid parameter format - %s\n"
STRING_CHCP_ERROR3, "Parameter format incorrect - %s\n"
STRING_CHCP_ERROR4, "Invalid code page\n" STRING_CHCP_ERROR4, "Invalid code page\n"
STRING_CHOICE_ERROR, "Invalid option. Expected format: /C[:]options" STRING_CHOICE_ERROR, "Invalid option. Expected format: /C[:]options"
STRING_CHOICE_ERROR_TXT, "Invalid option. Expected format: /T[:]c,nn" STRING_CHOICE_ERROR_TXT, "Invalid option. Expected format: /T[:]c,nn"

2
reactos/subsys/system/cmd/Fr.rc
View file

@ -508,7 +508,7 @@ STRING_ALIAS_ERROR, "Ligne de commande trop longue apr
STRING_BATCH_ERROR, "Erreur à l'ouverture du fichier batch\n" STRING_BATCH_ERROR, "Erreur à l'ouverture du fichier batch\n"
STRING_CHCP_ERROR1, "Page de codes actuelle : %u\n" STRING_CHCP_ERROR1, "Page de codes actuelle : %u\n"
STRING_CHCP_ERROR2, "Format de paramètre invalide - %s\n" STRING_CHCP_ERROR2, "Format de paramètre invalide - %s\n"
STRING_CHCP_ERROR3, "Format de paramètre incorrect - %s\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Format de paramètre incorrect - %s\n"
STRING_CHCP_ERROR4, "Page de code invalide \n" STRING_CHCP_ERROR4, "Page de code invalide \n"
STRING_CHOICE_ERROR, "Option invalide. Format attendu: /C[:]options" STRING_CHOICE_ERROR, "Option invalide. Format attendu: /C[:]options"
STRING_CHOICE_ERROR_TXT, "Option invalide. Format attendu: /T[:]c,nn" STRING_CHOICE_ERROR_TXT, "Option invalide. Format attendu: /T[:]c,nn"

2
reactos/subsys/system/cmd/chcp.c
View file

@ -55,7 +55,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
if (uNewCodePage == 0) if (uNewCodePage == 0)
{ {
LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR3, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, arg[0]); ConErrPrintf(szMsg, arg[0]);
freep (arg); freep (arg);
return 1; return 1;

1
reactos/subsys/system/cmd/resource.h
View file

@ -24,7 +24,6 @@
#define STRING_BATCH_ERROR 301 #define STRING_BATCH_ERROR 301
#define STRING_CHCP_ERROR1 302 #define STRING_CHCP_ERROR1 302
#define STRING_CHCP_ERROR2 303 #define STRING_CHCP_ERROR2 303
#define STRING_CHCP_ERROR3 304
#define STRING_CHCP_ERROR4 305 #define STRING_CHCP_ERROR4 305
#define STRING_CHOICE_ERROR 306 #define STRING_CHOICE_ERROR 306
#define STRING_CHOICE_ERROR_TXT 307 #define STRING_CHOICE_ERROR_TXT 307