Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

move hard-coded strings to En.rc before GreatLord shoots me

Browse source 
svn path=/trunk/; revision=17925
This commit is contained in:
Royce Mitchell III 2005-09-19 01:14:36 +00:00
parent acd5c47c18
commit 1e9a958e20
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/subsys/system/cmd/En.rc
View file

@ -635,4 +635,10 @@ STRING_FOR_ERROR, "bad variable specification."
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"
}

5
reactos/subsys/system/cmd/resource.h
View file

@ -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

10
reactos/subsys/system/cmd/set.c
View file

@ -225,7 +225,7 @@ calc ( INT* lval, TCHAR op, INT rval )
*lval |= rval;
break;
default:
ConErrPrintf ( _T("Invalid operand.\n") );
ConErrResPuts ( STRING_INVALID_OPERAND );
return FALSE;
}
return TRUE;
@ -246,7 +246,7 @@ seta_unaryTerm ( LPCTSTR* p_, INT* result )
return FALSE;
if ( *p != _T(')') )
{
ConErrPrintf ( _T("Expected ')'\n") );
ConErrResPuts ( STRING_EXPECTED_CLOSE_PAREN );
return FALSE;
}
*result = rval;
@ -267,7 +267,7 @@ seta_unaryTerm ( LPCTSTR* p_, INT* result )
}
else
{
ConErrPrintf ( _T("Expected number or variable name\n") );
ConErrResPuts ( STRING_EXPECTED_NUMBER_OR_VARIABLE );
return FALSE;
}
*p_ = p;
@ -369,7 +369,7 @@ seta_bitAndTerm ( LPCTSTR* p_, INT* result )
lval >>= rval;
break;
default:
ConErrPrintf ( _T("Invalid operand.\n") );
ConErrResPuts ( STRING_INVALID_OPERAND );
return FALSE;
}
}
@ -487,7 +487,7 @@ seta_eval ( LPCTSTR p )
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 ) )