From 32bf2f5e5ebb266f052a502ce8242aa16db75a7c Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Mon, 9 May 2005 08:23:18 +0000 Subject: [PATCH] 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 svn path=/trunk/; revision=15180 --- reactos/subsys/system/cmd/En.rc | 1 - reactos/subsys/system/cmd/Fr.rc | 2 +- reactos/subsys/system/cmd/chcp.c | 2 +- reactos/subsys/system/cmd/resource.h | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/reactos/subsys/system/cmd/En.rc b/reactos/subsys/system/cmd/En.rc index 1f310ca3c9f..8b17ae4c931 100644 --- a/reactos/subsys/system/cmd/En.rc +++ b/reactos/subsys/system/cmd/En.rc @@ -497,7 +497,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_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" diff --git a/reactos/subsys/system/cmd/Fr.rc b/reactos/subsys/system/cmd/Fr.rc index ebb620f5ec7..79785269010 100644 --- a/reactos/subsys/system/cmd/Fr.rc +++ b/reactos/subsys/system/cmd/Fr.rc @@ -508,7 +508,7 @@ STRING_ALIAS_ERROR, "Ligne de commande trop longue apr 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" diff --git a/reactos/subsys/system/cmd/chcp.c b/reactos/subsys/system/cmd/chcp.c index b733643e914..77d610e113e 100644 --- a/reactos/subsys/system/cmd/chcp.c +++ b/reactos/subsys/system/cmd/chcp.c @@ -55,7 +55,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param) 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; diff --git a/reactos/subsys/system/cmd/resource.h b/reactos/subsys/system/cmd/resource.h index b6165ebc4dc..7104c647ab7 100644 --- a/reactos/subsys/system/cmd/resource.h +++ b/reactos/subsys/system/cmd/resource.h @@ -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