Ros-diffs August 2020

ros-diffs@reactos.org

27 participants
188 discussions

[reactos] 10/48: [CMD] Fix the command echo-er/unparser.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47ea3f1faa8f8969cc69c… commit 47ea3f1faa8f8969cc69c11ae4dee2242ea57646 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 6 20:48:59 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:35:56 2020 +0200 [CMD] Fix the command echo-er/unparser. - Use ConOutPuts() instead of ConOutPrintf() for displaying strings that are not printf formatted. - When echo-ing/unparsing FOR command, any possible FOR variables present in the FOR parenthesized list (before the "do" part) should be substituted as well. --- base/shell/cmd/parser.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/base/shell/cmd/parser.c b/base/shell/cmd/parser.c index 5661f12024c..0774e92ced1 100644 --- a/base/shell/cmd/parser.c +++ b/base/shell/cmd/parser.c @@ -1169,11 +1169,11 @@ EchoCommand(PARSED_COMMAND *Cmd) break; case C_IF: - ConOutPrintf(_T("if")); + ConOutPuts(_T("if")); if (Cmd->If.Flags & IFFLAG_IGNORECASE) - ConOutPrintf(_T(" /I")); + ConOutPuts(_T(" /I")); if (Cmd->If.Flags & IFFLAG_NEGATE) - ConOutPrintf(_T(" not")); + ConOutPuts(_T(" not")); if (Cmd->If.LeftArg && SubstituteForVars(Cmd->If.LeftArg, Buf)) ConOutPrintf(_T(" %s"), Buf); ConOutPrintf(_T(" %s"), IfOperatorString[Cmd->If.Operator]); @@ -1183,20 +1183,23 @@ EchoCommand(PARSED_COMMAND *Cmd) EchoCommand(Sub); if (Sub->Next) { - ConOutPrintf(_T(" else ")); + ConOutPuts(_T(" else ")); EchoCommand(Sub->Next); } break; case C_FOR: - ConOutPrintf(_T("for")); - if (Cmd->For.Switches & FOR_DIRS) ConOutPrintf(_T(" /D")); - if (Cmd->For.Switches & FOR_F) ConOutPrintf(_T(" /F")); - if (Cmd->For.Switches & FOR_LOOP) ConOutPrintf(_T(" /L")); - if (Cmd->For.Switches & FOR_RECURSIVE) ConOutPrintf(_T(" /R")); + ConOutPuts(_T("for")); + if (Cmd->For.Switches & FOR_DIRS) ConOutPuts(_T(" /D")); + if (Cmd->For.Switches & FOR_F) ConOutPuts(_T(" /F")); + if (Cmd->For.Switches & FOR_LOOP) ConOutPuts(_T(" /L")); + if (Cmd->For.Switches & FOR_RECURSIVE) ConOutPuts(_T(" /R")); if (Cmd->For.Params) ConOutPrintf(_T(" %s"), Cmd->For.Params); - ConOutPrintf(_T(" %%%c in (%s) do "), Cmd->For.Variable, Cmd->For.List); + if (Cmd->For.List && SubstituteForVars(Cmd->For.List, Buf)) + ConOutPrintf(_T(" %%%c in (%s) do "), Cmd->For.Variable, Buf); + else + ConOutPrintf(_T(" %%%c in (%s) do "), Cmd->For.Variable, Cmd->For.List); EchoCommand(Cmd->Subcommands); break; } @@ -1316,7 +1319,10 @@ do { \ if (Cmd->For.Switches & FOR_RECURSIVE) STRING(_T(" /R")); if (Cmd->For.Params) PRINTF(_T(" %s"), Cmd->For.Params); - PRINTF(_T(" %%%c in (%s) do "), Cmd->For.Variable, Cmd->For.List); + if (Cmd->For.List && SubstituteForVars(Cmd->For.List, Buf)) + PRINTF(_T(" %%%c in (%s) do "), Cmd->For.Variable, Buf); + else + PRINTF(_T(" %%%c in (%s) do "), Cmd->For.Variable, Cmd->For.List); RECURSE(Cmd->Subcommands); break; }

4 years, 4 months

[reactos] 09/48: [CMD] Add a command tree dumper, for debugging purposes of the parser code.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f87d45e1cc227c84053e… commit 6f87d45e1cc227c84053e5da112821ea1aebe07e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 6 20:42:56 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:35:55 2020 +0200 [CMD] Add a command tree dumper, for debugging purposes of the parser code. This feature is also present in Windows' CMD, and has been documented e.g. at: https://www.fireeye.com/blog/threat-research/2018/11/cmd-and-conquer-de-dos… https://www.real-sec.com/2019/08/cmd-and-conquer-de-dosfuscation-with-flare… --- base/shell/cmd/parser.c | 315 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 312 insertions(+), 3 deletions(-) diff --git a/base/shell/cmd/parser.c b/base/shell/cmd/parser.c index 2a7b653be5d..5661f12024c 100644 --- a/base/shell/cmd/parser.c +++ b/base/shell/cmd/parser.c @@ -4,6 +4,15 @@ #include "precomp.h" +/* + * Parser debugging support. These flags are global so that their values can be + * modified at runtime from a debugger. They correspond to the public Windows' + * cmd!fDumpTokens and cmd!fDumpParse booleans. + * (Same names are used for compatibility as they are documented online.) + */ +BOOLEAN fDumpTokens = FALSE; +BOOLEAN fDumpParse = FALSE; + #define C_OP_LOWEST C_MULTI #define C_OP_HIGHEST C_PIPE static const TCHAR OpString[][3] = { _T("&"), _T("||"), _T("&&"), _T("|") }; @@ -220,7 +229,12 @@ static int ParseToken(TCHAR ExtraEnd, TCHAR *Separators) Type = TOK_END; } *Out = _T('\0'); - return CurrentTokenType = Type; + + /* Debugging support */ + if (fDumpTokens) + ConOutPrintf(_T("ParseToken: (%d) '%s'\n"), Type, CurrentToken); + + return (CurrentTokenType = Type); } static BOOL ParseRedirection(REDIRECTION **List) @@ -763,6 +777,9 @@ static PARSED_COMMAND *ParseCommandOp(int OpType) return Cmd; } +VOID +DumpCommand(PARSED_COMMAND *Cmd, ULONG SpacePad); + PARSED_COMMAND * ParseCommand(LPTSTR Line) { @@ -787,14 +804,19 @@ ParseCommand(LPTSTR Line) Cmd = ParseCommandOp(C_OP_LOWEST); if (Cmd) { + bIgnoreEcho = FALSE; + if (CurrentTokenType != TOK_END) ParseError(); if (bParseError) { FreeCommand(Cmd); - Cmd = NULL; + return NULL; } - bIgnoreEcho = FALSE; + + /* Debugging support */ + if (fDumpParse) + DumpCommand(Cmd, 0); } else { @@ -804,6 +826,293 @@ ParseCommand(LPTSTR Line) } +/* + * This function is similar to EchoCommand(), but is used + * for dumping the command tree for debugging purposes. + */ +static VOID +DumpRedir(REDIRECTION* Redirections) +{ + REDIRECTION* Redir; + + if (Redirections) +#ifndef MSCMD_ECHO_COMMAND_COMPAT + ConOutPuts(_T(" Redir: ")); +#else + ConOutPuts(_T("Redir: ")); +#endif + for (Redir = Redirections; Redir; Redir = Redir->Next) + { + ConOutPrintf(_T(" %x %s%s"), Redir->Number, + RedirString[Redir->Mode], Redir->Filename); + } +} + +VOID +DumpCommand(PARSED_COMMAND *Cmd, ULONG SpacePad) +{ +/* + * This macro is like DumpCommand(Cmd, Pad); + * but avoids an extra recursive level. + * Note that it can be used ONLY for terminating commands! + */ +#define DUMP(Command, Pad) \ +do { \ + Cmd = (Command); \ + SpacePad = (Pad); \ + goto dump; \ +} while (0) + + PARSED_COMMAND *Sub; + +dump: + /* Space padding */ + ConOutPrintf(_T("%*s"), SpacePad, _T("")); + + switch (Cmd->Type) + { + case C_COMMAND: + { + /* Generic command name, and Type */ +#ifndef MSCMD_ECHO_COMMAND_COMPAT + ConOutPrintf(_T("Cmd: %s Type: %x"), + Cmd->Command.First, Cmd->Type); +#else + ConOutPrintf(_T("Cmd: %s Type: %x "), + Cmd->Command.First, Cmd->Type); +#endif + /* Arguments */ + if (Cmd->Command.Rest && *(Cmd->Command.Rest)) +#ifndef MSCMD_ECHO_COMMAND_COMPAT + ConOutPrintf(_T(" Args: `%s'"), Cmd->Command.Rest); +#else + ConOutPrintf(_T("Args: `%s' "), Cmd->Command.Rest); +#endif + /* Redirections */ + DumpRedir(Cmd->Redirections); + + ConOutChar(_T('\n')); + return; + } + + case C_QUIET: + { +#ifndef MSCMD_ECHO_COMMAND_COMPAT + ConOutChar(_T('@')); +#else + ConOutPuts(_T("@ ")); +#endif + DumpRedir(Cmd->Redirections); // FIXME: Can we have leading redirections?? + ConOutChar(_T('\n')); + + /*DumpCommand*/DUMP(Cmd->Subcommands, SpacePad + 2); + return; + } + + case C_BLOCK: + { +#ifndef MSCMD_ECHO_COMMAND_COMPAT + ConOutChar(_T('(')); +#else + ConOutPuts(_T("( ")); +#endif + DumpRedir(Cmd->Redirections); + ConOutChar(_T('\n')); + + SpacePad += 2; + + for (Sub = Cmd->Subcommands; Sub; Sub = Sub->Next) + { +#if defined(MSCMD_ECHO_COMMAND_COMPAT) && defined(MSCMD_PARSER_BUGS) + /* + * We will emulate Windows' CMD handling of "CRLF" and "&" multi-command + * enumeration within parenthesized command blocks. + */ + + if (!Sub->Next) + { + DumpCommand(Sub, SpacePad); + continue; + } + + if (Sub->Type != C_MULTI) + { + ConOutPrintf(_T("%*s"), SpacePad, _T("")); + ConOutPuts(_T("CRLF \n")); + DumpCommand(Sub, SpacePad); + continue; + } + + /* Now, Sub->Type == C_MULTI */ + + Cmd = Sub; + + ConOutPrintf(_T("%*s"), SpacePad, _T("")); + ConOutPrintf(_T("%s \n"), OpString[Cmd->Type - C_OP_LOWEST]); + // FIXME: Can we have redirections on these operator-type commands? + + SpacePad += 2; + + Cmd = Cmd->Subcommands; + DumpCommand(Cmd, SpacePad); + ConOutPrintf(_T("%*s"), SpacePad, _T("")); + ConOutPuts(_T("CRLF \n")); + DumpCommand(Cmd->Next, SpacePad); + + // NOTE: Next commands will remain indented. + +#else + + /* + * If this command is followed by another one, first display "CRLF". + * This also emulates the CRLF placement "bug" of Windows' CMD + * for the last two commands. + */ + if (Sub->Next) + { + ConOutPrintf(_T("%*s"), SpacePad, _T("")); +#ifndef MSCMD_ECHO_COMMAND_COMPAT + ConOutPuts(_T("CRLF\n")); +#else + ConOutPuts(_T("CRLF \n")); +#endif + } + DumpCommand(Sub, SpacePad); + +#endif // defined(MSCMD_ECHO_COMMAND_COMPAT) && defined(MSCMD_PARSER_BUGS) + } + + return; + } + + case C_MULTI: + case C_OR: + case C_AND: + case C_PIPE: + { +#ifndef MSCMD_ECHO_COMMAND_COMPAT + ConOutPrintf(_T("%s\n"), OpString[Cmd->Type - C_OP_LOWEST]); +#else + ConOutPrintf(_T("%s \n"), OpString[Cmd->Type - C_OP_LOWEST]); +#endif + // FIXME: Can we have redirections on these operator-type commands? + + SpacePad += 2; + + Sub = Cmd->Subcommands; + DumpCommand(Sub, SpacePad); + /*DumpCommand*/DUMP(Sub->Next, SpacePad); + return; + } + + case C_IF: + { + ConOutPuts(_T("if")); + /* NOTE: IF cannot have leading redirections */ + + if (Cmd->If.Flags & IFFLAG_IGNORECASE) + ConOutPuts(_T(" /I")); + + ConOutChar(_T('\n')); + + SpacePad += 2; + + /* + * Show the IF command condition as a command. + * If it is negated, indent the command more. + */ + if (Cmd->If.Flags & IFFLAG_NEGATE) + { + ConOutPrintf(_T("%*s"), SpacePad, _T("")); + ConOutPuts(_T("not\n")); + SpacePad += 2; + } + + ConOutPrintf(_T("%*s"), SpacePad, _T("")); + + /* + * Command name: + * - Unary operator: its name is the command name, and its argument is the command argument. + * - Binary operator: its LHS is the command name, its RHS is the command argument. + * + * Type: + * Windows' CMD (Win2k3 / Win7-10) values are as follows: + * CMDEXTVERSION Type: 0x32 / 0x34 + * ERRORLEVEL Type: 0x33 / 0x35 + * DEFINED Type: 0x34 / 0x36 + * EXIST Type: 0x35 / 0x37 + * == Type: 0x37 / 0x39 (String Comparison) + * + * For the following command: + * NOT Type: 0x36 / 0x38 + * Windows only prints it without any type / redirection. + * + * For the following command: + * EQU, NEQ, etc. Type: 0x38 / 0x3a (Generic Comparison) + * Windows displays it as command of unknown type. + */ +#ifndef MSCMD_ECHO_COMMAND_COMPAT + ConOutPrintf(_T("Cmd: %s Type: %x"), + (Cmd->If.Operator <= IF_MAX_UNARY) ? + IfOperatorString[Cmd->If.Operator] : + Cmd->If.LeftArg, + Cmd->If.Operator); +#else + ConOutPrintf(_T("Cmd: %s Type: %x "), + (Cmd->If.Operator <= IF_MAX_UNARY) ? + IfOperatorString[Cmd->If.Operator] : + Cmd->If.LeftArg, + Cmd->If.Operator); +#endif + /* Arguments */ +#ifndef MSCMD_ECHO_COMMAND_COMPAT + ConOutPrintf(_T(" Args: `%s'"), Cmd->If.RightArg); +#else + ConOutPrintf(_T("Args: `%s' "), Cmd->If.RightArg); +#endif + + ConOutChar(_T('\n')); + + if (Cmd->If.Flags & IFFLAG_NEGATE) + { + SpacePad -= 2; + } + + Sub = Cmd->Subcommands; + DumpCommand(Sub, SpacePad); + if (Sub->Next) + { + ConOutPrintf(_T("%*s"), SpacePad - 2, _T("")); + ConOutPuts(_T("else\n")); + DumpCommand(Sub->Next, SpacePad); + } + return; + } + + case C_FOR: + { + ConOutPuts(_T("for")); + /* NOTE: FOR cannot have leading redirections */ + + if (Cmd->For.Switches & FOR_DIRS) ConOutPuts(_T(" /D")); + if (Cmd->For.Switches & FOR_F) ConOutPuts(_T(" /F")); + if (Cmd->For.Switches & FOR_LOOP) ConOutPuts(_T(" /L")); + if (Cmd->For.Switches & FOR_RECURSIVE) ConOutPuts(_T(" /R")); + if (Cmd->For.Params) + ConOutPrintf(_T(" %s"), Cmd->For.Params); + ConOutPrintf(_T(" %%%c in (%s) do\n"), Cmd->For.Variable, Cmd->For.List); + /*DumpCommand*/DUMP(Cmd->Subcommands, SpacePad + 2); + return; + } + + default: + ConOutPrintf(_T("*** Unknown type: %x\n"), Cmd->Type); + break; + } + +#undef DUMP +} + /* * Reconstruct a parse tree into text form; used for echoing * batch file commands and FOR instances.

4 years, 4 months

[reactos] 08/48: [CMD_ROSTEST] Add tests for the command echoer.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=988f8bd2f6568c6d390aa… commit 988f8bd2f6568c6d390aa74a7e4c70980cebf046 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jul 27 19:16:45 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:35:55 2020 +0200 [CMD_ROSTEST] Add tests for the command echoer. --- modules/rostests/win32/cmd/rsrc.rc | 6 + modules/rostests/win32/cmd/test_echoer_parser.cmd | 101 +++++++++++++++ .../rostests/win32/cmd/test_echoer_parser.cmd.exp | 138 +++++++++++++++++++++ 3 files changed, 245 insertions(+) diff --git a/modules/rostests/win32/cmd/rsrc.rc b/modules/rostests/win32/cmd/rsrc.rc index 7fd54341dff..7196b345f36 100644 --- a/modules/rostests/win32/cmd/rsrc.rc +++ b/modules/rostests/win32/cmd/rsrc.rc @@ -22,3 +22,9 @@ test_builtins.cmd TESTCMD "test_builtins.cmd" /* @makedep: test_builtins.cmd.exp */ test_builtins.cmd.exp TESTOUT "test_builtins.cmd.exp" + +/* @makedep: test_echoer_parser.cmd */ +test_echoer_parser.cmd TESTCMD "test_echoer_parser.cmd" + +/* @makedep: test_echoer_parser.cmd.exp */ +test_echoer_parser.cmd.exp TESTOUT "test_echoer_parser.cmd.exp" diff --git a/modules/rostests/win32/cmd/test_echoer_parser.cmd b/modules/rostests/win32/cmd/test_echoer_parser.cmd new file mode 100644 index 00000000000..85d20ad9508 --- /dev/null +++ b/modules/rostests/win32/cmd/test_echoer_parser.cmd @@ -0,0 +1,101 @@ +:: +:: Diverse tests for the CMD echoer and parser. +:: +@echo off +setlocal enableextensions + + +:: +:: Simple tests for the CMD echoer. +:: +echo --------- Testing CMD echoer --------- +@echo on + +if 1==1 echo j1|(echo j2) else echo j3 + +(echo a 1>&2|echo a 1>&2) 2>&1 + +echo 1 +@echo 2 +@@echo 3 +@@@echo 4 + +:echo x1 +::echo x2 +@:echo y1 +@::echo y2 +@:::echo y3 + +@@:echo z1 +@@::echo z2 + +foobar +echo +foobar parameter +echo parameter + +toto>NUL +toto> NUL +toto >NUL +toto > NUL + +toto>NUL 2>&1 +toto> NUL 2>&1 +toto >NUL 2>&1 +toto > NUL 2>&1 + +a&b +a& b +a &b +a & b + +a||b +a|| b +a ||b +a || b + +a&&b +a&& b +a &&b +a && b + +:: a|b +:: a| b +:: a |b +:: a | b + +if 1==1 (echo lol) else (echo boom) + +if 1==1 ( +echo lol +) else ( +echo boom +) + +for /l %%l in (1,1,5) do (echo %%l) + +for /l %%l in (1,1,5) do ( +echo %%l +) + +for /l %%l in (1,1,5) do (@@@echo %%l) + +if 1==1 @echo hi +if 1==1 (@echo heh) +if 1==0 (@echo lol) else @echo better +if 1==0 (@echo lol) else (@echo better2) + +(a) +(a b) + +:: An empty parenthesized block is considered to be an error. +:: () + + +@echo off + +:: +:: Finished! +:: +echo --------- Finished -------------- +goto :EOF diff --git a/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp b/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp new file mode 100644 index 00000000000..b582b62722f --- /dev/null +++ b/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp @@ -0,0 +1,138 @@ +--------- Testing CMD echoer --------- + +@pwd@>if 1 == 1 echo j1 | (echo j2 ) else echo j3@space@ +j2@space@ + +@pwd@>(echo a 1>&2 | echo a 1>&2 ) 2>&1@space@ +a@space@ +a@space@ + +@pwd@>echo 1@space@ +1 +2 +3 +4 + +@pwd@>foobar + +@pwd@>echo +ECHO is on. + +@pwd@>foobar parameter@space@ + +@pwd@>echo parameter@space@ +parameter + +@pwd@>toto1>NUL@space@ + +@pwd@>toto1>NUL@space@ + +@pwd@>toto 1>NUL@space@ + +@pwd@>toto 1>NUL@space@ + +@pwd@>toto1>NUL 2>&1@space@ + +@pwd@>toto1>NUL 2>&1@space@ + +@pwd@>toto 1>NUL 2>&1@space@ + +@pwd@>toto 1>NUL 2>&1@space@ + +@pwd@>a & b + +@pwd@>a & b + +@pwd@>a & b + +@pwd@>a & b + +@pwd@>a || b + +@pwd@>a || b + +@pwd@>a || b + +@pwd@>a || b + +@pwd@>a && b + +@pwd@>a && b + +@pwd@>a && b + +@pwd@>a && b + +@pwd@>if 1 == 1 (echo lol ) else (echo boom )@space@ +lol + +@pwd@>if 1 == 1 (echo lol ) else (echo boom )@space@ +lol + +@pwd@>for /L %l in (1 1 5) do (echo %l )@space@ + +@pwd@>(echo 1 )@space@ +1 + +@pwd@>(echo 2 )@space@ +2 + +@pwd@>(echo 3 )@space@ +3 + +@pwd@>(echo 4 )@space@ +4 + +@pwd@>(echo 5 )@space@ +5 + +@pwd@>for /L %l in (1 1 5) do (echo %l )@space@ + +@pwd@>(echo 1 )@space@ +1 + +@pwd@>(echo 2 )@space@ +2 + +@pwd@>(echo 3 )@space@ +3 + +@pwd@>(echo 4 )@space@ +4 + +@pwd@>(echo 5 )@space@ +5 + +@pwd@>for /L %l in (1 1 5) do ()@space@ + +@pwd@>()@space@ +1 + +@pwd@>()@space@ +2 + +@pwd@>()@space@ +3 + +@pwd@>()@space@ +4 + +@pwd@>()@space@ +5 + +@pwd@>if 1 == 1@space@ +hi + +@pwd@>if 1 == 1 ()@space@ +heh + +@pwd@>if 1 == 0 () else@space@ +better + +@pwd@>if 1 == 0 () else ()@space@ +better2 + +@pwd@>(a)@space@ + +@pwd@>(a b )@space@ +--------- Finished --------------

4 years, 4 months

[reactos] 07/48: [CMD] parser.c, cmd.c/h : Code style and formatting fixes.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04eef6d20c0bb7f140f6f… commit 04eef6d20c0bb7f140f6fe3e7ceb8a985fcbbc9e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 26 20:32:11 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:35:54 2020 +0200 [CMD] parser.c, cmd.c/h : Code style and formatting fixes. - Change C_IFFAILURE, C_IFSUCCESS into C_OR, C_AND respectively. --- base/shell/cmd/cmd.c | 4 ++-- base/shell/cmd/cmd.h | 2 +- base/shell/cmd/parser.c | 18 ++++++++++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index bef99f272c4..2303f9d787a 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -801,7 +801,7 @@ ExecuteCommand( for (Sub = Cmd->Subcommands; Sub; Sub = Sub->Next) Ret = ExecuteCommand(Sub); break; - case C_IFFAILURE: + case C_OR: Sub = Cmd->Subcommands; Ret = ExecuteCommand(Sub); if (Ret != 0) @@ -810,7 +810,7 @@ ExecuteCommand( Ret = ExecuteCommand(Sub->Next); } break; - case C_IFSUCCESS: + case C_AND: Sub = Cmd->Subcommands; Ret = ExecuteCommand(Sub); if (Ret == 0) diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index 875ce5ec113..f0243414c14 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -301,7 +301,7 @@ INT cmd_move (LPTSTR); INT CommandMsgbox (LPTSTR); /* Prototypes from PARSER.C */ -enum { C_COMMAND, C_QUIET, C_BLOCK, C_MULTI, C_IFFAILURE, C_IFSUCCESS, C_PIPE, C_IF, C_FOR }; +enum { C_COMMAND, C_QUIET, C_BLOCK, C_MULTI, C_OR, C_AND, C_PIPE, C_IF, C_FOR }; typedef struct _PARSED_COMMAND { struct _PARSED_COMMAND *Subcommands; diff --git a/base/shell/cmd/parser.c b/base/shell/cmd/parser.c index abf2353d563..2a7b653be5d 100644 --- a/base/shell/cmd/parser.c +++ b/base/shell/cmd/parser.c @@ -823,8 +823,10 @@ EchoCommand(PARSED_COMMAND *Cmd) if (SubstituteForVars(Cmd->Command.Rest, Buf)) ConOutPrintf(_T("%s"), Buf); break; + case C_QUIET: return; + case C_BLOCK: ConOutChar(_T('(')); Sub = Cmd->Subcommands; @@ -846,15 +848,17 @@ EchoCommand(PARSED_COMMAND *Cmd) } ConOutChar(_T(')')); break; + case C_MULTI: - case C_IFFAILURE: - case C_IFSUCCESS: + case C_OR: + case C_AND: case C_PIPE: Sub = Cmd->Subcommands; EchoCommand(Sub); ConOutPrintf(_T(" %s "), OpString[Cmd->Type - C_OP_LOWEST]); EchoCommand(Sub->Next); break; + case C_IF: ConOutPrintf(_T("if")); if (Cmd->If.Flags & IFFLAG_IGNORECASE) @@ -874,6 +878,7 @@ EchoCommand(PARSED_COMMAND *Cmd) EchoCommand(Sub->Next); } break; + case C_FOR: ConOutPrintf(_T("for")); if (Cmd->For.Switches & FOR_DIRS) ConOutPrintf(_T(" /D")); @@ -947,10 +952,12 @@ do { \ if (!SubstituteForVars(Cmd->Command.Rest, Buf)) return NULL; STRING(Buf); break; + case C_QUIET: CHAR(_T('@')); RECURSE(Cmd->Subcommands); break; + case C_BLOCK: CHAR(_T('(')); for (Sub = Cmd->Subcommands; Sub; Sub = Sub->Next) @@ -961,15 +968,17 @@ do { \ } CHAR(_T(')')); break; + case C_MULTI: - case C_IFFAILURE: - case C_IFSUCCESS: + case C_OR: + case C_AND: case C_PIPE: Sub = Cmd->Subcommands; RECURSE(Sub); PRINTF(_T(" %s "), OpString[Cmd->Type - C_OP_LOWEST]); RECURSE(Sub->Next); break; + case C_IF: STRING(_T("if")); if (Cmd->If.Flags & IFFLAG_IGNORECASE) @@ -989,6 +998,7 @@ do { \ RECURSE(Sub->Next); } break; + case C_FOR: STRING(_T("for")); if (Cmd->For.Switches & FOR_DIRS) STRING(_T(" /D"));

4 years, 4 months

[reactos] 06/48: [CMD] Fix some messages formatting.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93ee4e7efabeecca5bf89… commit 93ee4e7efabeecca5bf895d2e895f94c8e9801e2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jun 10 01:17:38 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:35:54 2020 +0200 [CMD] Fix some messages formatting. - Fix ECHO state output string. - Add missing newlines to some help and error messages. - Add trailing space after the PAUSE command message. --- base/shell/cmd/lang/cs-CZ.rc | 24 ++++++++++++------------ base/shell/cmd/lang/de-DE.rc | 24 ++++++++++++------------ base/shell/cmd/lang/el-GR.rc | 24 ++++++++++++------------ base/shell/cmd/lang/en-US.rc | 24 ++++++++++++------------ base/shell/cmd/lang/es-ES.rc | 16 ++++++++-------- base/shell/cmd/lang/fr-FR.rc | 22 +++++++++++----------- base/shell/cmd/lang/hu-HU.rc | 26 +++++++++++++------------- base/shell/cmd/lang/id-ID.rc | 24 ++++++++++++------------ base/shell/cmd/lang/it-IT.rc | 24 ++++++++++++------------ base/shell/cmd/lang/ja-JP.rc | 22 +++++++++++----------- base/shell/cmd/lang/no-NO.rc | 26 +++++++++++++------------- base/shell/cmd/lang/pl-PL.rc | 24 ++++++++++++------------ base/shell/cmd/lang/ro-RO.rc | 22 +++++++++++----------- base/shell/cmd/lang/ru-RU.rc | 24 ++++++++++++------------ base/shell/cmd/lang/sk-SK.rc | 24 ++++++++++++------------ base/shell/cmd/lang/sq-AL.rc | 24 ++++++++++++------------ base/shell/cmd/lang/sv-SE.rc | 26 +++++++++++++------------- base/shell/cmd/lang/tr-TR.rc | 24 ++++++++++++------------ base/shell/cmd/lang/uk-UA.rc | 24 ++++++++++++------------ base/shell/cmd/lang/zh-CN.rc | 24 ++++++++++++------------ base/shell/cmd/lang/zh-TW.rc | 24 ++++++++++++------------ 21 files changed, 248 insertions(+), 248 deletions(-) diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index 473c3a39a8e..a06ade2dfac 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -28,7 +28,7 @@ To remove an alias from the alias list:\n\ STRING_CALL_HELP "Calls one batch program from another.\n\n\ CALL [drive:][path]filename [batch-parameter]\n\n\ batch-parameter Specifies any command-line information required by the\n\ - batch program." + batch program.\n" STRING_CD_HELP "Changes the current directory or displays it's name\n\n\ CHDIR [/D][drive:][path]\n\ CHDIR[..|.]\n\ @@ -198,7 +198,7 @@ PUSHD [path | ..]\n\n\ ECHO [message]\n\ ECHO. prints an empty line\n\n\ Type ECHO without a parameter to display the current ECHO setting." - STRING_ECHO_HELP5 "ECHO is %s\n" + STRING_ECHO_HELP5 "ECHO is %s.\n" STRING_EXIT_HELP "Exits the command line interpreter.\n\nEXIT [/b] [ExitCode]\n\n\ /B Exits a batch file only.\n\ If run outside of a batch file it will exit cmd.exe\n\ @@ -233,7 +233,7 @@ To use the FOR command in a batch program, specify %%variable instead of\n\ STRING_GOTO_HELP1 "Directs CMD to a labeled line in a batch script.\n\n\ GOTO label\n\n\ label Specifies a text string used in a batch script as a label.\n\n\ -You type a label on a line by itself, beginning with a colon." +You type a label on a line by itself, beginning with a colon.\n" STRING_IF_HELP1 "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ IF [NOT] string1==string2 command\n\ @@ -473,9 +473,9 @@ title new title\n" STRING_ALIAS_ERROR "Po rozšíření aliasů je příkaz příliš dlouhý!\n" STRING_ASSOC_ERROR "Pro příponu %s nebyly nalezeny žádné asociace\n" STRING_BATCH_ERROR "Chyba při otevírání dávkového souboru\n" - STRING_CHOICE_ERROR "Neplatná volba. Očekávaný formát: /C[:]volby" - STRING_CHOICE_ERROR_TXT "Neplatná volba. Očekávaný formát: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Neplatná volba: %s" + STRING_CHOICE_ERROR "Neplatná volba. Očekávaný formát: /C[:]volby\n" + STRING_CHOICE_ERROR_TXT "Neplatná volba. Očekávaný formát: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Neplatná volba: %s\n" STRING_CMD_ERROR1 "Nelze přesměrovat vstup ze souboru %s\n" STRING_CMD_ERROR2 "Chyba při vytváření dočasného souboru pro data roury\n" STRING_CMD_ERROR3 "Nelze přesměrovat do souboru %s\n" @@ -500,7 +500,7 @@ title new title\n" STRING_FOR_ERROR4 "žádný příkaz po 'do'." STRING_FREE_ERROR1 "Neplatná jednotka" STRING_FREE_ERROR2 "bez popisku" - STRING_GOTO_ERROR1 "Pro GOTO nebyl zadán popisek" + STRING_GOTO_ERROR1 "Pro GOTO nebyl zadán popisek\n" STRING_GOTO_ERROR2 "Popisek '%s' nenalezen\n" STRING_MD_ERROR "Podadresář nebo soubor už existuje.\n" STRING_MD_ERROR2 "Cesta do nového adresáře neexistuje.\n" @@ -521,7 +521,7 @@ title new title\n" STRING_ERROR_BADCOMMAND "Neplatný příkaz nebo název souboru - %s\n" STRING_ERROR_OUT_OF_MEMORY "Chyba - nedostatek paměti.\n" STRING_ERROR_CANNOTPIPE "Chyba! Nelze vytvořit rouru! Nelze vytvořit dočasný soubor!\n" - STRING_ERROR_D_PAUSEMSG "Pokračujte stisknutím libovolné klávesy . . ." + STRING_ERROR_D_PAUSEMSG "Pokračujte stisknutím libovolné klávesy . . . " STRING_ERROR_DRIVER_NOT_READY "Jednotka není připravena" STRING_PATH_ERROR "CMD: Ne v prostředí '%s'\n" STRING_REPLACE_ERROR1 "Neplatný přepínač - %s\n" @@ -547,8 +547,8 @@ title new title\n" STRING_MKLINK_CREATED_JUNCTION "Junction vytvořena pro %s <<===>> %s\n" STRING_MORE "Více? " STRING_CANCEL_BATCH_FILE "\r\nStisknuto Ctrl-Break. Zrušit dávkový soubor? (Ano/Ne/Vše) " - STRING_INVALID_OPERAND "Neplatný operand." - STRING_EXPECTED_CLOSE_PAREN "Očekáváno ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Očekáváno číslo nebo název proměnné." - STRING_SYNTAX_COMMAND_INCORRECT "Syntaxe příkazu není správná." + STRING_INVALID_OPERAND "Neplatný operand.\n" + STRING_EXPECTED_CLOSE_PAREN "Očekáváno ')'.\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Očekáváno číslo nebo název proměnné.\n" + STRING_SYNTAX_COMMAND_INCORRECT "Syntaxe příkazu není správná.\n" END diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index 16e490967cd..4fa69baa07f 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -25,7 +25,7 @@ Löscht ein Alias von der Alias-Liste:\n\ STRING_CALL_HELP "Ruft eine Batchdatei von einer anderen aus auf.\n\n\ CALL [Laufwerk:][Pfad]Dateiname [Batch-Parameter]\n\n\ Parameter Bezeichnet beliebige Angaben in der Befehlszeile, die von\n\ - dem aufgerufenen Batchprogramm benötigt werden." + dem aufgerufenen Batchprogramm benötigt werden.\n" STRING_CD_HELP "Wechselt das Verzeichnis oder zeigt dessen Namen an.\n\n\ CHDIR [Laufwerk:][Pfad]\n\ CHDIR[..|.]\n\ @@ -193,7 +193,7 @@ PUSHD [path | ..]\n\n\ ECHO [Nachricht]\n\ ECHO. gibt eine Leerzeile aus\n\n\ ECHO ohne Parameter zeigt die aktuelle Einstellung der Befehlsanzeige an." - STRING_ECHO_HELP5 "ECHO ist %s\n" + STRING_ECHO_HELP5 "ECHO ist %s.\n" STRING_EXIT_HELP "Beendet den Befehlsinterpreter CMD.EXE oder die aktuelle Batchdatei.\n\nEXIT" STRING_FOR_HELP1 "Führt einen Befehl für jede einzelne Datei für einen Satz von Dateien aus.\n\n\ FOR %Variable IN (Satz) DO Befehl [Parameter]\n\ @@ -226,7 +226,7 @@ statt %Variable an." STRING_GOTO_HELP1 "Setzt die Ausführung eines Batchprogramms an einer Marke fort.\n\n\ GOTO Marke\n\n\ Marke Definiert eine Zeichenfolge als Marke in einem Batchprogramm.\n\n\ -Marken stehen am Zeilenanfang mit einem vorangestellten Doppelpunkt." +Marken stehen am Zeilenanfang mit einem vorangestellten Doppelpunkt.\n" STRING_IF_HELP1 "Verarbeitet Ausdrücke in einer Batchdatei abhängig von Bedingungen.\n\n\ IF [NOT] ERRORLEVEL Nummer Befehl\n\ IF [NOT] Variable1==Variable2 Befehl\n\ @@ -467,9 +467,9 @@ Titel neuer Titel" STRING_ALIAS_ERROR "Die Befehlszeile ist zu lange nach der Alias-Erweiterung!\n" STRING_ASSOC_ERROR "Dateizuordnung für Erweiterung %s nicht gefunden\n" STRING_BATCH_ERROR "Es trat ein Fehler auf, während die Batchdatei geöffnet wurde.\n" - STRING_CHOICE_ERROR "Ungültige Option. Erwartetes Format: /C[:]Optionen" - STRING_CHOICE_ERROR_TXT "Ungültige Option. Erwartetes Format: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Ungültige Option: %s" + STRING_CHOICE_ERROR "Ungültige Option. Erwartetes Format: /C[:]Optionen\n" + STRING_CHOICE_ERROR_TXT "Ungültige Option. Erwartetes Format: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Ungültige Option: %s\n" STRING_CMD_ERROR1 "Die Eingaben konnten nicht umgeleitet werden (von der Datei) %s\n" STRING_CMD_ERROR2 "Ein Fehler ist beim Erstellen der temporären Datei für Pipedaten aufgetreten\n" STRING_CMD_ERROR3 "%s kann nicht in die Datei umgeleitet werden\n" @@ -494,7 +494,7 @@ Titel neuer Titel" STRING_FOR_ERROR4 "kein Befehl nach 'do'." STRING_FREE_ERROR1 "Ungültiges Laufwerk" STRING_FREE_ERROR2 "keine Bezeichnung" - STRING_GOTO_ERROR1 "Keine Sprungmarke für GOTO gesetzt" + STRING_GOTO_ERROR1 "Keine Sprungmarke für GOTO gesetzt\n" STRING_GOTO_ERROR2 "Sprungmarke '%s' wurde nicht gefunden\n" STRING_MD_ERROR "Unterverzeichnis oder Datei existiert bereits.\n" STRING_MD_ERROR2 "Der Pfad zum neuen Ordner existiert nicht.\n"//FIXME @@ -515,7 +515,7 @@ Titel neuer Titel" STRING_ERROR_BADCOMMAND "Ungültiger Befehl oder Dateiname - %s\n" STRING_ERROR_OUT_OF_MEMORY "Fehler: Zu wenig Speicher verfügbar.\n" STRING_ERROR_CANNOTPIPE "Fehler: Pipen nicht möglich! Temporäre Datei kann nicht geöffnet werden!\n" - STRING_ERROR_D_PAUSEMSG "Drücken Sie eine beliebige Taste . . ." + STRING_ERROR_D_PAUSEMSG "Drücken Sie eine beliebige Taste . . . " STRING_ERROR_DRIVER_NOT_READY "Laufwerk ist nicht bereit" STRING_PATH_ERROR "CMD: Nicht in Umgebung '%s'\n" STRING_REPLACE_ERROR1 "Ungültiger Parameter - %s\n" @@ -541,8 +541,8 @@ Titel neuer Titel" STRING_MKLINK_CREATED_JUNCTION "Junction Point erstellt für %s <<===>> %s\n" STRING_MORE "Mehr? " STRING_CANCEL_BATCH_FILE "\r\nStrg-Pause gedrückt. Batchvorgang abbrechen? (Ja/Nein/Alle) " - STRING_INVALID_OPERAND "Ungültiger Operand." - STRING_EXPECTED_CLOSE_PAREN "Erwartet ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Erwartet Nummer oder Variablennamen." - STRING_SYNTAX_COMMAND_INCORRECT "Syntaxfehler." + STRING_INVALID_OPERAND "Ungültiger Operand.\n" + STRING_EXPECTED_CLOSE_PAREN "Erwartet ')'.\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Erwartet Nummer oder Variablennamen.\n" + STRING_SYNTAX_COMMAND_INCORRECT "Syntaxfehler.\n" END diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index 501643a3c95..e49650da179 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -28,7 +28,7 @@ ALIAS [alias=[εντολή]]\n\n\ STRING_CALL_HELP "Calls one batch program from another.\n\n\ CALL [drive:][path]filename [batch-parameter]\n\n\ batch-parameter Specifies any command-line information required by the\n\ - batch program." + batch program.\n" STRING_CD_HELP "Εμφάνιση ή αλλαγή του τρέχοντος καταλόγου.\n\n\ CHDIR [/D][δίσκος:][διαδρομή]\n\ CHDIR[..|.]\n\ @@ -197,7 +197,7 @@ PUSHD [path | ..]\n\n\ ECHO [message]\n\ ECHO. prints an empty line\n\n\ Type ECHO without a parameter to display the current ECHO setting." - STRING_ECHO_HELP5 "ECHO is %s\n" + STRING_ECHO_HELP5 "ECHO is %s.\n" STRING_EXIT_HELP "Exits the command line interpreter.\n\nEXIT [/b] [ExitCode]\n\n\ /B Exits a batch file only.\n\ If run outside of a batch file it will exit cmd.exe\n\ @@ -232,7 +232,7 @@ To use the FOR command in a batch program, specify %%variable instead of\n\ STRING_GOTO_HELP1 "Directs CMD to a labeled line in a batch script.\n\n\ GOTO label\n\n\ label Specifies a text string used in a batch script as a label.\n\n\ -You type a label on a line by itself, beginning with a colon." +You type a label on a line by itself, beginning with a colon.\n" STRING_IF_HELP1 "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ IF [NOT] string1==string2 command\n\ @@ -472,9 +472,9 @@ title new title\n" STRING_ALIAS_ERROR "Command line too long after alias expansion!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "Error opening batch file\n" - STRING_CHOICE_ERROR "Μη έγκυρη επιλογή. Expected format: /C[:]options" - STRING_CHOICE_ERROR_TXT "Μη έγκυρη επιλογή. Expected format: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Illegal Option: %s" + STRING_CHOICE_ERROR "Μη έγκυρη επιλογή. Expected format: /C[:]options\n" + STRING_CHOICE_ERROR_TXT "Μη έγκυρη επιλογή. Expected format: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Illegal Option: %s\n" STRING_CMD_ERROR1 "Can't redirect input from file %s\n" STRING_CMD_ERROR2 "Error creating temporary file for pipe data\n" STRING_CMD_ERROR3 "Can't redirect to file %s\n" @@ -499,7 +499,7 @@ title new title\n" STRING_FOR_ERROR4 "καμία εντολή μετά το 'do'." STRING_FREE_ERROR1 "Μη έγκυρος δίσκος" STRING_FREE_ERROR2 "unlabeled" - STRING_GOTO_ERROR1 "No label specified for GOTO" + STRING_GOTO_ERROR1 "No label specified for GOTO\n" STRING_GOTO_ERROR2 "Label '%s' not found\n" STRING_MD_ERROR "A subdirectory or file already exists.\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" @@ -520,7 +520,7 @@ title new title\n" STRING_ERROR_BADCOMMAND "Εσφαλμένη εντολή ή όνομα - %s\n" STRING_ERROR_OUT_OF_MEMORY "Out of memory error.\n" STRING_ERROR_CANNOTPIPE "Σφάλμα! Cannot pipe! Cannot open temporary file!\n" - STRING_ERROR_D_PAUSEMSG "Πατήστε οποιοδήποτε πλήκτρο για συνέχεια . . ." + STRING_ERROR_D_PAUSEMSG "Πατήστε οποιοδήποτε πλήκτρο για συνέχεια . . . " STRING_ERROR_DRIVER_NOT_READY "Ο δίσκος δεν είναι έτοιμος" STRING_PATH_ERROR "CMD: Not in environment '%s'\n" STRING_REPLACE_ERROR1 "Invalid switch - %s\n" @@ -546,8 +546,8 @@ title new title\n" STRING_MKLINK_CREATED_JUNCTION "Junction created for %s <<===>> %s\n" STRING_MORE "More? " STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) " - STRING_INVALID_OPERAND "Invalid operand." - STRING_EXPECTED_CLOSE_PAREN "Αναμενόταν ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Αναμενόταν αριθμός ή όνομα μεταβλητής." - STRING_SYNTAX_COMMAND_INCORRECT "Η σύνταξη της εντολής δεν είναι έγγυρη." + STRING_INVALID_OPERAND "Invalid operand.\n" + STRING_EXPECTED_CLOSE_PAREN "Αναμενόταν ')'.\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Αναμενόταν αριθμός ή όνομα μεταβλητής.\n" + STRING_SYNTAX_COMMAND_INCORRECT "Η σύνταξη της εντολής δεν είναι έγγυρη.\n" END diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index ab4c63adde1..943c695b790 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -23,7 +23,7 @@ To remove an alias from the alias list:\n\ STRING_CALL_HELP "Calls one batch program from another.\n\n\ CALL [drive:][path]filename [batch-parameter]\n\n\ batch-parameter Specifies any command-line information required by the\n\ - batch program." + batch program.\n" STRING_CD_HELP "Changes the current directory or displays it's name\n\n\ CHDIR [/D][drive:][path]\n\ CHDIR[..|.]\n\ @@ -193,7 +193,7 @@ PUSHD [path | ..]\n\n\ ECHO [message]\n\ ECHO. prints an empty line\n\n\ Type ECHO without a parameter to display the current ECHO setting." - STRING_ECHO_HELP5 "ECHO is %s\n" + STRING_ECHO_HELP5 "ECHO is %s.\n" STRING_EXIT_HELP "Exits the command line interpreter.\n\nEXIT [/b] [ExitCode]\n\n\ /B Exits a batch file only.\n\ If run outside of a batch file it will exit cmd.exe\n\ @@ -228,7 +228,7 @@ To use the FOR command in a batch program, specify %%variable instead of\n\ STRING_GOTO_HELP1 "Directs CMD to a labeled line in a batch script.\n\n\ GOTO label\n\n\ label Specifies a text string used in a batch script as a label.\n\n\ -You type a label on a line by itself, beginning with a colon." +You type a label on a line by itself, beginning with a colon.\n" STRING_IF_HELP1 "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ IF [NOT] string1==string2 command\n\ @@ -468,9 +468,9 @@ title new title\n" STRING_ALIAS_ERROR "Command line too long after alias expansion!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "Error opening batch file\n" - STRING_CHOICE_ERROR "Invalid option. Expected format: /C[:]options" - STRING_CHOICE_ERROR_TXT "Invalid option. Expected format: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Illegal Option: %s" + STRING_CHOICE_ERROR "Invalid option. Expected format: /C[:]options\n" + STRING_CHOICE_ERROR_TXT "Invalid option. Expected format: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Illegal Option: %s\n" STRING_CMD_ERROR1 "Can't redirect input from file %s\n" STRING_CMD_ERROR2 "Error creating temporary file for pipe data\n" STRING_CMD_ERROR3 "Can't redirect to file %s\n" @@ -495,7 +495,7 @@ title new title\n" STRING_FOR_ERROR4 "no command after 'do'." STRING_FREE_ERROR1 "Invalid drive" STRING_FREE_ERROR2 "unlabeled" - STRING_GOTO_ERROR1 "No label specified for GOTO" + STRING_GOTO_ERROR1 "No label specified for GOTO\n" STRING_GOTO_ERROR2 "Label '%s' not found\n" STRING_MD_ERROR "A subdirectory or file already exists.\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" @@ -516,7 +516,7 @@ title new title\n" STRING_ERROR_BADCOMMAND "Bad command or filename - %s\n" STRING_ERROR_OUT_OF_MEMORY "Out of memory error.\n" STRING_ERROR_CANNOTPIPE "Error! Cannot pipe! Cannot open temporary file!\n" - STRING_ERROR_D_PAUSEMSG "Press any key to continue . . ." + STRING_ERROR_D_PAUSEMSG "Press any key to continue . . . " STRING_ERROR_DRIVER_NOT_READY "Drive not ready" STRING_PATH_ERROR "CMD: Not in environment '%s'\n" STRING_REPLACE_ERROR1 "Invalid switch - %s\n" @@ -542,8 +542,8 @@ title new title\n" STRING_MKLINK_CREATED_JUNCTION "Junction created for %s <<===>> %s\n" STRING_MORE "More? " STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) " - STRING_INVALID_OPERAND "Invalid operand." - STRING_EXPECTED_CLOSE_PAREN "Expected ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Expected number or variable name." - STRING_SYNTAX_COMMAND_INCORRECT "The syntax of the command is incorrect." + 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" END diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index 9c3e5a2c15d..9998bfd1bad 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -25,7 +25,7 @@ Para borrar un alias de la lista de alias:\n\ STRING_CALL_HELP "Ejecuta un arhivo por lotes desde otro archivo por lotes.\n\n\ CALL [drive:][path]filename [batch-parameter]\n\n\ batch-parameter Especifica cualquier informacion de la linea de comandos\n\ - requerida por el archivo por lotes." + requerida por el archivo por lotes.\n" STRING_CD_HELP "Cambia el directorio actual o muestra su nombre.\n\n\ CHDIR [/D][drive:][path]\n\ CHDIR[..|.]\n\ @@ -198,7 +198,7 @@ pasa de linea.\n\n\ ECHO [mensaje]\n\ ECHO. Muestra una linea vacia\n\n\ Escribe ECHO sin parámetros para mostrar la configuración actual de ECHO." - STRING_ECHO_HELP5 "ECHO está %s\n" + STRING_ECHO_HELP5 "ECHO está %s.\n" STRING_EXIT_HELP "Sale del interprete de la linea de comandos.\n\nEXIT\n" STRING_FOR_HELP1 "Ejecuta un comando específico para cada archivo de un grupo de archivos.\n\n\ FOR %variable IN (grupo) DO comando [parametros]\n\ @@ -232,7 +232,7 @@ de %variable.\n" STRING_GOTO_HELP1 "Manda al CMD a una linea etiquetada en un archivo por lotes.\n\n\ GOTO etiqueta\n\n\ etiqueta Especifica la cadena de texto usada en el archivo por lotes como etiqueta.\n\n\ -Escriba la etiqueta en la linea misma, empezando con dos puntos." +Escriba la etiqueta en la linea misma, empezando con dos puntos.\n" STRING_IF_HELP1 "Ejecuta procesos condicionales en archivos por lotes.\n\n\ IF [NOT] ERRORLEVEL número comando\n\ IF [NOT] string1==string2 comando\n\ @@ -472,9 +472,9 @@ title Nuevo título\n" STRING_ALIAS_ERROR "¡Línea de comandos demasiado larga tras la expansión del alias!\n" STRING_ASSOC_ERROR "No se ha encontrado ninguna asociación de archivos para la extensión %s\n" STRING_BATCH_ERROR "Error abriendo el archivo por lotes\n" - STRING_CHOICE_ERROR "Opción inválida. Se esperaba el formato: /C[:]options" - STRING_CHOICE_ERROR_TXT "Opción inválida. Se esperaba el formato: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Opción ilegal: %s" + STRING_CHOICE_ERROR "Opción inválida. Se esperaba el formato: /C[:]options\n" + STRING_CHOICE_ERROR_TXT "Opción inválida. Se esperaba el formato: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Opción ilegal: %s\n" STRING_CMD_ERROR1 "No se puede redirigir la entrada del archivo %s\n" STRING_CMD_ERROR2 "Error creando archivo temporal para la pila de datos\n" STRING_CMD_ERROR3 "No se puede redirigir el archivo %s\n" @@ -499,7 +499,7 @@ title Nuevo título\n" STRING_FOR_ERROR4 "No hay comando después de 'do'." STRING_FREE_ERROR1 "Unidad errónea." STRING_FREE_ERROR2 "Sin etiqueta" - STRING_GOTO_ERROR1 "No se especifico etiqueta para GOTO" + STRING_GOTO_ERROR1 "No se especifico etiqueta para GOTO\n" STRING_GOTO_ERROR2 "La etiqueta '%s' no se encuentra\n" STRING_MD_ERROR "A subdirectory or file already exists.\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" @@ -520,7 +520,7 @@ title Nuevo título\n" STRING_ERROR_BADCOMMAND "Comando o nombre de archivo erróneo - %s\n" STRING_ERROR_OUT_OF_MEMORY "Error fuera de memoria.\n" STRING_ERROR_CANNOTPIPE "¡Error! ¡No se puede apilar! ¡No se puede abrir el archivo temporal!\n" - STRING_ERROR_D_PAUSEMSG "Pulse una tecla para continuar ..." + STRING_ERROR_D_PAUSEMSG "Pulse una tecla para continuar ... " STRING_ERROR_DRIVER_NOT_READY "La unidad no está lista" STRING_PATH_ERROR "CMD: No está en el entorno '%s'\n" STRING_REPLACE_ERROR1 "Argumento no válido - %s\n" diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index ca894031bce..646791f8235 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -25,7 +25,7 @@ Pour effacer un alias de la liste des alias :\n\ STRING_CALL_HELP "Appelle un programme batch depuis un autre.\n\n\ CALL [lecteur:][chemin]fichier [paramètre-batch]\n\n\ paramètre-batch Spécifie les paramètres nécessaires au\n\ - programme batch." + programme batch.\n" STRING_CD_HELP "Change ou affiche le répertoire courant\n\n\ CHDIR [lecteur:][chemin]\n\ CHDIR[..|-]\n\ @@ -207,7 +207,7 @@ ni passage à la ligne.\n\n\ ECHO [message]\n\ ECHO. Affiche une ligne vide.\n\n\ Taper ECHO sans paramètre pour afficher le réglage ECHO courant." - STRING_ECHO_HELP5 "ECHO est %s\n" + STRING_ECHO_HELP5 "ECHO est %s.\n" STRING_EXIT_HELP "Sort de l'interpréteur de commandes.\n\nEXIT [/b] [CodeDeFin]\n\n\ /B Quitte seulement un fichier batch.\n\ En cas de lancement en dehors d'un fichier batch, cmd.exe sera quittée\n\ @@ -484,9 +484,9 @@ titre titre de la fenêtre" STRING_ALIAS_ERROR "Ligne de commande trop longue après remplacement de l'alias!\n" STRING_ASSOC_ERROR "Association de fichier introuvable pour l'extension %s\n" STRING_BATCH_ERROR "Erreur à l'ouverture du fichier batch\n" - STRING_CHOICE_ERROR "Option invalide. Format attendu : /C[:]options" - STRING_CHOICE_ERROR_TXT "Option invalide. Format attendu : /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Option invalide : %s" + STRING_CHOICE_ERROR "Option invalide. Format attendu : /C[:]options\n" + STRING_CHOICE_ERROR_TXT "Option invalide. Format attendu : /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Option invalide : %s\n" STRING_CMD_ERROR1 "Ne peut rediriger l'entrée depuis le fichier %s\n" STRING_CMD_ERROR2 "Erreur à la création du fichier temporaire pour les données du pipe\n" STRING_CMD_ERROR3 "Ne peut rediriger vers le fichier %s\n" @@ -511,7 +511,7 @@ titre titre de la fenêtre" STRING_FOR_ERROR4 "pas de commande après 'do'." STRING_FREE_ERROR1 "Lecteur invalide" STRING_FREE_ERROR2 "sans nom" - STRING_GOTO_ERROR1 "Pas de label indiqué pour GOTO" + STRING_GOTO_ERROR1 "Pas de label indiqué pour GOTO\n" STRING_GOTO_ERROR2 "Label '%s' introuvable\n" STRING_MD_ERROR "Un sous répertoire ou un fichier existe déjà.\n" STRING_MD_ERROR2 "Le chemin vers le nouveau répertoire n'existe pas.\n" @@ -532,7 +532,7 @@ titre titre de la fenêtre" STRING_ERROR_BADCOMMAND "Commande ou nom de fichier inconnu - %s\n" STRING_ERROR_OUT_OF_MEMORY "Pas assez de mémoire.\n" STRING_ERROR_CANNOTPIPE "Erreur ! Impossible de chaîner ! Échec à l'ouverture du fichier temporaire!\n" - STRING_ERROR_D_PAUSEMSG "Appuyez sur une touche pour continuer . . ." + STRING_ERROR_D_PAUSEMSG "Appuyez sur une touche pour continuer . . . " STRING_ERROR_DRIVER_NOT_READY "Lecteur non prêt" STRING_PATH_ERROR "CMD : Pas dans l'environnement '%s'\n" STRING_REPLACE_ERROR1 "Commutateur invalide - %s\n" @@ -558,8 +558,8 @@ titre titre de la fenêtre" STRING_MKLINK_CREATED_JUNCTION "Jonction créée pour %s <<===>> %s\n" STRING_MORE "Plus ? " STRING_CANCEL_BATCH_FILE "\r\nAppui sur Ctrl-Break. Terminer le programme batch ? (Oui/Non/Tous) " - STRING_INVALID_OPERAND "Opérande invalide." - STRING_EXPECTED_CLOSE_PAREN "Attendu ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Attendu nombre ou nom de variable." - STRING_SYNTAX_COMMAND_INCORRECT "La syntaxe de la commande est incorrecte." + STRING_INVALID_OPERAND "Opérande invalide.\n" + STRING_EXPECTED_CLOSE_PAREN "Attendu ')'.\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Attendu nombre ou nom de variable.\n" + STRING_SYNTAX_COMMAND_INCORRECT "La syntaxe de la commande est incorrecte.\n" END diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc index 9f77bc97bbd..518c83364b3 100644 --- a/base/shell/cmd/lang/hu-HU.rc +++ b/base/shell/cmd/lang/hu-HU.rc @@ -24,7 +24,7 @@ Egy alias törlése:\n\ STRING_BEEP_HELP "Hangjelzés leadása a speakerbõl.\n\nBEEP\n" STRING_CALL_HELP "Kötegelt parancsfájl meghívása egy másikból.\n\n\ CALL [kötet:][elérési_út]állomány [paraméterek]\n\n\ - paraméterek Itt adható meg a szükséges paraméterlista" + paraméterek Itt adható meg a szükséges paraméterlista.\n" STRING_CD_HELP "Az aktuális mappa nevének a megjelenítése vagy váltás másikra\n\n\ CHDIR [/D][meghajtó:][elérési_út]\n\ CHDIR[..|.]\n\ @@ -183,7 +183,7 @@ PUSHD [elérési_út | ..]\n\n\ ECHO [üzenet]\n\ ECHO. Új sor\n\n\ Paraméter nélkül megjeleníti a visszang állapotát." - STRING_ECHO_HELP5 "Az ECHO %s\n" + STRING_ECHO_HELP5 "Az ECHO %s.\n" STRING_EXIT_HELP "Kilép a parancssor értelmezõbõl.\n\nEXIT\n" STRING_FOR_HELP1 "Végrehajt egy parancsot az összes fájlban a megadott mappákban.\n\n\ FOR %változó IN (csoport) DO parancs [paraméterek]\n\ @@ -214,7 +214,7 @@ A batch állományban való haszálathoz %%változó kell a %változó helyett.\ STRING_GOTO_HELP1 "Átirányít egy másik címkére a batch állományban.\n\n\ GOTO címke\n\n\ címke A megadott címkére fog ugrani az értelmezõ.\n\n\ -Egy címkét egy sorban lehet megadni, ':' -tal kezdve." +Egy címkét egy sorban lehet megadni, ':' -tal kezdve.\n" STRING_IF_HELP1 "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ IF [NOT] string1==string2 command\n\ @@ -403,7 +403,7 @@ TYPE [meghajtó:][elérési_út]állománynév\n\ Lemezre írás utáni ellenõrzést állítja be.\n\n\ VERIFY [ON | OFF]\n\n\ Írd be a VERIFY-t paraméterek nélkül, hogy megjelenítse aktuális állapotát.\n" - STRING_VERIFY_HELP2 "Az ellenõrzés jelenleg %s.\n" + STRING_VERIFY_HELP2 "Az VERIFY %s.\n" STRING_VERIFY_HELP3 "Csak az ON vagy OFF elfogadott." STRING_VERSION_HELP1 "A ReactOS verzióinformációit jeleníti meg\n\n\ VER [/C][/R][/W]\n\n\ @@ -451,9 +451,9 @@ title new title\n" STRING_ALIAS_ERROR "A parancssor túl hosszú az alias kibontásakor!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "Hiba a batch állomány megnyitásakor\n" - STRING_CHOICE_ERROR "Érvénytelen paraméter. Várt formátum: /C[:]választási lehetõségek" - STRING_CHOICE_ERROR_TXT "Érvénytelen paraméter. Várt formátum: /T[:]v,nn" - STRING_CHOICE_ERROR_OPTION "Érvénytelen paraméter: %s" + STRING_CHOICE_ERROR "Érvénytelen paraméter. Várt formátum: /C[:]választási lehetõségek\n" + STRING_CHOICE_ERROR_TXT "Érvénytelen paraméter. Várt formátum: /T[:]v,nn\n" + STRING_CHOICE_ERROR_OPTION "Érvénytelen paraméter: %s\n" STRING_CMD_ERROR1 "Nem lehet átirányítani a bevitelt a(z) %s állományból\n" STRING_CMD_ERROR2 "Hiba a csõvezetékhez tartozó ideiglenes állomány létrehozásakor\n" STRING_CMD_ERROR3 "Nem lehet a(z) %s állományba átirányítani\n" @@ -478,7 +478,7 @@ title new title\n" STRING_FOR_ERROR4 "nincs parancs a 'do' után." STRING_FREE_ERROR1 "Érvénytelen meghajtó" STRING_FREE_ERROR2 "nincs cimkézve" - STRING_GOTO_ERROR1 "Nem lett cimke megadva a GOTO után" + STRING_GOTO_ERROR1 "Nem lett cimke megadva a GOTO után\n" STRING_GOTO_ERROR2 "A '%s' cimke nem található\n" STRING_MD_ERROR "A subdirectory or file already exists.\n"//FIXME STRING_MD_ERROR2 "The path to the new folder does not exist.\n" @@ -499,7 +499,7 @@ title new title\n" STRING_ERROR_BADCOMMAND "Ismeretlen parancs vagy állomány név - %s\n" STRING_ERROR_OUT_OF_MEMORY "Nincs elég memória.\n" STRING_ERROR_CANNOTPIPE "Error! Cannot pipe! Cannot open temporary állomány!\n" - STRING_ERROR_D_PAUSEMSG "A folytatáshoz nyomj meg egy billentyût . . ." + STRING_ERROR_D_PAUSEMSG "A folytatáshoz nyomj meg egy billentyût . . . " STRING_ERROR_DRIVER_NOT_READY "A meghajtó nem áll készen" STRING_PATH_ERROR "CMD: Not in environment '%s'\n" STRING_REPLACE_ERROR1 "Invalid switch - %s\n" @@ -525,8 +525,8 @@ title new title\n" STRING_MKLINK_CREATED_JUNCTION "Junction created for %s <<===>> %s\n" STRING_MORE "More? " STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break pressed. Cancel batch file? (Igen/Nem/Mind) " - STRING_INVALID_OPERAND "Invalid operand."//FIXME - STRING_EXPECTED_CLOSE_PAREN "Expected ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Expected number or variable name." - STRING_SYNTAX_COMMAND_INCORRECT "The syntax of the command is incorrect." + STRING_INVALID_OPERAND "Invalid operand.\n" //FIXME + 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" END diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index 203e86cd137..42bd9e2b516 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -25,7 +25,7 @@ Untuk menghapus alias dari daftar alias:\n\ STRING_CALL_HELP "Memanggil satu program batch dari yang lainnya.\n\n\ CALL [drive:][path]filename [batch-parameter]\n\n\ batch-parameter Specifies any command-line information required by the\n\ - batch program." + batch program.\n" STRING_CD_HELP "Mengubah direktori saat ini atau menampilkan namanya\n\n\ CHDIR [/D][drive:][path]\n\ CHDIR[..|.]\n\ @@ -195,7 +195,7 @@ PUSHD [path | ..]\n\n\ ECHO [pesan]\n\ ECHO. Menampilkan baris kosong\n\n\ Ketik ECHO tanpa parameter untuk menampilkan setelan ECHO saat ini." - STRING_ECHO_HELP5 "ECHO adalah %s\n" + STRING_ECHO_HELP5 "ECHO adalah %s.\n" STRING_EXIT_HELP "Keluar dari interpreter baris perintah.\n\nEXIT [/b] [ExitCode]\n\n\ /B Keluar dari hanya file batch.\n\ Jika dijalankan di luar file batch ia akan keluar dari cmd.exe\n\ @@ -230,7 +230,7 @@ Untuk menggunakan perintah FOR dalam program batch, tetapkan %%variable daripada STRING_GOTO_HELP1 "Mengarahkan CMD ke baris berlabel dalam naskah batch.\n\n\ GOTO label\n\n\ label Menetapkan string teks yang digunakan dalam naskah batch sebagai label.\n\n\ -Anda mengetik label pada sebuah baris, dimulai dengan titik dua." +Anda mengetik label pada sebuah baris, dimulai dengan titik dua.\n" STRING_IF_HELP1 "Melakukan pemrosesan kondisional dalam program batch.\n\n\ IF [NOT] ERRORLEVEL nomor perintah\n\ IF [NOT] string1==string2 perintah\n\ @@ -467,9 +467,9 @@ title judul baru\n" STRING_ALIAS_ERROR "Baris perintah terlalu panjang setelah ekspansi alias!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "Kesalaham membuka file batch\n" - STRING_CHOICE_ERROR "Opsi tidak benar. Format diharapkan: /C[:]options" - STRING_CHOICE_ERROR_TXT "Opsi tidak benar. Format diharapkan: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Opsi tidak benar: %s" + STRING_CHOICE_ERROR "Opsi tidak benar. Format diharapkan: /C[:]options\n" + STRING_CHOICE_ERROR_TXT "Opsi tidak benar. Format diharapkan: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Opsi tidak benar: %s\n" STRING_CMD_ERROR1 "Tidak bisa mengalihkan input dari file %s\n" STRING_CMD_ERROR2 "Kesalahan membuat file termporal untuk pipe data\n" STRING_CMD_ERROR3 "Tidak bisa mengalihkan ke file %s\n" @@ -494,7 +494,7 @@ title judul baru\n" STRING_FOR_ERROR4 "tidak ada perintah setelah 'do'." STRING_FREE_ERROR1 "Drive tidak benar" STRING_FREE_ERROR2 "tak berlabel" - STRING_GOTO_ERROR1 "Tidak ada label ditetapkan untuk GOTO" + STRING_GOTO_ERROR1 "Tidak ada label ditetapkan untuk GOTO\n" STRING_GOTO_ERROR2 "Label '%s' tidak ditemukan\n" STRING_MD_ERROR "Subdirektori atau file sudah ada.\n" STRING_MD_ERROR2 "Path ke folder baru tidak ada.\n" @@ -515,7 +515,7 @@ title judul baru\n" STRING_ERROR_BADCOMMAND "Perintah atau nama file salah - %s\n" STRING_ERROR_OUT_OF_MEMORY "Kesalahan kekurangan memori.\n" STRING_ERROR_CANNOTPIPE "Salah! Tidak bisa melakukan pipe! Tidak bisa membuka file temporal!\n" - STRING_ERROR_D_PAUSEMSG "Tekan tombol untuk melanjutkan . . ." + STRING_ERROR_D_PAUSEMSG "Tekan tombol untuk melanjutkan . . . " STRING_ERROR_DRIVER_NOT_READY "Drive tidak siap" STRING_PATH_ERROR "CMD: Tidak dalam lingkungan '%s'\n" STRING_REPLACE_ERROR1 "Invalid switch - %s\n" @@ -541,8 +541,8 @@ title judul baru\n" STRING_MKLINK_CREATED_JUNCTION "Junction created for %s <<===>> %s\n" STRING_MORE "More? " STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break pressed. Cancel batch file? (Ya/Tidak/Semua) " - STRING_INVALID_OPERAND "Operand tidak benar." - STRING_EXPECTED_CLOSE_PAREN "Diharapkan ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Nomor atau nama variabel diharapkan." - STRING_SYNTAX_COMMAND_INCORRECT "Sintaks perintah tidak benar." + STRING_INVALID_OPERAND "Operand tidak benar.\n" + STRING_EXPECTED_CLOSE_PAREN "Diharapkan ')'.\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Nomor atau nama variabel diharapkan.\n" + STRING_SYNTAX_COMMAND_INCORRECT "Sintaks perintah tidak benar.\n" END diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc index 9adeb9b73e6..0f80bf5504a 100644 --- a/base/shell/cmd/lang/it-IT.rc +++ b/base/shell/cmd/lang/it-IT.rc @@ -22,7 +22,7 @@ Per rimuovere un alias:\n\ STRING_BEEP_HELP "Segnale acustico.\n\nBEEP\n" STRING_CALL_HELP "Chiama un programma batch da un altro.\n\n\ CALL [disco:][percorso]nomefile [Parametri]\n\n\ - Parametri Indicano le informazioni richieste per il programma batch." + Parametri Indicano le informazioni richieste per il programma batch.\n" STRING_CD_HELP "Cambia la cartella corrente o ne visualizza nome\n\n\ CHDIR [/D][disco:][percorso]\n\ CHDIR[..|.]\n\ @@ -193,7 +193,7 @@ PUSHD [percorso | ..]\n\n\ ECHO [messagio]\n\ ECHO. Stampa una linea vuota\n\n\ Usa ECHO senza parametri pr visualizzare lo stato attuale di ECHO." - STRING_ECHO_HELP5 "ECHO è %s\n" + STRING_ECHO_HELP5 "ECHO è %s.\n" STRING_EXIT_HELP "Esce dall'interprete dei comandi.\n\n\ EXIT [/b] [ExitCode]\n\n\ /B Esce solo dalle procedure batch.\n\ @@ -230,7 +230,7 @@ Per usare FOR in un batch usare %%variable invece di %variable.\n" indicata.\n\n\ GOTO etichetta\n\n\ etichetta Indica il testo utilizzato come etichetta in un batch.\n\n\ -Nel batch questa deve trovarsi da sola in una linea con davanti due punti :.\n" +Nel batch questa deve trovarsi da sola in una linea con davanti due punti (:).\n" STRING_IF_HELP1 "Esegue una elaborazione condizionale nei batch.\n\n\ IF [NOT] ERRORLEVEL numero comando\n\ IF [NOT] stringa1==stringa2 comando\n\ @@ -477,9 +477,9 @@ titolo il nuovo titolo\n" STRING_ALIAS_ERROR "Linea di comando troppo lunga dopo l'espansione degli alias!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "Errore durante l'apertura di un batch\n" - STRING_CHOICE_ERROR "Opzione non valida. Formato atteso: /C[:]opzioni" - STRING_CHOICE_ERROR_TXT "Opzione non valida. Formato atteso: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Opzione non valida: %s" + STRING_CHOICE_ERROR "Opzione non valida. Formato atteso: /C[:]opzioni\n" + STRING_CHOICE_ERROR_TXT "Opzione non valida. Formato atteso: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Opzione non valida: %s\n" STRING_CMD_ERROR1 "Impossibile ridirigere dal file %s\n" STRING_CMD_ERROR2 "Errore nella creazione del file temporaneo per la ridirezione\n" STRING_CMD_ERROR3 "Impossibile ridirigere nel file %s\n" @@ -504,7 +504,7 @@ titolo il nuovo titolo\n" STRING_FOR_ERROR4 "nessuno comando dopo 'do'." STRING_FREE_ERROR1 "Disco non valido" STRING_FREE_ERROR2 "non etichettato" - STRING_GOTO_ERROR1 "Nessuna etichetta indicata per GOTO" + STRING_GOTO_ERROR1 "Nessuna etichetta indicata per GOTO\n" STRING_GOTO_ERROR2 "Etichetta '%s' non trovata\n" STRING_MD_ERROR "Una cartella o file esiste già.\n" STRING_MD_ERROR2 "Il percorso della nuova cartella non esiste.\n" @@ -525,7 +525,7 @@ titolo il nuovo titolo\n" STRING_ERROR_BADCOMMAND "Comando o nome di file errato - %s\n" STRING_ERROR_OUT_OF_MEMORY "Errore di memoria esaurita.\n" STRING_ERROR_CANNOTPIPE "Errore! Impossibile ridirigere! Impossibile aprire un file temporaneo!\n" - STRING_ERROR_D_PAUSEMSG "Premi un tasto per continuare . . ." + STRING_ERROR_D_PAUSEMSG "Premi un tasto per continuare . . . " STRING_ERROR_DRIVER_NOT_READY "Disco non pronto" STRING_PATH_ERROR "CMD: Non nell'ambiente '%s'\n" STRING_REPLACE_ERROR1 "Parametro non valido - %s\n" @@ -551,8 +551,8 @@ titolo il nuovo titolo\n" STRING_MKLINK_CREATED_JUNCTION "Junction creato per %s <<===>> %s\n" STRING_MORE "Avanti? " STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break. Interrompere il file batch? (Si/No/Tutti)" - STRING_INVALID_OPERAND "Operando non valido." - STRING_EXPECTED_CLOSE_PAREN "Attesa una ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Attesa un numero o un nome di variabile." - STRING_SYNTAX_COMMAND_INCORRECT "La sintassi del comando è errata." + STRING_INVALID_OPERAND "Operando non valido.\n" + STRING_EXPECTED_CLOSE_PAREN "Attesa una ')'.\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Attesa un numero o un nome di variabile.\n" + STRING_SYNTAX_COMMAND_INCORRECT "La sintassi del comando è errata.\n" END diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc index f0cd23a7737..8d493993447 100644 --- a/base/shell/cmd/lang/ja-JP.rc +++ b/base/shell/cmd/lang/ja-JP.rc @@ -23,7 +23,7 @@ ALIAS [エイリアス=[コマンド]]\n\n\ STRING_CALL_HELP "バッチプログラムを別のバッチプログラムから呼び出します。\n\n\ CALL [ドライブ:][パス]ファイル名 [バッチパラメータ]\n\n\ バッチパラメータバッチプログラムで必要なコマンドライン情報を\n\ - 指定します。" + 指定します。\n" STRING_CD_HELP "現在のディレクトリを変更したり、ディレクトリ名を表示したりします。\n\n\ CHDIR [/D][ドライブ:][パス]\n\ CHDIR[..|.]\n\ @@ -234,7 +234,7 @@ f,d,p,n,x,s,a,t,z.\n\n\ GOTO ラベル\n\n\ ラベルバッチプログラムでラベルとして使用するテキスト文字列を指定します。\n\n\ ラベルの先頭には : (コロン) を指定し、ラベルだけを単独で 1 行に入力してくだ\n\ -さい。" +さい。\n" STRING_IF_HELP1 "バッチプログラム中で条件処理を実行します。\n\n\ IF [NOT] ERRORLEVEL 番号コマンド\n\ IF [NOT] 文字列1==文字列2 コマンド\n\ @@ -475,9 +475,9 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_ALIAS_ERROR "エイリアス展開後のコマンドラインが長すぎます!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "バッチファイルを開くときにエラーが発生しました。\n" - STRING_CHOICE_ERROR "無効なオプションです。期待される書式: /C[:]オプション" - STRING_CHOICE_ERROR_TXT "無効なオプションです。期待される書式: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "無効なオプションです: %s" + STRING_CHOICE_ERROR "無効なオプションです。期待される書式: /C[:]オプション\n" + STRING_CHOICE_ERROR_TXT "無効なオプションです。期待される書式: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "無効なオプションです: %s\n" STRING_CMD_ERROR1 "ファイル %s からリダイレクト入力できません。\n" STRING_CMD_ERROR2 "データをパイプするための一時ファイル作成のときにエラーが発生しました。\n" STRING_CMD_ERROR3 "ファイル %s へとリダイレクトできません。\n" @@ -502,7 +502,7 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_FOR_ERROR4 "'do' の後にコマンドがありません。" STRING_FREE_ERROR1 "無効なドライブです。" STRING_FREE_ERROR2 "ラベルがありません。" - STRING_GOTO_ERROR1 "GOTO にラベルが指定されていません。" + STRING_GOTO_ERROR1 "GOTO にラベルが指定されていません。\n" STRING_GOTO_ERROR2 "ラベル '%s' が見つかりませんでした。\n" STRING_MD_ERROR "すでにディレクトリ内にサブディレクトリかファイルが存在しています。\n" STRING_MD_ERROR2 "新しいフォルダへのパスが存在していません。\n" @@ -523,7 +523,7 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_ERROR_BADCOMMAND "コマンドまたはファイル名が間違っています。 - %s\n" STRING_ERROR_OUT_OF_MEMORY "メモリ不足エラー。\n" STRING_ERROR_CANNOTPIPE "エラー! パイプできません! 一時ファイルを開けません!\n" - STRING_ERROR_D_PAUSEMSG "続行するには何かキーを押してください . . ." + STRING_ERROR_D_PAUSEMSG "続行するには何かキーを押してください . . . " STRING_ERROR_DRIVER_NOT_READY "ドライブの準備ができていません。" STRING_PATH_ERROR "CMD: Not in environment '%s'\n" STRING_REPLACE_ERROR1 "Invalid switch - %s\n" @@ -549,8 +549,8 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_MKLINK_CREATED_JUNCTION "Junction created for %s <<===>> %s\n" STRING_MORE "More? " STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) " - STRING_INVALID_OPERAND "無効なオペランドです。" - STRING_EXPECTED_CLOSE_PAREN "Expected ')'" - STRING_EXPECTED_NUMBER_OR_VARIABLE "Expected number or variable name." - STRING_SYNTAX_COMMAND_INCORRECT "コマンドの構文が間違っています。" + STRING_INVALID_OPERAND "無効なオペランドです。\n" + STRING_EXPECTED_CLOSE_PAREN "Expected ')'\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Expected number or variable name.\n" + STRING_SYNTAX_COMMAND_INCORRECT "コマンドの構文が間違っています。\n" END diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc index 4543674fa5a..d5056d19e9d 100644 --- a/base/shell/cmd/lang/no-NO.rc +++ b/base/shell/cmd/lang/no-NO.rc @@ -23,7 +23,7 @@ For å fjerne et alias fra alias-liste:\n\ STRING_CALL_HELP "Kaller et satsvis program fra et annet.\n\n\ CALL [stasjon:][mappe]filnavn [satsvis-parameter]\n\n\ satsvis-parameter Spesifisere noen kommando-linje informasjon trengs av\n\ - satsvis program." + satsvis program.\n" STRING_CD_HELP "Viser navnet på, eller endrer gjeldende mappe\n\n\ CHDIR [/D][stasjon:][mappe]\n\ CHDIR[..|.]\n\ @@ -193,7 +193,7 @@ PUSHD [mappe | ..]\n\n\ ECHO [melding]\n\ ECHO. skriv en tom linje\n\n\ Skriv ECHO uten parameter for å vise gjeldende ECHO innstillinger." - STRING_ECHO_HELP5 "ECHO er %s\n" + STRING_ECHO_HELP5 "ECHO er %s.\n" STRING_EXIT_HELP "Avslutt kommando linje interpreter.\n\nAVSLUTT [/b] [ExitCode]\n\n\ /B Avslutt bare en batch fil.\n\ Hvis det kjøres en batch fil på utsiden vil den avslutte cmd.exe\n\ @@ -228,7 +228,7 @@ For å bruke FOR kommando i en satsvis fil, spesifisere %%variabel isteden for\n STRING_GOTO_HELP1 "Leder CMD til en merket linje i et satsvis skript.\n\n\ GOTO merke\n\n\ merke angir en tekst streng brukt i en satsvis skript.\n\n\ -Et merke opprettes på egen linje ved å skrive kolon fulgt av navn på merke." +Et merke opprettes på egen linje ved å skrive kolon fulgt av navn på merke.\n" STRING_IF_HELP1 "Utføre betinget behandling i satsvise programmer.\n\n\ IF [NOT] ERRORLEVEL nummer kommando\n\ IF [NOT] streng1==streng2 kommando\n\ @@ -466,9 +466,9 @@ tittel ny tittel\n" STRING_ALIAS_ERROR "Kommando linje for lang etter alias utvidelse!\n" STRING_ASSOC_ERROR "Fil association ble ikke funnet for utvidelsen %s\n" STRING_BATCH_ERROR "Feil ved åpning av satsvis fil\n" - STRING_CHOICE_ERROR "Ugyldig valg. Forventet format: /C[:]valg" - STRING_CHOICE_ERROR_TXT "Ugyldig valg. Forventet format: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Ulovlig operasjon: %s" + STRING_CHOICE_ERROR "Ugyldig valg. Forventet format: /C[:]valg\n" + STRING_CHOICE_ERROR_TXT "Ugyldig valg. Forventet format: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Ulovlig operasjon: %s\n" STRING_CMD_ERROR1 "Kan ikke videreføre inndata fra fil %s\n" STRING_CMD_ERROR2 "Feil under oppretting av temporær fil for datakanal\n" STRING_CMD_ERROR3 "Kan ikke videreføre til fil %s\n" @@ -493,8 +493,8 @@ tittel ny tittel\n" STRING_FOR_ERROR4 "ingen kommando etter 'gjøre'." STRING_FREE_ERROR1 "Ugyldig driver" STRING_FREE_ERROR2 "utmerket" - STRING_GOTO_ERROR1 "Ingen merke spesifisert for GOTO" - STRING_GOTO_ERROR2 "merke '%s' ikke funnet\n" + STRING_GOTO_ERROR1 "Ingen merke spesifisert for GOTO\n" + STRING_GOTO_ERROR2 "Merke '%s' ikke funnet\n" STRING_MD_ERROR "En undermappe eller fil finnes allerede.\n" STRING_MD_ERROR2 "Stien til den nye mappen eksisterer ikke.\n" STRING_MOVE_ERROR1 "[OK]\n" @@ -514,7 +514,7 @@ tittel ny tittel\n" STRING_ERROR_BADCOMMAND "Feil kommando eller filnavn - %s\n" STRING_ERROR_OUT_OF_MEMORY "Feil: Minne fullt.\n" STRING_ERROR_CANNOTPIPE "Feil! Kan ikke bruke datakanal! Kan ikke åpne midlertidig fil!\n" - STRING_ERROR_D_PAUSEMSG "Trykk en tast for å fortsette . . ." + STRING_ERROR_D_PAUSEMSG "Trykk en tast for å fortsette . . . " STRING_ERROR_DRIVER_NOT_READY "Stasjonen er ikke klar" STRING_PATH_ERROR "CMD: Ikke i miljøet '%s'\n" STRING_REPLACE_ERROR1 "Invalid switch - %s\n" @@ -540,8 +540,8 @@ tittel ny tittel\n" STRING_MKLINK_CREATED_JUNCTION "Junction created for %s <<===>> %s\n" STRING_MORE "More? " STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break trykket. Avbryt batch filen? (Ja/Nei/Alt) " - STRING_INVALID_OPERAND "Ugyldig operand." - STRING_EXPECTED_CLOSE_PAREN "Forventet ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Forventet nummer eller variabel navn." - STRING_SYNTAX_COMMAND_INCORRECT "Syntaks for kommandoen er feil." + STRING_INVALID_OPERAND "Ugyldig operand.\n" + STRING_EXPECTED_CLOSE_PAREN "Forventet ')'.\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Forventet nummer eller variabel navn.\n" + STRING_SYNTAX_COMMAND_INCORRECT "Syntaks for kommandoen er feil.\n" END diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index fc24b14e4b0..c53eddf985c 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -33,7 +33,7 @@ Aby usunąć istniejący alias:\n\ STRING_CALL_HELP "Umożliwia wywołanie programu wsadowego z poziomu innego.\n\n\ CALL [napęd:][ścieżka]nazwa_pliku [parametry]\n\n\ parametry Wszelkie dane, wymagane przez program wsadowy,\n\ - który ma zostać wywołany." + który ma zostać wywołany.\n" STRING_CD_HELP "Zmienia obecny katalog albo wyświetla jego pełną nazwę.\n\n\ CHDIR [/D][napęd:][ścieżka]\n\ CHDIR[..|.]\n\ @@ -202,7 +202,7 @@ PUSHD [ścieżka | ..]\n\n\ ECHO [wiadomość]\n\ ECHO. wyświetla pustą linię\n\n\ Wpisz ECHO bez żadnych parametrów, by wyświetlić obecne ustawienie." - STRING_ECHO_HELP5 "ECHO jest %s\n" + STRING_ECHO_HELP5 "ECHO jest %s.\n" STRING_EXIT_HELP "Zamyka okno konsoli.\n\nEXIT [/b] [kod]\n\n\ /B Zamyka jedynie plik wsadowy.\n\ Jeśli użyty będzie poza plikiem wsadowym, zamknie cmd.exe\n\ @@ -237,7 +237,7 @@ By użyć FOR w pliku wsadowym, oznacz zmienną jako %%zmienna zamiast\n\ STRING_GOTO_HELP1 "Przekierowuje CMD do oznaczonej linii w programie wsadowym.\n\n\ GOTO etykieta\n\n\ etykieta Ciąg znaków, użyty w programie wsadowym do oznaczenia linii.\n\n\ -Możesz oznaczyć linie dowolną etykietą, zaczynając od dwukropka." +Możesz oznaczyć linie dowolną etykietą, zaczynając od dwukropka.\n" STRING_IF_HELP1 "Wykonuje przetwarzanie warunkowe w programach wsadowych.\n\n\ IF [NOT] ERRORLEVEL numer komenda\n\ IF [NOT] ciąg_znaków1==ciąg_znaków2 komenda\n\ @@ -473,9 +473,9 @@ title nowy tytuł okna\n" STRING_ALIAS_ERROR "Linia poleceń zbyt długa po rozszerzeniu aliasa!\n" STRING_ASSOC_ERROR "Nie można odnaleźć skojarzenia pliku dla rozszerzenia %s\n" STRING_BATCH_ERROR "Błąd podczas otwierania pliku wsadowego\n" - STRING_CHOICE_ERROR "Parametr niepoprawny. Poprawna forma: /C[:]opcja" - STRING_CHOICE_ERROR_TXT "Parametr niepoprawny. Poprawna forma: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Zły parametr: %s" + STRING_CHOICE_ERROR "Parametr niepoprawny. Poprawna forma: /C[:]opcja\n" + STRING_CHOICE_ERROR_TXT "Parametr niepoprawny. Poprawna forma: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Zły parametr: %s\n" STRING_CMD_ERROR1 "Nie można przekierować danych z pliku %s\n" STRING_CMD_ERROR2 "Błąd podczas tworzenia potokowego pliku tymczasowego\n" STRING_CMD_ERROR3 "Nie można przekierować do pliku %s\n" @@ -500,7 +500,7 @@ title nowy tytuł okna\n" STRING_FOR_ERROR4 "Brak komendy po 'do'." STRING_FREE_ERROR1 "Nieprawidłowa litera napędu" STRING_FREE_ERROR2 "brak" - STRING_GOTO_ERROR1 "Brak etykiety dla GOTO" + STRING_GOTO_ERROR1 "Brak etykiety dla GOTO\n" STRING_GOTO_ERROR2 "Etykieta '%s' nie została znaleziona\n" STRING_MD_ERROR "Istnieje już plik lub podkatalog o tej nazwie.\n" STRING_MD_ERROR2 "Ścieżka do nowego katalogu nie jest prawidłowa.\n" @@ -521,7 +521,7 @@ title nowy tytuł okna\n" STRING_ERROR_BADCOMMAND "Nieprawidłowa komenda lub nazwa pliku - %s\n" STRING_ERROR_OUT_OF_MEMORY "Błąd - brak pamięci.\n" STRING_ERROR_CANNOTPIPE "Błąd potoków! Nie można otworzyć pliku tymczasowego.\n" - STRING_ERROR_D_PAUSEMSG "Naciśnij dowolny klawisz, aby kontynuować . . ." + STRING_ERROR_D_PAUSEMSG "Naciśnij dowolny klawisz, aby kontynuować . . . " STRING_ERROR_DRIVER_NOT_READY "Napęd nie jest gotowy" STRING_PATH_ERROR "CMD: Poza środowiskiem '%s'\n" STRING_REPLACE_ERROR1 "Nieprawidłowy parametr - %s\n" @@ -547,8 +547,8 @@ title nowy tytuł okna\n" STRING_MKLINK_CREATED_JUNCTION "Punkt dowiązania katalogów utworzony dla %s <<===>> %s\n" STRING_MORE "Więcej? " STRING_CANCEL_BATCH_FILE "\r\nWciśnięto Ctrl-Break. Anulować wykonanie pliku wsadowego? (Tak/Nie/Zawsze) " - STRING_INVALID_OPERAND "Nieprawidłowy argument operatora." - STRING_EXPECTED_CLOSE_PAREN "Oczekiwano ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Oczekiwano liczby lub nazwy zmiennej." - STRING_SYNTAX_COMMAND_INCORRECT "Składnia komendy jest nieprawidłowa." + STRING_INVALID_OPERAND "Nieprawidłowy argument operatora.\n" + STRING_EXPECTED_CLOSE_PAREN "Oczekiwano ')'.\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Oczekiwano liczby lub nazwy zmiennej.\n" + STRING_SYNTAX_COMMAND_INCORRECT "Składnia komendy jest nieprawidłowa.\n" END diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc index 4d261cb66f9..f406454ee49 100644 --- a/base/shell/cmd/lang/ro-RO.rc +++ b/base/shell/cmd/lang/ro-RO.rc @@ -216,7 +216,7 @@ comenzilor în ecou.\n\n\ ECHO [mesaj]\n\ ECHO. afișează un rând gol\n\n\ Tastați ECHO fără argumente pentru afișarea stării curente a ecoului.\n" - STRING_ECHO_HELP5 "ECHO: %s\n" + STRING_ECHO_HELP5 "ECHO: %s.\n" STRING_EXIT_HELP "Închide interpretorul de comenzi.\n\nEXIT [/b] [cod_de_ieșire]\n\n\ /B Doar pentru ieșirea dintr-un fișier de comenzi.\n\ Dacă este executat în afara unui fișier de comenzi, va\n\ @@ -255,7 +255,7 @@ Numărul de serie este %s\n\ GOTO etichetă\n\n\ etichetă Specifică un șir text utilizat ca etichetă în\n\ fișierele de comenzi.\n\n\ -O etichetă va fi definită pe un rând întreg, începând cu două puncte (:)\n" +O etichetă va fi definită pe un rând întreg, începând cu două puncte (:).\n" STRING_IF_HELP1 "Realizează execuția condiționată a comenzilor într-un fișier de comenzi.\n\n\ IF [NOT] ERRORLEVEL număr comandă\n\ IF [NOT] șir1==șir2 comandă\n\ @@ -501,9 +501,9 @@ titlu Noul titlu.\n" STRING_ALIAS_ERROR "Linia de comandă devine prea lungă după extinderea alias!\n" STRING_ASSOC_ERROR "Nu poate fi găsită nici o aplicație asociată extensiei «%s»\n" STRING_BATCH_ERROR "Eroare la deschiderea fișierului de comenzi\n" - STRING_CHOICE_ERROR "Opțiune eronată. Vedeți formatul: /C[:]opțiuni" - STRING_CHOICE_ERROR_TXT "Opțiune eronată. Vedeți formatul: /T[:]implicit,nn" - STRING_CHOICE_ERROR_OPTION "Opțiune eronată: %s" + STRING_CHOICE_ERROR "Opțiune eronată. Vedeți formatul: /C[:]opțiuni\n" + STRING_CHOICE_ERROR_TXT "Opțiune eronată. Vedeți formatul: /T[:]implicit,nn\n" + STRING_CHOICE_ERROR_OPTION "Opțiune eronată: %s\n" STRING_CMD_ERROR1 "Redirecționarea intrării din fișierul «%s» nu a fost posibilă\n" STRING_CMD_ERROR2 "Crearea fișierului temporar pentru canalizarea de date nu a fost posibilă\n" STRING_CMD_ERROR3 "Redirecționarea către fișierul %s nu a fost posibilă\n" @@ -528,7 +528,7 @@ titlu Noul titlu.\n" STRING_FOR_ERROR4 "Nici o comandă după «DO»." STRING_FREE_ERROR1 "Unitate nevalidă" STRING_FREE_ERROR2 "neetichetat" - STRING_GOTO_ERROR1 "Nu a fost specificată nici o etichetă pentru «GOTO»" + STRING_GOTO_ERROR1 "Nu a fost specificată nici o etichetă pentru «GOTO»\n" STRING_GOTO_ERROR2 "Eticheta «%s» nu a fost găsită\n" STRING_MD_ERROR "Există deja un fișier sau un subdirector cu acest nume.\n" STRING_MD_ERROR2 "Calea către noul director nu există.\n" @@ -549,7 +549,7 @@ titlu Noul titlu.\n" STRING_ERROR_BADCOMMAND "Comandă eronată sau fișier inexistent - %s\n" STRING_ERROR_OUT_OF_MEMORY "Eroare de exces de memorie.\n" STRING_ERROR_CANNOTPIPE "Eroare! Nu datele nu pot fi canalizate! Nu fișierul temporar nu a putut fi deschis!\n" - STRING_ERROR_D_PAUSEMSG "Tastați pentru a continua..." + STRING_ERROR_D_PAUSEMSG "Tastați pentru a continua... " STRING_ERROR_DRIVER_NOT_READY "Unitatea de stocare nu e utilizabilă" STRING_PATH_ERROR "CMD: «%s» inexistentă în mediu\n" STRING_REPLACE_ERROR1 "Argument eronat - %s\n" @@ -575,8 +575,8 @@ titlu Noul titlu.\n" STRING_MKLINK_CREATED_JUNCTION "A fost creată o joncțiune pentru %s <<===>> %s\n" STRING_MORE "Mai mult? " STRING_CANCEL_BATCH_FILE "\r\nAți apăsat Ctrl-Break. Anulați fișierul de comenzi? (Da|Nu|Toate)" - STRING_INVALID_OPERAND "Operand eronat." - STRING_EXPECTED_CLOSE_PAREN "Este necesar «)»." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Este necesar un număr sau un nume de variabilă." - STRING_SYNTAX_COMMAND_INCORRECT "Sintaxa comenzii este eronată." + STRING_INVALID_OPERAND "Operand eronat.\n" + STRING_EXPECTED_CLOSE_PAREN "Este necesar «)».\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Este necesar un număr sau un nume de variabilă.\n" + STRING_SYNTAX_COMMAND_INCORRECT "Sintaxa comenzii este eronată.\n" END diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc index 9e39b61dc75..f4ffc1c91b9 100644 --- a/base/shell/cmd/lang/ru-RU.rc +++ b/base/shell/cmd/lang/ru-RU.rc @@ -25,7 +25,7 @@ ALIAS [псевдоним=[команда]]\n\n\ STRING_CALL_HELP "Вызов одного пакетного файла из другого.\n\n\ CALL [диск:][путь]имя_файла [параметры]\n\n\ параметры Набор параметров командной строки, необходимых\n\ - пакетному файлу." + пакетному файлу.\n" STRING_CD_HELP "Вывод текущего каталога либо его смена.\n\n\ CHDIR [/D][диск:][путь]\n\ CHDIR[..|.]\n\ @@ -194,7 +194,7 @@ PUSHD [путь | ..]\n\n\ ECHO [сообщение]\n\ ECHO. вывод пустой строки\n\n\ ECHO без параметра выводит текущий режим отображения команд." - STRING_ECHO_HELP5 "ECHO это %s\n" + STRING_ECHO_HELP5 "ECHO это %s.\n" STRING_EXIT_HELP "Завершает работу интерпретатора командной строки.\n\nEXIT [/b] [ExitCode]\n\n\ /B Завершает текущий пакетный файл.\n\ Если выполняется вне пакетного файла, то будет завершена программа CMD.EXE\n\ @@ -230,7 +230,7 @@ f,d,p,n,x,s,a,t,z.\n\n\ STRING_GOTO_HELP1 "Передача управления содержащей метку строке пакетного файла.\n\n\ GOTO метка\n\n\ метка Строка пакетного файла, оформленная как метка.\n\n\ -Метка должна находиться в отдельной строке и начинаться с двоеточия." +Метка должна находиться в отдельной строке и начинаться с двоеточия.\n" STRING_IF_HELP1 "Оператор условного выполнения команд в пакетном файле.\n\n\ IF [NOT] ERRORLEVEL число команда\n\ IF [NOT] строка1==строка2 команда\n\ @@ -478,9 +478,9 @@ RESTORE восстанавливает окно\n\ STRING_ALIAS_ERROR "Командная строка слишком длинная после развертывания псевдонимов!\n" STRING_ASSOC_ERROR "Не найдено файловых ассоциаций для расширения %s\n" STRING_BATCH_ERROR "Ошибка открытия командного файла\n" - STRING_CHOICE_ERROR "Неверный параметр. Ожидается формат: /C[:]параметры" - STRING_CHOICE_ERROR_TXT "Неверный параметр. Ожидается формат: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Неверный параметр: %s" + STRING_CHOICE_ERROR "Неверный параметр. Ожидается формат: /C[:]параметры\n" + STRING_CHOICE_ERROR_TXT "Неверный параметр. Ожидается формат: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Неверный параметр: %s\n" STRING_CMD_ERROR1 "Невозможно перенаправить ввод из файла %s\n" STRING_CMD_ERROR2 "Ошибка создания временного файла для pipe-данных\n" STRING_CMD_ERROR3 "Невозможно перенаправить в файл %s\n" @@ -505,7 +505,7 @@ RESTORE восстанавливает окно\n\ STRING_FOR_ERROR4 "нет команды после 'do'." STRING_FREE_ERROR1 "Неверное имя диска" STRING_FREE_ERROR2 "не отмечено" - STRING_GOTO_ERROR1 "Не определена метка для GOTO" + STRING_GOTO_ERROR1 "Не определена метка для GOTO\n" STRING_GOTO_ERROR2 "Метка '%s' не найдена\n" STRING_MD_ERROR "Подкаталог или файл уже существует.\n" STRING_MD_ERROR2 "Путь к новому каталогу не существует.\n" @@ -526,7 +526,7 @@ RESTORE восстанавливает окно\n\ STRING_ERROR_BADCOMMAND "Неверная команда или неверное имя файла - %s\n" STRING_ERROR_OUT_OF_MEMORY "Нехватка памяти.\n" STRING_ERROR_CANNOTPIPE "Ошибка! Невозможно использовать pipe! Невозможно создать временный файл!\n" - STRING_ERROR_D_PAUSEMSG "Для продолжения нажмите любую клавишу . . ." + STRING_ERROR_D_PAUSEMSG "Для продолжения нажмите любую клавишу . . . " STRING_ERROR_DRIVER_NOT_READY "Устройство не готово" STRING_PATH_ERROR "CMD: Не в среде окружения '%s'\n" STRING_REPLACE_ERROR1 "Неверный ключ - %s\n" @@ -552,8 +552,8 @@ RESTORE восстанавливает окно\n\ STRING_MKLINK_CREATED_JUNCTION "Точка соединения создана для %s <<===>> %s\n" STRING_MORE "Еще? " STRING_CANCEL_BATCH_FILE "\r\nЗавершить выполнение пакетного файла [Y(да)/N(нет)]? " - STRING_INVALID_OPERAND "Неверный операнд." - STRING_EXPECTED_CLOSE_PAREN "Ожидается ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Ожидается число или название переменной." - STRING_SYNTAX_COMMAND_INCORRECT "Неверный синтаксис команды." + STRING_INVALID_OPERAND "Неверный операнд.\n" + STRING_EXPECTED_CLOSE_PAREN "Ожидается ')'.\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Ожидается число или название переменной.\n" + STRING_SYNTAX_COMMAND_INCORRECT "Неверный синтаксис команды.\n" END diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index 5465736030b..8f86dbd0d2f 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -29,7 +29,7 @@ To remove an alias from the alias list:\n\ STRING_CALL_HELP "Calls one batch program from another.\n\n\ CALL [drive:][path]filename [batch-parameter]\n\n\ batch-parameter Specifies any command-line information required by the\n\ - batch program." + batch program.\n" STRING_CD_HELP "Changes the current directory or displays it's name\n\n\ CHDIR [/D][drive:][path]\n\ CHDIR[..|.]\n\ @@ -199,7 +199,7 @@ PUSHD [path | ..]\n\n\ ECHO [message]\n\ ECHO. prints an empty line\n\n\ Type ECHO without a parameter to display the current ECHO setting." - STRING_ECHO_HELP5 "ECHO je %s\n" + STRING_ECHO_HELP5 "ECHO je %s.\n" STRING_EXIT_HELP "Exits the command line interpreter.\n\nEXIT [/b] [ExitCode]\n\n\ /B Exits a batch file only.\n\ If run outside of a batch file it will exit cmd.exe\n\ @@ -234,7 +234,7 @@ To use the FOR command in a batch program, specify %%variable instead of\n\ STRING_GOTO_HELP1 "Directs CMD to a labeled line in a batch script.\n\n\ GOTO label\n\n\ label Specifies a text string used in a batch script as a label.\n\n\ -You type a label on a line by itself, beginning with a colon." +You type a label on a line by itself, beginning with a colon.\n" STRING_IF_HELP1 "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ IF [NOT] string1==string2 command\n\ @@ -474,9 +474,9 @@ title new title\n" STRING_ALIAS_ERROR "Command line too long after alias expansion!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "Error opening batch file\n" - STRING_CHOICE_ERROR "Invalid option. Expected format: /C[:]options" - STRING_CHOICE_ERROR_TXT "Invalid option. Expected format: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Illegal Option: %s" + STRING_CHOICE_ERROR "Invalid option. Expected format: /C[:]options\n" + STRING_CHOICE_ERROR_TXT "Invalid option. Expected format: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Illegal Option: %s\n" STRING_CMD_ERROR1 "Can't redirect input from file %s\n" STRING_CMD_ERROR2 "Error creating temporary file for pipe data\n" STRING_CMD_ERROR3 "Can't redirect to file %s\n" @@ -501,7 +501,7 @@ title new title\n" STRING_FOR_ERROR4 "no command after 'do'." STRING_FREE_ERROR1 "Invalid drive" STRING_FREE_ERROR2 "unlabeled" - STRING_GOTO_ERROR1 "No label specified for GOTO" + STRING_GOTO_ERROR1 "No label specified for GOTO\n" STRING_GOTO_ERROR2 "Label '%s' not found\n" STRING_MD_ERROR "A subdirectory or file already exists.\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" @@ -522,7 +522,7 @@ title new title\n" STRING_ERROR_BADCOMMAND "Chybný príkaz alebo názov súboru - %s\n" STRING_ERROR_OUT_OF_MEMORY "Chyba (z) nedostatku pamäte.\n" STRING_ERROR_CANNOTPIPE "Chyba! Cannot pipe! Cannot open temporary file!\n" - STRING_ERROR_D_PAUSEMSG "Pokračujte stlačením ľubovoľného klávesu ..." + STRING_ERROR_D_PAUSEMSG "Pokračujte stlačením ľubovoľného klávesu ... " STRING_ERROR_DRIVER_NOT_READY "Jednotka nie je pripravená" STRING_PATH_ERROR "CMD: Not in environment '%s'\n" STRING_REPLACE_ERROR1 "Neplatný prepínač - %s\n" @@ -548,8 +548,8 @@ title new title\n" STRING_MKLINK_CREATED_JUNCTION "Junction created for %s <<===>> %s\n" STRING_MORE "Viac? " STRING_CANCEL_BATCH_FILE "\r\nStlačené Ctrl-Break. Cancel batch file? (Yes/No/All) " - STRING_INVALID_OPERAND "Invalid operand." - STRING_EXPECTED_CLOSE_PAREN "Očakávaná ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Očakávané číslo alebo názov premennej." - STRING_SYNTAX_COMMAND_INCORRECT "Nesprávna syntax príkazu." + STRING_INVALID_OPERAND "Invalid operand.\n" + STRING_EXPECTED_CLOSE_PAREN "Očakávaná ')'.\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Očakávané číslo alebo názov premennej.\n" + STRING_SYNTAX_COMMAND_INCORRECT "Nesprávna syntax príkazu.\n" END diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index 51dfa29a55e..c8b002590fa 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -27,7 +27,7 @@ Për të hequr një pseudonim nga pseudonimi:\n\ STRING_CALL_HELP "Thërret nje program batch nga një tjetër.\n\n\ CALL [drive:][path]emri [batch-parameter]\n\n\ batch-parameter Specifikon ndonjë informacion qe kërkohen nga programi batch në\n\ - linjën e komandes." + linjën e komandes.\n" STRING_CD_HELP "Ndryshon ose shfaq emrin e skedës aktuale\n\n\ CHDIR [/D][drive:][rrugë]\n\ CHDIR[..|.]\n\ @@ -197,7 +197,7 @@ PUSHD [rrugë | ..]\n\n\ ECHO [mesazhe\n\ ECHO. printon një vijë e zbrazët\n\n\ Shkruaj ECHO pa parametra qe shfaqin konfigurimin aktual te ECHO." - STRING_ECHO_HELP5 "ECHO është %s\n" + STRING_ECHO_HELP5 "ECHO është %s.\n" STRING_EXIT_HELP "Dalje nga interpretuesi komandues i linjes.\n\nEXIT [/b] [ExitCode]\n\n\ /B Dalje nga batch vetëm.\n\ Nëse drejtuar jashtë nga një skedar batch do të dalë nga cmd.exe\n\ @@ -232,7 +232,7 @@ të %variable.\n" STRING_GOTO_HELP1 "Drejton CMD në një linjë të etiketuar në një batch skript.\n\n\ GOTO etiketa\n\n\ label Përcakton një varg teksti të përdorur në një batch skript, si një etiketë.\n\n\ -Ju mund të shkruani një etiketë në një linjë në vetvete, duke filluar me një rradhë." +Ju mund të shkruani një etiketë në një linjë në vetvete, duke filluar me një rradhë.\n" STRING_IF_HELP1 "Kryen përpunimin e kushtëzuar në programet batch.\n\n\ IF [NOT] ERRORLEVEL komanda e numrit\n\ IF [NOT] string1==string2 komande\n\ @@ -472,9 +472,9 @@ title titull i ri\n" STRING_ALIAS_ERROR "Rreshti i komandës shumë gjatë pas pseudonimit!\n" STRING_ASSOC_ERROR "Dokumentit perkates nuk u gjet për zgjatjen %s\n" STRING_BATCH_ERROR "Gabim gjatë hapjes së dokumentit batch\n" - STRING_CHOICE_ERROR "Opsione invalide. Format i pritshem: /C[:]opsione" - STRING_CHOICE_ERROR_TXT "Opsione invalide. Format i pritshem: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Illegal Option: %s" + STRING_CHOICE_ERROR "Opsione invalide. Format i pritshem: /C[:]opsione\n" + STRING_CHOICE_ERROR_TXT "Opsione invalide. Format i pritshem: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Illegal Option: %s\n" STRING_CMD_ERROR1 "Nuk mund të përcjellim hyrjen nga dokumenti %s\n" STRING_CMD_ERROR2 "Error ne krijimin e dokumentit e perkohshem për informacionin ne pipe\n" STRING_CMD_ERROR3 "Nuk mund të përcjellim në dokument %s\n" @@ -499,7 +499,7 @@ title titull i ri\n" STRING_FOR_ERROR4 "asnjë komandë pas 'do'." STRING_FREE_ERROR1 "Drive Invalid" STRING_FREE_ERROR2 "E paetiketuar" - STRING_GOTO_ERROR1 "Nuk ka etiketa specifikuar për GOTO" + STRING_GOTO_ERROR1 "Nuk ka etiketa specifikuar për GOTO\n" STRING_GOTO_ERROR2 "Etikete '%s' Nuk u gjet\n" STRING_MD_ERROR "Një nën-skedë ose dokument ekziston.\n" STRING_MD_ERROR2 "Rruga për tek skeda e re nuk ekziston.\n" @@ -520,7 +520,7 @@ title titull i ri\n" STRING_ERROR_BADCOMMAND "Komande e keqe ose dokument i keq - %s\n" STRING_ERROR_OUT_OF_MEMORY "Error ska memorie te mjaftueshme.\n" STRING_ERROR_CANNOTPIPE "Error! Nuk mund të pipoj! Nuk mund të hape dokumentet e perkohshem!\n" - STRING_ERROR_D_PAUSEMSG "Shtypni një buton për të vazhduar . . ." + STRING_ERROR_D_PAUSEMSG "Shtypni një buton për të vazhduar . . . " STRING_ERROR_DRIVER_NOT_READY "Drive nuk është gati" STRING_PATH_ERROR "CMD: Jo në mjedis '%s'\n" STRING_REPLACE_ERROR1 "Qeles invalid - %s\n" @@ -546,8 +546,8 @@ title titull i ri\n" STRING_MKLINK_CREATED_JUNCTION "Kryqezim krijuar për %s <<===>> %s\n" STRING_MORE "Më shumë? " STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break. Anulo dokumentin batch? (Po/Jo/Të Gjith) " - STRING_INVALID_OPERAND "Invalid operand." - STRING_EXPECTED_CLOSE_PAREN "Pritej ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Numer që pritej ose emri i variables." - STRING_SYNTAX_COMMAND_INCORRECT "Sintaksi i komandes është gabim." + STRING_INVALID_OPERAND "Invalid operand.\n" + STRING_EXPECTED_CLOSE_PAREN "Pritej ')'.\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Numer që pritej ose emri i variables.\n" + STRING_SYNTAX_COMMAND_INCORRECT "Sintaksi i komandes është gabim.\n" END diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc index 3a929a5ff92..4636c1e52e2 100644 --- a/base/shell/cmd/lang/sv-SE.rc +++ b/base/shell/cmd/lang/sv-SE.rc @@ -23,7 +23,7 @@ För att ta bort ett alias från listan:\n\ STRING_CALL_HELP "Anropa ett batchprogram från ett annat.\n\n\ CALL [enhet:][mapp]filnamn [batch-parameter]\n\n\ batch-parameter Specificerar en kommandoradsinformation som batchprogrammet\n\ - behöver." + behöver.\n" STRING_CD_HELP "Visar namnet på, eller ändrar aktuell mapp\n\n\ CHDIR [/D][enhet:][mapp]\n\ CHDIR[..|.]\n\ @@ -193,7 +193,7 @@ PUSHD [mapp | ..]\n\n\ ECHO [meddelande]\n\ ECHO. skriv en tom rad\n\n\ Skriv ECHO utan parametar för att visa aktuell ECHO inställning." - STRING_ECHO_HELP5 "ECHO är %s\n" + STRING_ECHO_HELP5 "ECHO är %s.\n" STRING_EXIT_HELP "Avsluta kommandotolken (cmd.exe).\n\nEXIT [/b] [ExitCode]\n\n\ /B Avslutt bara en batchfil.\n\ Om det körs utan en batch filkommer det avslutta cmd.exe\n\ @@ -228,7 +228,7 @@ För att bruke FOR kommando i en batchfil, ange %%variabel istället för\n\ STRING_GOTO_HELP1 "Dirigerar CMD till en namngiven etikett i ett batchprogram.\n\n\ GOTO etikett\n\n\ etikett Anger en text sträng använt i ett batchprogram.\n\n\ -En etikett skapas på en egen rad genom att skriva kolon följt av namn på etiketten." +En etikett skapas på en egen rad genom att skriva kolon följt av namn på etiketten.\n" STRING_IF_HELP1 "Utför villkorsstyrd bearbetning i batchprogram.\n\n\ IF [NOT] ERRORLEVEL nummer kommando\n\ IF [NOT] sträng1==sträng2 kommando\n\ @@ -466,9 +466,9 @@ tittel ny tittel\n" STRING_ALIAS_ERROR "Kommandorad för lång efter alias utvidelse!\n" STRING_ASSOC_ERROR "Fil-association ble inte funnet for utvidelsen %s\n" STRING_BATCH_ERROR "Fel vid öppning av batch-fil\n" - STRING_CHOICE_ERROR "Ogiltigt val. Förväntet format: /C[:]val" - STRING_CHOICE_ERROR_TXT "Ogiltigt val. Förväntet format: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Ulovlig operasjon: %s" + STRING_CHOICE_ERROR "Ogiltigt val. Förväntet format: /C[:]val\n" + STRING_CHOICE_ERROR_TXT "Ogiltigt val. Förväntet format: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Ulovlig operasjon: %s\n" STRING_CMD_ERROR1 "Kan inte videreføre inndata fra fil %s\n" STRING_CMD_ERROR2 "Fel under oppretting av temporær fil for datakanal\n" STRING_CMD_ERROR3 "Kan inte videreføre till fil %s\n" @@ -493,8 +493,8 @@ tittel ny tittel\n" STRING_FOR_ERROR4 "inget kommando etter 'gjøre'." STRING_FREE_ERROR1 "Ogiltig drivrutin" STRING_FREE_ERROR2 "utmärkt" - STRING_GOTO_ERROR1 "Inget märke specifiserat för GOTO" - STRING_GOTO_ERROR2 "märke '%s' finns inte\n" + STRING_GOTO_ERROR1 "Inget märke specifiserat för GOTO\n" + STRING_GOTO_ERROR2 "Märke '%s' finns inte\n" STRING_MD_ERROR "En undermapp eller fil finns redan.\n" STRING_MD_ERROR2 "Stien till den nye mappen exsisterar inte.\n" STRING_MOVE_ERROR1 "[OK]\n" @@ -514,7 +514,7 @@ tittel ny tittel\n" STRING_ERROR_BADCOMMAND "Fel kommando eller filnamn - %s\n" STRING_ERROR_OUT_OF_MEMORY "Fel: Minnet fullt.\n" STRING_ERROR_CANNOTPIPE "Fel! Kan inte bruke datakanal! Kan inte åpne midlertidig fil!\n" - STRING_ERROR_D_PAUSEMSG "Tryck på valfri tangent för att fortsätta . . ." + STRING_ERROR_D_PAUSEMSG "Tryck på valfri tangent för att fortsätta . . . " STRING_ERROR_DRIVER_NOT_READY "enheten är inte klar" STRING_PATH_ERROR "CMD: Inte i miljön '%s'\n" STRING_REPLACE_ERROR1 "Felaktig växel - %s\n" @@ -540,8 +540,8 @@ tittel ny tittel\n" STRING_MKLINK_CREATED_JUNCTION "Junction created for %s <<===>> %s\n" STRING_MORE "More? " STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break tryckt. Avbryt batch-filen? (Ja/Nej/Alla) " - STRING_INVALID_OPERAND "Ogiltig operand." - STRING_EXPECTED_CLOSE_PAREN "Forväntat ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Förväntat nummer eller variabelnamn." - STRING_SYNTAX_COMMAND_INCORRECT "Syntaxen för kommandot är fel." + STRING_INVALID_OPERAND "Ogiltig operand.\n" + STRING_EXPECTED_CLOSE_PAREN "Forväntat ')'.\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Förväntat nummer eller variabelnamn.\n" + STRING_SYNTAX_COMMAND_INCORRECT "Syntaxen för kommandot är fel.\n" END diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc index 8579357bfc1..e113222c039 100644 --- a/base/shell/cmd/lang/tr-TR.rc +++ b/base/shell/cmd/lang/tr-TR.rc @@ -25,7 +25,7 @@ Başka ad dizelgesinden bir başka ad silmek için:\n\ STRING_CALL_HELP "Bir toplu iş izlencesini bir başkasından çağırır.\n\n\ CALL [sürücü:][yol]kütük adı [toplu iş değişkeni]\n\n\ toplu iş değişkeni Toplu iş izlencesinin gerektirdiği bir komut yatacı\n\ - bilgisi belirtir." + bilgisi belirtir.\n" STRING_CD_HELP "Şimdiki dizini değiştirir ya da onun adını görüntüler\n\n\ CHDIR [/D][sürücü:][yol]\n\ CHDIR[..|.]\n\ @@ -199,7 +199,7 @@ PUSHD [yol | ..]\n\n\ ECHO [ileti]\n\ ECHO. boş bir yataç yazdırır\n\n\ Şimdiki ECHO ayârını görüntülemek için bir değişken olmadan ECHO yazınız." - STRING_ECHO_HELP5 "ECHO %s\n" + STRING_ECHO_HELP5 "ECHO %s.\n" STRING_EXIT_HELP "Komut yatacı yorumcusundan çıkar.\n\nEXIT [/b] [çıkış kodu]\n\n\ /B Yalnızca bir toplu iş kütüğünden çıkar.\n\ Bir toplu iş kütüğünün dışında çalışırsa cmd.exe'den çıkacaktır.\n\ @@ -235,7 +235,7 @@ belirtiniz.\n" GOTO etiket\n\n\ etiket Bir metin dizgisini, kullanılan bir toplu iş betiğinde bir etiket\n\ olarak belirtir.\n\n\ -Bir dikeçle başlayan tek başına bir yataç üzerinde bir etiket yazınız." +Bir dikeçle başlayan tek başına bir yataç üzerinde bir etiket yazınız.\n" STRING_IF_HELP1 "Toplu iş izlencelerinde şartlı işlemeyi gerçekleştirir.\n\n\ IF [NOT] ERRORLEVEL sayı komut\n\ IF [NOT] dizgi1==dizgi2 komut\n\ @@ -473,9 +473,9 @@ başlık Yeni başlık\n" STRING_ALIAS_ERROR "Başka ad açılımından sonra komut yatacı çok uzun!\n" STRING_ASSOC_ERROR "%s uzantısı için kütük ilişkilendirmesi bulunamadı.\n" STRING_BATCH_ERROR "Toplu iş kütüğünü açma yanlışlığı\n" - STRING_CHOICE_ERROR "Geçersiz seçenek. Beklenen biçim: /C[:]seçenekler" - STRING_CHOICE_ERROR_TXT "Geçersiz seçenek. Beklenen biçim: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Geçersiz seçenek: %s" + STRING_CHOICE_ERROR "Geçersiz seçenek. Beklenen biçim: /C[:]seçenekler\n" + STRING_CHOICE_ERROR_TXT "Geçersiz seçenek. Beklenen biçim: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Geçersiz seçenek: %s\n" STRING_CMD_ERROR1 "%s kütüğünden girdi yönlendirilemiyor.\n" STRING_CMD_ERROR2 "Boru verisi için geçici kütük oluşturma yanlışlığı\n" STRING_CMD_ERROR3 "%s kütüğüne yönlendirilemiyor.\n" @@ -500,7 +500,7 @@ başlık Yeni başlık\n" STRING_FOR_ERROR4 """do"" deyişinden sonra komut yok." STRING_FREE_ERROR1 "Geçersiz sürücü" STRING_FREE_ERROR2 "etiketlenmemiş" - STRING_GOTO_ERROR1 "GOTO için bir etiket belirlenmemiş." + STRING_GOTO_ERROR1 "GOTO için bir etiket belirlenmemiş.\n" STRING_GOTO_ERROR2 """%s"" etiketi bulunamadı.\n" STRING_MD_ERROR "Bir alt dizin ya da kütük önceden var.\n" STRING_MD_ERROR2 "Yeni dizin için yol yok.\n" @@ -521,7 +521,7 @@ başlık Yeni başlık\n" STRING_ERROR_BADCOMMAND "Geçersiz komut ya da kütük adı - %s\n" STRING_ERROR_OUT_OF_MEMORY "Yetersiz bellek yanlışlığı.\n" STRING_ERROR_CANNOTPIPE "Yanlışlık! Borulanamıyor! Geçici kütük açılamıyor!\n" - STRING_ERROR_D_PAUSEMSG "Sürdürmek için bir düğmeye basınız . . ." + STRING_ERROR_D_PAUSEMSG "Sürdürmek için bir düğmeye basınız . . . " STRING_ERROR_DRIVER_NOT_READY "Sürücü anık değil." STRING_PATH_ERROR "CMD: ""%s"" ortamda yok.\n" STRING_REPLACE_ERROR1 "Geçersiz seçenek - %s\n" @@ -547,8 +547,8 @@ başlık Yeni başlık\n" STRING_MKLINK_CREATED_JUNCTION "%s için bağlantı oluşturuldu <<===>> %s\n" STRING_MORE "Daha? " STRING_CANCEL_BATCH_FILE "\r\nDenetim'e ve Duraklat'a birlikte basıldı. Toplu iş kütüğünü iptal et? (Evet/Hayır/Tümü) " - STRING_INVALID_OPERAND "Geçersiz işlenen." - STRING_EXPECTED_CLOSE_PAREN """)"" bekleniyordu." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Sayı ya da değişken adı bekleniyordu." - STRING_SYNTAX_COMMAND_INCORRECT "Komutun yazımı yanlış." + STRING_INVALID_OPERAND "Geçersiz işlenen.\n" + STRING_EXPECTED_CLOSE_PAREN """)"" bekleniyordu.\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Sayı ya da değişken adı bekleniyordu.\n" + STRING_SYNTAX_COMMAND_INCORRECT "Komutun yazımı yanlış.\n" END diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index cbb13c724d5..8ea0e7f5512 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -31,7 +31,7 @@ ALIAS [псевдонiм=[команда]]\n\n\ STRING_CALL_HELP "Виклик однiєї пакетної програми з iншої.\n\n\ CALL [диск:][шлях]iм'я_файла [параметри]\n\n\ параметри Набiр параметрiв командного рядка, необхiдних для пакетного\n\ - файлу." + файлу.\n" STRING_CD_HELP "Виведення iменi або змiна поточного каталогу\n\n\ CHDIR [/D][диск:][шлях]\n\ CHDIR[..|.]\n\ @@ -204,7 +204,7 @@ PUSHD [path | ..]\n\n\ ECHO [повiдомлення]\n\ ECHO. друкує порожнiй рядок\n\n\ ECHO без параметра виводить поточний режим вiдображення команд." - STRING_ECHO_HELP5 "ECHO is %s\n" + STRING_ECHO_HELP5 "ECHO is %s.\n" STRING_EXIT_HELP "Завершує iнтерпретатор команд.\n\nEXIT [/b] [ExitCode]\n\n\ /B Виходить лише з пакетного файлу.\n\ Якщо робота йде поза пакетним файлом - вихiд з cmd.exe\n\ @@ -239,7 +239,7 @@ f,d,p,n,x,s,a,t,z.\n\n\ STRING_GOTO_HELP1 "Передача управління рядку пакетного файлу, що мiстить мiтку.\n\n\ GOTO мiтка\n\n\ label рядок пакетного файлу, визначений як мiтка.\n\n\ -Мітка повинна знаходитися в окремому рядку i починатися з двокрапки." +Мітка повинна знаходитися в окремому рядку i починатися з двокрапки.\n" STRING_IF_HELP1 "Оператор умовного виконання команд у пакетному файлi.\n\n\ IF [NOT] ERRORLEVEL число команда\n\ IF [NOT] рядок1==рядок2 команда\n\ @@ -478,9 +478,9 @@ title новий заголовок\n" STRING_ALIAS_ERROR "Командний рядок занадто довгий пiсля розгортання псевдонiмiв!\n" STRING_ASSOC_ERROR "Не знайдено файлової асоцiацiї для розширення %s\n" STRING_BATCH_ERROR "Помилка вiдкриття пакетного файлу\n" - STRING_CHOICE_ERROR "Невiрний параметр. Очiкується формат: /C[:]параметри" - STRING_CHOICE_ERROR_TXT "Невiрний параметр. Очiкується формат: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "Невiрний параметр: %s" + STRING_CHOICE_ERROR "Невiрний параметр. Очiкується формат: /C[:]параметри\n" + STRING_CHOICE_ERROR_TXT "Невiрний параметр. Очiкується формат: /T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "Невiрний параметр: %s\n" STRING_CMD_ERROR1 "Не можу перенаправити ввiд з файлу %s\n" STRING_CMD_ERROR2 "Помилка створення тимчасового файлу для pipe-даних\n" STRING_CMD_ERROR3 "Не можу перенаправити в файл %s\n" @@ -505,7 +505,7 @@ title новий заголовок\n" STRING_FOR_ERROR4 "немає команди пiсля 'do'." STRING_FREE_ERROR1 "Невiрний диск" STRING_FREE_ERROR2 "не вiдмiчено" - STRING_GOTO_ERROR1 "Не визначена мiтка для GOTO" + STRING_GOTO_ERROR1 "Не визначена мiтка для GOTO\n" STRING_GOTO_ERROR2 "Мiтка '%s' не знайдена\n" STRING_MD_ERROR "Пiдкаталог чи файл вже iснує.\n" STRING_MD_ERROR2 "Шлях до нового каталогу не iснує.\n" @@ -526,7 +526,7 @@ title новий заголовок\n" STRING_ERROR_BADCOMMAND "Невiрна команда або iм'я файлу - %s\n" STRING_ERROR_OUT_OF_MEMORY "Недостатньо пам'ятi.\n" STRING_ERROR_CANNOTPIPE "Помилка! Неможливо використати pipe! Неможливо вiдкрити тимчасовий файл!\n" - STRING_ERROR_D_PAUSEMSG "Натиснiть будь-яку клавiшу для продовження . . ." + STRING_ERROR_D_PAUSEMSG "Натиснiть будь-яку клавiшу для продовження . . . " STRING_ERROR_DRIVER_NOT_READY "Пристрій не готовий" STRING_PATH_ERROR "CMD: Не в середовищi '%s'\n" STRING_REPLACE_ERROR1 "Невiрний ключ - %s\n" @@ -552,8 +552,8 @@ title новий заголовок\n" STRING_MKLINK_CREATED_JUNCTION "Створено з'єднання для %s <<===>> %s\n" STRING_MORE "Бiльше? " STRING_CANCEL_BATCH_FILE "\r\nнатиснено Ctrl-Break. Припинити виконання пакетного файлу? (Yes/No/All) " - STRING_INVALID_OPERAND "Невiрний операнд." - STRING_EXPECTED_CLOSE_PAREN "Очiкується ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Очiкується число або iм'я змiнної." - STRING_SYNTAX_COMMAND_INCORRECT "Некоректний синтаксис команди." + STRING_INVALID_OPERAND "Невiрний операнд.\n" + STRING_EXPECTED_CLOSE_PAREN "Очiкується ')'.\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "Очiкується число або iм'я змiнної.\n" + STRING_SYNTAX_COMMAND_INCORRECT "Некоректний синтаксис команди.\n" END diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc index ed4c7a28df8..b8421123d95 100644 --- a/base/shell/cmd/lang/zh-CN.rc +++ b/base/shell/cmd/lang/zh-CN.rc @@ -24,7 +24,7 @@ ALIAS [别名=[命令]]\n\n\ STRING_BEEP_HELP "使扬声器发出BEEP声。\n\nBEEP\n" STRING_CALL_HELP "从一个批处理程序调用另一个。\n\n\ CALL [驱动器:][路径]文件名 [批处理参数]\n\n\ - 批处理参数指定被调用的批处理程序所需的命令行信息。" + 批处理参数指定被调用的批处理程序所需的命令行信息。\n" STRING_CD_HELP "改变当前目录或者显示当前目录名。\n\n\ CHDIR [/D][驱动器:][路径]\n\ CHDIR[..|.]\n\ @@ -184,7 +184,7 @@ PUSHD [路径 | ..]\n\n\ ECHO [消息]\n\ ECHO. 输出空行\n\n\ 执行不带参数的 ECHO 将会显示当前的 ECHO 设置。" - STRING_ECHO_HELP5 "ECHO 为 %s\n" + STRING_ECHO_HELP5 "ECHO 为 %s。\n" STRING_EXIT_HELP "退出命令行解释器。\n\nEXIT [/b] [ExitCode]\n\n\ /B 仅退出一个批处理文件。\n\ 如果在一个批处理文件之外运行，将会使 cmd.exe 退出。\n\ @@ -218,7 +218,7 @@ f,d,p,n,x,s,a,t,z.\n\n\ STRING_GOTO_HELP1 "在批处理脚本中将 CMD 定向到被标记的行执行。\n\n\ GOTO 标签\n\n\ 标签在批处理脚本中被用作标签的文本字符串。\n\n\ -使用冒号开头的一行就作为一个标签。" +使用冒号开头的一行就作为一个标签。\n" STRING_IF_HELP1 "在批处理文件中执行条件控制处理。\n\n\ IF [NOT] ERRORLEVEL 数字命令\n\ IF [NOT] 字符串1==字符串2 命令\n\ @@ -438,9 +438,9 @@ RESTORE 恢复窗口\n\ STRING_ALIAS_ERROR "别名展开后的命令行太长！\n" STRING_ASSOC_ERROR "扩展名 %s 的文件关联未找到！\n" STRING_BATCH_ERROR "打开批处理文件时出错\n" - STRING_CHOICE_ERROR "无效选项。期望的格式：/C[:]选项" - STRING_CHOICE_ERROR_TXT "无效选项。期望的格式：/T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "非法选项：%s" + STRING_CHOICE_ERROR "无效选项。期望的格式：/C[:]选项\n" + STRING_CHOICE_ERROR_TXT "无效选项。期望的格式：/T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "非法选项：%s\n" STRING_CMD_ERROR1 "无法从文件 %s 重定向输入\n" STRING_CMD_ERROR2 "为管道数据创建临时文件时出错\n" STRING_CMD_ERROR3 "无法重定向到文件 %s\n" @@ -465,7 +465,7 @@ RESTORE 恢复窗口\n\ STRING_FOR_ERROR4 "'do' 后没有命令。" STRING_FREE_ERROR1 "无效驱动器" STRING_FREE_ERROR2 "未标记" - STRING_GOTO_ERROR1 "没有为 GOTO 指定标签" + STRING_GOTO_ERROR1 "没有为 GOTO 指定标签\n" STRING_GOTO_ERROR2 "标签 '%s' 未找到\n" STRING_MD_ERROR "一个子目录或文件已存在。\n" STRING_MD_ERROR2 "到新文件夹的路径不存在。\n" @@ -486,7 +486,7 @@ RESTORE 恢复窗口\n\ STRING_ERROR_BADCOMMAND "非法的命令或文件名 - %s\n" STRING_ERROR_OUT_OF_MEMORY "内存不足。\n" STRING_ERROR_CANNOTPIPE "错误！无法创建管道！不能打开临时文件！\n" - STRING_ERROR_D_PAUSEMSG "按任意键继续..." + STRING_ERROR_D_PAUSEMSG "按任意键继续... " STRING_ERROR_DRIVER_NOT_READY "驱动器未就绪" STRING_PATH_ERROR "CMD: 不在环境 '%s' 中\n" STRING_REPLACE_ERROR1 "无效开关 - %s\n" @@ -512,8 +512,8 @@ RESTORE 恢复窗口\n\ STRING_MKLINK_CREATED_JUNCTION "已为 %s <<===>> %s 创建接合点\n" STRING_MORE "更多？" STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break 已被按下。停止批处理文件吗？ (Yes/No/All) " - STRING_INVALID_OPERAND "无效操作数。" - STRING_EXPECTED_CLOSE_PAREN "期望 ')'。" - STRING_EXPECTED_NUMBER_OR_VARIABLE "期望数值或变量名。" - STRING_SYNTAX_COMMAND_INCORRECT "命令语法不正确。" + STRING_INVALID_OPERAND "无效操作数。\n" + STRING_EXPECTED_CLOSE_PAREN "期望 ')'。\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "期望数值或变量名。\n" + STRING_SYNTAX_COMMAND_INCORRECT "命令语法不正确。\n" END diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc index 4938adc4bdd..18248aec402 100644 --- a/base/shell/cmd/lang/zh-TW.rc +++ b/base/shell/cmd/lang/zh-TW.rc @@ -25,7 +25,7 @@ ALIAS [別名=[命令]]\n\n\ STRING_BEEP_HELP "使揚聲器發出BEEP聲。\n\nBEEP\n" STRING_CALL_HELP "從一個批處理程式呼叫另一個。\n\n\ CALL [驅動器:][路徑]檔名 [批處理參數]\n\n\ - 批處理參數指定被呼叫的批處理程式所需的命令列資訊。" + 批處理參數指定被呼叫的批處理程式所需的命令列資訊。\n" STRING_CD_HELP "改變當前目錄或者顯示當前目錄名。\n\n\ CHDIR [/D][驅動器:][路徑]\n\ CHDIR[..|.]\n\ @@ -185,7 +185,7 @@ PUSHD [路徑 | ..]\n\n\ ECHO [訊息]\n\ ECHO. 輸出空行\n\n\ 執行不帶參數的 ECHO 將會顯示當前的 ECHO 設定。" - STRING_ECHO_HELP5 "ECHO 為 %s\n" + STRING_ECHO_HELP5 "ECHO 為 %s。\n" STRING_EXIT_HELP "退出命令列直譯器。\n\nEXIT [/b] [ExitCode]\n\n\ /B 僅退出一個批處理檔案。\n\ 如果在一個批處理檔案之外運行，將會使 cmd.exe 退出。\n\ @@ -219,7 +219,7 @@ f,d,p,n,x,s,a,t,z.\n\n\ STRING_GOTO_HELP1 "在批處理指令碼中將 CMD 定向到被標記的行執行。\n\n\ GOTO 標籤\n\n\ 標籤在批處理指令碼中被用作標籤的文字字元串。\n\n\ -使用冒號開頭的一行就作為一個標籤。" +使用冒號開頭的一行就作為一個標籤。\n" STRING_IF_HELP1 "在批處理檔案中執行條件控制處理。\n\n\ IF [NOT] ERRORLEVEL 數字命令\n\ IF [NOT] 字元串1==字元串2 命令\n\ @@ -439,9 +439,9 @@ RESTORE 恢復視窗\n\ STRING_ALIAS_ERROR "別名展開後的命令列太長！\n" STRING_ASSOC_ERROR "副檔名 %s 的檔案關聯未找到！\n" STRING_BATCH_ERROR "開啟批處理檔案時出錯\n" - STRING_CHOICE_ERROR "無效選項。期望的格式：/C[:]選項" - STRING_CHOICE_ERROR_TXT "無效選項。期望的格式：/T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "非法選項：%s" + STRING_CHOICE_ERROR "無效選項。期望的格式：/C[:]選項\n" + STRING_CHOICE_ERROR_TXT "無效選項。期望的格式：/T[:]c,nn\n" + STRING_CHOICE_ERROR_OPTION "非法選項：%s\n" STRING_CMD_ERROR1 "無法從檔案 %s 重定向輸入\n" STRING_CMD_ERROR2 "為管道資料創建臨時檔案時出錯\n" STRING_CMD_ERROR3 "無法重定向到檔案 %s\n" @@ -466,7 +466,7 @@ RESTORE 恢復視窗\n\ STRING_FOR_ERROR4 "'do' 後沒有命令。" STRING_FREE_ERROR1 "無效驅動器" STRING_FREE_ERROR2 "未標記" - STRING_GOTO_ERROR1 "沒有為 GOTO 指定標籤" + STRING_GOTO_ERROR1 "沒有為 GOTO 指定標籤\n" STRING_GOTO_ERROR2 "標籤 '%s' 未找到\n" STRING_MD_ERROR "一個子目錄或檔案已存在。\n" STRING_MD_ERROR2 "到新資料夾的路徑不存在。\n" @@ -487,7 +487,7 @@ RESTORE 恢復視窗\n\ STRING_ERROR_BADCOMMAND "非法的命令或檔名 - %s\n" STRING_ERROR_OUT_OF_MEMORY "內存不足。\n" STRING_ERROR_CANNOTPIPE "錯誤！無法創建管道！不能開啟臨時檔案！\n" - STRING_ERROR_D_PAUSEMSG "按任意鍵繼續..." + STRING_ERROR_D_PAUSEMSG "按任意鍵繼續... " STRING_ERROR_DRIVER_NOT_READY "驅動器未就緒" STRING_PATH_ERROR "CMD: 不在環境 '%s' 中\n" STRING_REPLACE_ERROR1 "無效開關 - %s\n" @@ -513,8 +513,8 @@ RESTORE 恢復視窗\n\ STRING_MKLINK_CREATED_JUNCTION "已為 %s <<===>> %s 創建接合點\n" STRING_MORE "更多？" STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break 已被按下。停止批處理檔案嗎？ (Yes/No/All) " - STRING_INVALID_OPERAND "無效操作數。" - STRING_EXPECTED_CLOSE_PAREN "期望 ')'。" - STRING_EXPECTED_NUMBER_OR_VARIABLE "期望數值或變數名。" - STRING_SYNTAX_COMMAND_INCORRECT "命令語法不正確。" + STRING_INVALID_OPERAND "無效操作數。\n" + STRING_EXPECTED_CLOSE_PAREN "期望 ')'。\n" + STRING_EXPECTED_NUMBER_OR_VARIABLE "期望數值或變數名。\n" + STRING_SYNTAX_COMMAND_INCORRECT "命令語法不正確。\n" END \ No newline at end of file

4 years, 4 months

[reactos] 05/48: [CMD_ROSTEST] Minor improvements for the echo-ed info of the builtins tests.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23a52b2285086e73c7544… commit 23a52b2285086e73c754433e8d159018f5f12ade Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jul 29 18:04:05 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:35:53 2020 +0200 [CMD_ROSTEST] Minor improvements for the echo-ed info of the builtins tests. --- modules/rostests/win32/cmd/test_builtins.cmd | 54 +++++++++++++----------- modules/rostests/win32/cmd/test_builtins.cmd.exp | 33 +++++---------- 2 files changed, 41 insertions(+), 46 deletions(-) diff --git a/modules/rostests/win32/cmd/test_builtins.cmd b/modules/rostests/win32/cmd/test_builtins.cmd index a61be8df9c2..dd4e1af9eab 100644 --- a/modules/rostests/win32/cmd/test_builtins.cmd +++ b/modules/rostests/win32/cmd/test_builtins.cmd @@ -1,42 +1,48 @@ @echo off -echo ------------ Testing for1 ------------ -echo --- plain FOR with multiple lines + +echo ------------ Testing FOR loop ------------ +echo --- Multiple lines for %%i in (A B C) do echo %%i -echo ------------ Testing for2 ------------ -echo --- plain FOR with lines and spaces + +echo --- Lines and spaces for %%i in (D E F) do echo %%i -echo ------------ Testing for3 ------------ -echo --- plain FOR with multiple lines and commas + +echo --- Multiple lines and commas for %%i in (G, H, I ) do echo %%i -echo ------------ Testing for4 ------------ -echo --- plain FOR with multiple lines and %%I + +echo --- Multiple lines and %%I +:: The FOR-variable is case-sensitive for %%i in (J K L) do echo %%I -echo ------------ Testing for5 ------------ -echo --- plain FOR with multiple lines and %%j + +echo --- Multiple lines and %%j for %%i in (M, N, O ) do echo %%j -echo ------------ Testing Amp-Amp --------- -echo --- test for something that is TRUE -ver | find "Ver" > NUL && Echo TRUE Amp-Amp -echo ------------ Testing Amp-Amp --------- -echo --- test for something that is FALSE -ver | find "1234" > NUL && Echo FALSE Amp-Amp -echo ------------ Testing Pipe-Pipe ------- -echo --- test for something that is TRUE -ver | find "Ver" > NUL || Echo TRUE Pipe-Pipe -echo ------------ Testing Pipe-Pipe ------- -echo --- test for something that is FALSE -ver | find "1234" > NUL || Echo FALSE Pipe-Pipe -echo ------------ End of Testing ------------ -echo --- Testing ends here + + +echo ---------- Testing AND operator ---------- +:: Test for TRUE condition - Should be displayed +ver | find "Ver" > NUL && echo TRUE AND condition + +:: Test for FALSE condition - Should not display +ver | find "1234" > NUL && echo FALSE AND condition + +echo ---------- Testing OR operator ----------- +:: Test for TRUE condition - Should not display +ver | find "Ver" > NUL || echo TRUE OR condition + +:: Test for FALSE condition - Should be displayed +ver | find "1234" > NUL || echo FALSE OR condition + + +echo ------------- End of Testing ------------- diff --git a/modules/rostests/win32/cmd/test_builtins.cmd.exp b/modules/rostests/win32/cmd/test_builtins.cmd.exp index e149fab3deb..43f4a6b5b30 100644 --- a/modules/rostests/win32/cmd/test_builtins.cmd.exp +++ b/modules/rostests/win32/cmd/test_builtins.cmd.exp @@ -1,37 +1,26 @@ ------------- Testing for1 ------------ ---- plain FOR with multiple lines +------------ Testing FOR loop ------------ +--- Multiple lines A B C ------------- Testing for2 ------------ ---- plain FOR with lines and spaces +--- Lines and spaces D E F ------------- Testing for3 ------------ ---- plain FOR with multiple lines and commas +--- Multiple lines and commas G H I ------------- Testing for4 ------------ ---- plain FOR with multiple lines and %I +--- Multiple lines and %I %I %I %I ------------- Testing for5 ------------ ---- plain FOR with multiple lines and %j +--- Multiple lines and %j %j %j %j ------------- Testing Amp-Amp --------- ---- test for something that is TRUE -TRUE Amp-Amp ------------- Testing Amp-Amp --------- ---- test for something that is FALSE ------------- Testing Pipe-Pipe ------- ---- test for something that is TRUE ------------- Testing Pipe-Pipe ------- ---- test for something that is FALSE -FALSE Pipe-Pipe ------------- End of Testing ------------ ---- Testing ends here +---------- Testing AND operator ---------- +TRUE AND condition +---------- Testing OR operator ----------- +FALSE OR condition +------------- End of Testing -------------

4 years, 4 months

[reactos] 04/48: [CMD_ROSTEST] Sync batch.c with cmd_winetest' counterpart.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d85d99167939036d3ef07… commit d85d99167939036d3ef0797a2819743ff3e00bfa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed May 27 16:43:55 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:35:53 2020 +0200 [CMD_ROSTEST] Sync batch.c with cmd_winetest' counterpart. --- modules/rostests/win32/cmd/batch.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/modules/rostests/win32/cmd/batch.c b/modules/rostests/win32/cmd/batch.c index e6a77d95d77..10c30a1bbde 100644 --- a/modules/rostests/win32/cmd/batch.c +++ b/modules/rostests/win32/cmd/batch.c @@ -26,7 +26,7 @@ static char workdir[MAX_PATH]; static DWORD workdir_len; static char drive[2]; -static const DWORD drive_len = sizeof(drive)/sizeof(drive[0]); +static const DWORD drive_len = ARRAY_SIZE(drive); static char path[MAX_PATH]; static DWORD path_len; static char shortpath[MAX_PATH]; @@ -71,7 +71,11 @@ static const char* convert_input_data(const char *data, DWORD size, DWORD *new_s } *ptr = '\0'; +#ifdef __REACTOS__ *new_size = lstrlenA(new_data); +#else + *new_size = strlen(new_data); +#endif return new_data; } @@ -166,6 +170,7 @@ static const char *compare_line(const char *out_line, const char *out_end, const static const char path_cmd[] = {'@','p','a','t','h','@'}; static const char shortpath_cmd[] = {'@','s','h','o','r','t','p','a','t','h','@'}; static const char space_cmd[] = {'@','s','p','a','c','e','@'}; + static const char spaces_cmd[] = {'@','s','p','a','c','e','s','@'}; static const char tab_cmd[] = {'@','t','a','b','@'}; static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; @@ -224,6 +229,15 @@ static const char *compare_line(const char *out_line, const char *out_end, const } else { err = out_end; } + }else if(exp_ptr+sizeof(spaces_cmd) <= exp_end + && !memcmp(exp_ptr, spaces_cmd, sizeof(spaces_cmd))) { + exp_ptr += sizeof(spaces_cmd); + if(out_ptr < out_end && *out_ptr == ' ') { + while (out_ptr < out_end && *out_ptr == ' ') out_ptr++; + continue; + } else { + err = out_end; + } }else if(exp_ptr+sizeof(tab_cmd) <= exp_end && !memcmp(exp_ptr, tab_cmd, sizeof(tab_cmd))) { exp_ptr += sizeof(tab_cmd); @@ -251,10 +265,8 @@ static const char *compare_line(const char *out_line, const char *out_end, const while(exp_ptr+sizeof(or_broken_cmd) <= exp_end && memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) exp_ptr++; - if(!exp_ptr) - return err; - exp_ptr += sizeof(or_broken_cmd); + if (exp_ptr > exp_end) return err; out_ptr = out_line; err = NULL; continue; @@ -470,8 +482,7 @@ START_TEST(reactos) } else { path_len = 1; /* \ */ } - shortpath_len = GetShortPathNameA(path, shortpath, - sizeof(shortpath)/sizeof(shortpath[0])); + shortpath_len = GetShortPathNameA(path, shortpath, ARRAY_SIZE(shortpath)); argc = winetest_get_mainargs(&argv); if(argc > 2)

4 years, 4 months

[reactos] 03/48: [CMD_WINETEST] Sync with Wine 5.12.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7115d7ba8e907a0fec4bc… commit 7115d7ba8e907a0fec4bc881952ae610b219be2b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jul 23 22:36:25 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:35:53 2020 +0200 [CMD_WINETEST] Sync with Wine 5.12. --- modules/rostests/winetests/cmd/test_builtins.cmd | 37 +++++++++++++++++++++- .../rostests/winetests/cmd/test_builtins.cmd.exp | 20 ++++++++++++ modules/rostests/winetests/cmd/test_cmdline.cmd | 19 +++++++---- .../rostests/winetests/cmd/test_cmdline.cmd.exp | 12 +++++-- 4 files changed, 79 insertions(+), 9 deletions(-) diff --git a/modules/rostests/winetests/cmd/test_builtins.cmd b/modules/rostests/winetests/cmd/test_builtins.cmd index f4dfc9f26d8..73b0917c275 100644 --- a/modules/rostests/winetests/cmd/test_builtins.cmd +++ b/modules/rostests/winetests/cmd/test_builtins.cmd @@ -875,7 +875,15 @@ type ."\foobaz" echo ---2 type ".\foobaz" echo ---3 -del foobaz +echo foo> foobay +echo ---4 +type foobaz foobay > foobax 2> foobaw +echo ---5 +type foobax +echo ---6 +type foobaw +echo ---7 +del foobaz foobay foobax foobaw echo ------------ Testing NUL ------------ md foobar & cd foobar @@ -985,6 +993,33 @@ if "x" == "a" ( if "y" == "b" echo broken2 echo expected post-embedded if ) +if ()==() ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if 1(==1( ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if )==) ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if /i not (a)==(b) ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if defined windir echo windir is defined +if not defined windir echo windir is defined +if not exist %windir% ( + echo windir does not exist +) else ( + echo windir does exist +) echo --- case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity diff --git a/modules/rostests/winetests/cmd/test_builtins.cmd.exp b/modules/rostests/winetests/cmd/test_builtins.cmd.exp index d78d91a6cff..fb84de2f5d5 100644 --- a/modules/rostests/winetests/cmd/test_builtins.cmd.exp +++ b/modules/rostests/winetests/cmd/test_builtins.cmd.exp @@ -659,6 +659,20 @@ bar ---2 bar ---3 +---4 +---5 +bar +foo +---6 + +foobaz + + + +foobay + + +---7 ------------ Testing NUL ------------ bar bar @@ -681,6 +695,12 @@ else if seems to work else if seems to work expected1 expected post-embedded if +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work +windir is defined +windir does exist --- case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work diff --git a/modules/rostests/winetests/cmd/test_cmdline.cmd b/modules/rostests/winetests/cmd/test_cmdline.cmd index 32a1ef2e48f..7a7f8d7b632 100644 --- a/modules/rostests/winetests/cmd/test_cmdline.cmd +++ b/modules/rostests/winetests/cmd/test_cmdline.cmd @@ -183,12 +183,19 @@ echo ------- Testing CMD /C qualifier treatment ------------ rem no need for space after /c cmd /csay one cmd /c"say one" -rem ignore quote before qualifier -rem FIXME the next command in wine starts a sub-CMD -echo THIS FAILS: cmd "/c"say one -rem ignore anything before /c -rem FIXME the next command in wine starts a sub-CMD -echo THIS FAILS: cmd ignoreme/c say one +cmd /c"say one +cmd /c=say one +cmd /c,say one +cmd /c;say one +rem non-options are ignored before /c; quotes are not treated specially +cmd "/c"say one +cmd ignoreme/c say one +cmd abc "def ghi/c say one" +cmd -\@$*'"/c say one +echo echo bar > foo.bat +cmd /qq/c foo +cmd /q "xyz /c foo" +del foo.bat echo --------- Testing special characters -------------- echo @echo amp > "say&.bat" diff --git a/modules/rostests/winetests/cmd/test_cmdline.cmd.exp b/modules/rostests/winetests/cmd/test_cmdline.cmd.exp index 980f67411cb..7978a249c97 100644 --- a/modules/rostests/winetests/cmd/test_cmdline.cmd.exp +++ b/modules/rostests/winetests/cmd/test_cmdline.cmd.exp @@ -90,8 +90,16 @@ Passed ------- Testing CMD /C qualifier treatment ------------ 0@space@ 1@space@ -THIS FAILS: cmd "/c"say one -THIS FAILS: cmd ignoreme/c say one +0@space@ +0@space@ +0@space@ +0@space@ +0@space@ +0@space@ +0@space@ +0@space@ +bar@space@ +bar@space@ --------- Testing special characters -------------- 0@space@ 0@space@

4 years, 4 months

[reactos] 02/48: [CMD] todo.txt: Remove some points that have already been implemented since ages.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea801338f6517d5180202… commit ea801338f6517d5180202ecc9ae6ddbc69c91607 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 26 21:51:48 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:35:52 2020 +0200 [CMD] todo.txt: Remove some points that have already been implemented since ages. --- base/shell/cmd/todo.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/base/shell/cmd/todo.txt b/base/shell/cmd/todo.txt index f73d70591b5..5c8330a8eda 100644 --- a/base/shell/cmd/todo.txt +++ b/base/shell/cmd/todo.txt @@ -9,16 +9,5 @@ Not sure what is wrong with it, but probably more than just one thing blocking t *Move.c code clean up It works, but it needs to be cleaned up, the code is long and overly complex for what it needs to do. Also, we can remove the hack to cover for MoveFileEx bug as it isn't a bug anymore. -*If rewrite -It works decent but looks _awful_. Very hard to maintain and/or understand what the hell is going on. - *Remove Hardcoded buffers This is mostly done thanks to Greatlord (cmd.c is the hardest spot that is left). Anytime when you are handling a string that is taken from the commandline there should be no limit to the size. - -*Implement & and && -& runs two commands no matter what. -&& runs the 2nd command only if the first was a success -Not sure where to put this code even - -*Reg Testing -We need more batch files like the one Royce made for "set /a". What out for if bugs when doing this... could lead to in the wrong direction when looking for a regression.

4 years, 4 months

[reactos] 01/48: [CMD] Remove deprecated definition in CMakeLists.txt.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86c5e7e41fb1d9395641e… commit 86c5e7e41fb1d9395641e24da1df6fd7a340896f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jul 31 23:59:42 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:35:52 2020 +0200 [CMD] Remove deprecated definition in CMakeLists.txt. --- base/shell/cmd/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/base/shell/cmd/CMakeLists.txt b/base/shell/cmd/CMakeLists.txt index 7bf64b58acd..471ecd0dfe1 100644 --- a/base/shell/cmd/CMakeLists.txt +++ b/base/shell/cmd/CMakeLists.txt @@ -1,7 +1,5 @@ -add_definitions( - -DANONYMOUSUNIONS - -D_DEBUG_MEM) +add_definitions(-D_DEBUG_MEM) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)

4 years, 4 months

← Newer
1
...
8
9
10
11
12
13
14
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2020