[ros-diffs] [greatlrd] 15181: remove doublecate string STRING_CHCP_ERROR2 and replace it with STRING_ERROR_INVALID_PARAM_FORMAT

remove doublecate string STRING_CHCP_ERROR2 and replace it with
STRING_ERROR_INVALID_PARAM_FORMAT

Fr.rc and En.rc 
STRING_CHCP_ERROR2 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 08:23:18 UTC
(rev 15180)
+++ trunk/reactos/subsys/system/cmd/En.rc	2005-05-09 08:43:05 UTC
(rev 15181)
@@ -496,7 +496,6 @@

STRING_ALIAS_ERROR,          "Command line too long after alias
expansion!\n"
 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_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 08:23:18 UTC
(rev 15180)
+++ trunk/reactos/subsys/system/cmd/Fr.rc	2005-05-09 08:43:05 UTC
(rev 15181)
@@ -507,7 +507,6 @@

STRING_ALIAS_ERROR,          "Ligne de commande trop longue aprÞs
remplacement de l'alias!\n"
 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_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"
  _____

Modified: trunk/reactos/subsys/system/cmd/chcp.c
--- trunk/reactos/subsys/system/cmd/chcp.c	2005-05-09 08:23:18 UTC
(rev 15180)
+++ trunk/reactos/subsys/system/cmd/chcp.c	2005-05-09 08:43:05 UTC
(rev 15181)
@@ -46,7 +46,7 @@

if (args >= 2)
    {
    	/* too many parameters */
-		LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR2, szMsg,
RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle,
STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE);
    	ConErrPrintf(szMsg, param);
    	return 1;
    }
  _____

Modified: trunk/reactos/subsys/system/cmd/resource.h
--- trunk/reactos/subsys/system/cmd/resource.h	2005-05-09 08:23:18 UTC
(rev 15180)
+++ trunk/reactos/subsys/system/cmd/resource.h	2005-05-09 08:43:05 UTC
(rev 15181)
@@ -23,7 +23,6 @@

#define STRING_ALIAS_ERROR                 300
 #define STRING_BATCH_ERROR                 301
 #define STRING_CHCP_ERROR1                 302
-#define STRING_CHCP_ERROR2                 303
 #define STRING_CHCP_ERROR4                 305
 #define STRING_CHOICE_ERROR                306
 #define STRING_CHOICE_ERROR_TXT            307