diff --git a/reactos/subsys/system/cmd/En.rc b/reactos/subsys/system/cmd/En.rc index 6610c76b43a..71c898cf0a2 100644 --- a/reactos/subsys/system/cmd/En.rc +++ b/reactos/subsys/system/cmd/En.rc @@ -534,8 +534,6 @@ STRING_GOTO_ERROR2, "Label '%s' not found\n" STRING_MOVE_ERROR1, "[OK]\n" STRING_MOVE_ERROR2, "[Error]\n" -STRING_PATH_ERROR, "CMD: Not in environment 'PATH'\n" - STRING_REN_ERROR1, "MoveFile() failed. Error: %lu\n" STRING_START_ERROR1, "No batch support at the moment!" @@ -561,6 +559,5 @@ STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary STRING_ERROR_D_PAUSEMSG, "Press any key to continue . . ." STRING_ERROR_DRIVER_NOT_READY, "Drive not ready" -STRING_ERROR_WRONG_DATE, "Invalid date." -STRING_SET_ERROR "CMD: Not in environment '%s'\n" +STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" } diff --git a/reactos/subsys/system/cmd/Fr.rc b/reactos/subsys/system/cmd/Fr.rc index 93d74504bea..f03b73c1da4 100644 --- a/reactos/subsys/system/cmd/Fr.rc +++ b/reactos/subsys/system/cmd/Fr.rc @@ -545,7 +545,7 @@ STRING_GOTO_ERROR2, "Label '%s' non trouv STRING_MOVE_ERROR1, "[OK]\n" STRING_MOVE_ERROR2, "[Erreur]\n" -STRING_PATH_ERROR, "CMD: Pas dans l'environnement 'PATH'\n" +STRING_PATH_ERROR, "CMD: Pas dans l'environnement '%s'\n" STRING_REN_ERROR1, "MoveFile() a ‚chou‚. Erreur: %lu\n" diff --git a/reactos/subsys/system/cmd/cmd.rc b/reactos/subsys/system/cmd/cmd.rc index fba2a3e2c9e..b123b48e105 100644 --- a/reactos/subsys/system/cmd/cmd.rc +++ b/reactos/subsys/system/cmd/cmd.rc @@ -11,6 +11,7 @@ #include "En.rc" #include "Fr.rc" + STRINGTABLE DISCARDABLE { STRING_FREEDOS_DEV, " Tim Norman Matt Rains\n\ diff --git a/reactos/subsys/system/cmd/date.c b/reactos/subsys/system/cmd/date.c index 93a614e05aa..cd4000fd50d 100644 --- a/reactos/subsys/system/cmd/date.c +++ b/reactos/subsys/system/cmd/date.c @@ -235,7 +235,7 @@ INT cmd_date (LPTSTR cmd, LPTSTR param) freep (arg); return 0; } - ConErrResPuts(STRING_ERROR_WRONG_DATE); + ConErrResPuts(STRING_DATE_ERROR); } } diff --git a/reactos/subsys/system/cmd/path.c b/reactos/subsys/system/cmd/path.c index cef6e4a3851..f2184155420 100644 --- a/reactos/subsys/system/cmd/path.c +++ b/reactos/subsys/system/cmd/path.c @@ -48,12 +48,14 @@ INT cmd_path (LPTSTR cmd, LPTSTR param) { DWORD dwBuffer; LPTSTR pszBuffer; + TCHAR szMsg[RC_STRING_MAX_SIZE]; pszBuffer = (LPTSTR)malloc (ENV_BUFFER_SIZE * sizeof(TCHAR)); dwBuffer = GetEnvironmentVariable (_T("PATH"), pszBuffer, ENV_BUFFER_SIZE); if (dwBuffer == 0) - { - ConErrResPuts(STRING_PATH_ERROR); + { + LoadString(CMD_ModuleHandle, STRING_VOL_HELP2, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, _T("PATH")); return 0; } else if (dwBuffer > ENV_BUFFER_SIZE) diff --git a/reactos/subsys/system/cmd/resource.h b/reactos/subsys/system/cmd/resource.h index b9f04c67ba8..a3e2328e050 100644 --- a/reactos/subsys/system/cmd/resource.h +++ b/reactos/subsys/system/cmd/resource.h @@ -14,7 +14,6 @@ #define STRING_ERROR_CANNOTPIPE 110 #define STRING_ERROR_D_PAUSEMSG 111 #define STRING_ERROR_DRIVER_NOT_READY 112 -#define STRING_ERROR_WRONG_DATE 113 #define STRING_CHOICE_OPTION 200 #define STRING_COPY_OPTION 201 @@ -64,7 +63,6 @@ #define STRING_TIME_ERROR1 348 #define STRING_TYPE_ERROR1 349 #define STRING_WINDOW_ERROR1 350 -#define STRING_SET_ERROR 351 diff --git a/reactos/subsys/system/cmd/set.c b/reactos/subsys/system/cmd/set.c index fb9ffac42b7..266c6e27aaa 100644 --- a/reactos/subsys/system/cmd/set.c +++ b/reactos/subsys/system/cmd/set.c @@ -104,7 +104,7 @@ INT cmd_set (LPTSTR cmd, LPTSTR param) dwBuffer = GetEnvironmentVariable (param, pszBuffer, ENV_BUFFER_SIZE); if (dwBuffer == 0) { - LoadString(CMD_ModuleHandle, STRING_SET_ERROR, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_PATH_ERROR, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf (szMsg, param); return 0; }