[ros-diffs] [greatlrd] 15083: Remove the two last langues string it was doublecate

Remove the two last langues string it was doublecate 
small change to STRING_PATH_ERROR1 in En.rc and Fr.rc
thanks Usurp for notice it
Modified: trunk/reactos/subsys/system/cmd/En.rc
Modified: trunk/reactos/subsys/system/cmd/Fr.rc
Modified: trunk/reactos/subsys/system/cmd/cmd.rc
Modified: trunk/reactos/subsys/system/cmd/date.c
Modified: trunk/reactos/subsys/system/cmd/path.c
Modified: trunk/reactos/subsys/system/cmd/resource.h
Modified: trunk/reactos/subsys/system/cmd/set.c
  _____  

Modified: trunk/reactos/subsys/system/cmd/En.rc
--- trunk/reactos/subsys/system/cmd/En.rc	2005-05-07 15:40:03 UTC
(rev 15082)
+++ trunk/reactos/subsys/system/cmd/En.rc	2005-05-07 15:58:58 UTC
(rev 15083)
@@ -534,8 +534,6 @@

 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_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"
 }
  _____  

Modified: trunk/reactos/subsys/system/cmd/Fr.rc
--- trunk/reactos/subsys/system/cmd/Fr.rc	2005-05-07 15:40:03 UTC
(rev 15082)
+++ trunk/reactos/subsys/system/cmd/Fr.rc	2005-05-07 15:58:58 UTC
(rev 15083)
@@ -545,7 +545,7 @@

 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"
 
  _____  

Modified: trunk/reactos/subsys/system/cmd/cmd.rc
--- trunk/reactos/subsys/system/cmd/cmd.rc	2005-05-07 15:40:03 UTC
(rev 15082)
+++ trunk/reactos/subsys/system/cmd/cmd.rc	2005-05-07 15:58:58 UTC
(rev 15083)
@@ -11,6 +11,7 @@

 #include "En.rc"
 #include "Fr.rc"
 
+
 STRINGTABLE DISCARDABLE
 {
   STRING_FREEDOS_DEV, "    Tim Norman        Matt Rains\n\
  _____  

Modified: trunk/reactos/subsys/system/cmd/date.c
--- trunk/reactos/subsys/system/cmd/date.c	2005-05-07 15:40:03 UTC
(rev 15082)
+++ trunk/reactos/subsys/system/cmd/date.c	2005-05-07 15:58:58 UTC
(rev 15083)
@@ -235,7 +235,7 @@

 				freep (arg);
 				return 0;
 			}
-			ConErrResPuts(STRING_ERROR_WRONG_DATE);
+			ConErrResPuts(STRING_DATE_ERROR);
 			
 		}
 	}
  _____  

Modified: trunk/reactos/subsys/system/cmd/path.c
--- trunk/reactos/subsys/system/cmd/path.c	2005-05-07 15:40:03 UTC
(rev 15082)
+++ trunk/reactos/subsys/system/cmd/path.c	2005-05-07 15:58:58 UTC
(rev 15083)
@@ -48,12 +48,14 @@

 	{
 		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)
  _____  

Modified: trunk/reactos/subsys/system/cmd/resource.h
--- trunk/reactos/subsys/system/cmd/resource.h	2005-05-07 15:40:03 UTC
(rev 15082)
+++ trunk/reactos/subsys/system/cmd/resource.h	2005-05-07 15:58:58 UTC
(rev 15083)
@@ -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 
 
 
 
  _____  

Modified: trunk/reactos/subsys/system/cmd/set.c
--- trunk/reactos/subsys/system/cmd/set.c	2005-05-07 15:40:03 UTC
(rev 15082)
+++ trunk/reactos/subsys/system/cmd/set.c	2005-05-07 15:58:58 UTC
(rev 15083)
@@ -104,7 +104,7 @@

 		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;
 		}