remove doublecate string STRING_CHCP_ERROR3 and replace it with STRING_ERROR_INVALID_PARAM_FORMAT
Fr.rc change STRING_CHCP_ERROR3 to STRING_ERROR_INVALID_PARAM_FORMAT
En.rc STRING_CHCP_ERROR3 been remove Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/Fr.rc Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____
Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-05-09 06:14:54 UTC (rev 15179) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-09 08:23:18 UTC (rev 15180) @@ -497,7 +497,6 @@
STRING_BATCH_ERROR, "Error opening batch file\n" STRING_CHCP_ERROR1, "Active code page: %u\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_CHOICE_ERROR, "Invalid option. Expected format: /C[:]options" STRING_CHOICE_ERROR_TXT, "Invalid option. Expected format: /T[:]c,nn" _____
Modified: trunk/reactos/subsys/system/cmd/Fr.rc --- trunk/reactos/subsys/system/cmd/Fr.rc 2005-05-09 06:14:54 UTC (rev 15179) +++ trunk/reactos/subsys/system/cmd/Fr.rc 2005-05-09 08:23:18 UTC (rev 15180) @@ -508,7 +508,7 @@
STRING_BATCH_ERROR, "Erreur Ó l'ouverture du fichier batch\n" STRING_CHCP_ERROR1, "Page de codes actuelle : %u\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_CHOICE_ERROR, "Option invalide. Format attendu: /C[:]options" STRING_CHOICE_ERROR_TXT, "Option invalide. Format attendu: /T[:]c,nn" _____
Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-05-09 06:14:54 UTC (rev 15179) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-05-09 08:23:18 UTC (rev 15180) @@ -55,7 +55,7 @@
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]); freep (arg); return 1; _____
Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-05-09 06:14:54 UTC (rev 15179) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-05-09 08:23:18 UTC (rev 15180) @@ -24,7 +24,6 @@
#define STRING_BATCH_ERROR 301 #define STRING_CHCP_ERROR1 302 #define STRING_CHCP_ERROR2 303 -#define STRING_CHCP_ERROR3 304 #define STRING_CHCP_ERROR4 305 #define STRING_CHOICE_ERROR 306 #define STRING_CHOICE_ERROR_TXT 307