[ros-diffs] [royce] 17925: move hard-coded strings to En.rc before GreatLord shoots me

move hard-coded strings to En.rc before GreatLord shoots me
Modified: trunk/reactos/subsys/system/cmd/En.rc
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-09-19 00:02:39 UTC
(rev 17924)
+++ trunk/reactos/subsys/system/cmd/En.rc	2005-09-19 01:14:36 UTC
(rev 17925)
@@ -635,4 +635,10 @@

 STRING_SCREEN_COL,                 "invalid value for col"
 STRING_SCREEN_ROW,                 "invalid value for row"
 STRING_TIMER_TIME                  "Timer %d is %s: "
+
+STRING_INVALID_OPERAND,            "Invalid operand.\n"
+STRING_EXPECTED_CLOSE_PAREN,       "Expected ')'.\n"
+STRING_EXPECTED_NUMBER_OR_VARIABLE,"Expected number or variable
name.\n"
+STRING_SYNTAX_COMMAND_INCORRECT,   "The syntax of the command is
incorrect.\n"
+
 }
  _____  

Modified: trunk/reactos/subsys/system/cmd/resource.h
--- trunk/reactos/subsys/system/cmd/resource.h	2005-09-19 00:02:39 UTC
(rev 17924)
+++ trunk/reactos/subsys/system/cmd/resource.h	2005-09-19 01:14:36 UTC
(rev 17925)
@@ -215,6 +215,11 @@

 #define STRING_HELP1                       718
 #define STRING_HELP2                       719
 
+#define STRING_INVALID_OPERAND             720
+#define STRING_EXPECTED_CLOSE_PAREN        721
+#define STRING_EXPECTED_NUMBER_OR_VARIABLE 722
+#define STRING_SYNTAX_COMMAND_INCORRECT    723
+
 /* These strings are language independent (cmd.rc) */
 #define STRING_FREEDOS_DEV                 800
 #define STRING_REACTOS_DEV                 801
  _____  

Modified: trunk/reactos/subsys/system/cmd/set.c
--- trunk/reactos/subsys/system/cmd/set.c	2005-09-19 00:02:39 UTC
(rev 17924)
+++ trunk/reactos/subsys/system/cmd/set.c	2005-09-19 01:14:36 UTC
(rev 17925)
@@ -225,7 +225,7 @@

 		*lval |= rval;
 		break;
 	default:
-		ConErrPrintf ( _T("Invalid operand.\n") );
+		ConErrResPuts ( STRING_INVALID_OPERAND );
 		return FALSE;
 	}
 	return TRUE;
@@ -246,7 +246,7 @@
 			return FALSE;
 		if ( *p != _T(')') )
 		{
-			ConErrPrintf ( _T("Expected ')'\n") );
+			ConErrResPuts ( STRING_EXPECTED_CLOSE_PAREN );
 			return FALSE;
 		}
 		*result = rval;
@@ -267,7 +267,7 @@
 	}
 	else
 	{
-		ConErrPrintf ( _T("Expected number or variable name\n")
);
+		ConErrResPuts ( STRING_EXPECTED_NUMBER_OR_VARIABLE );
 		return FALSE;
 	}
 	*p_ = p;
@@ -369,7 +369,7 @@
 			lval >>= rval;
 			break;
 		default:
-			ConErrPrintf ( _T("Invalid operand.\n") );
+			ConErrResPuts ( STRING_INVALID_OPERAND );
 			return FALSE;
 		}
 	}
@@ -487,7 +487,7 @@
 	INT rval;
 	if ( !*p )
 	{
-		ConErrPrintf ( _T("The syntax of the command is
incorrect.\n") );
+		ConErrResPuts ( STRING_SYNTAX_COMMAND_INCORRECT );
 		return FALSE;
 	}
 	if ( !seta_stmt ( &p, &rval ) )