AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-06-28 03:45:08 +03:00
Code Releases Activity

spelling: ambiguous

Browse Source
This commit is contained in:
Josh Soref 2018-02-28 02:27:24 +00:00
parent f856736ce8
commit 5d2cac7da1
9 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BuildUtil/CoreUtil/Console.cs
View File

@ -1129,12 +1129,12 @@ namespace CoreUtil
}
else if (candidate.Count >= 2)
{
this.write(Str.FormatC(Resources.CON_AMBIGIOUS_CMD, cmd_name));
this.write(Resources.CON_AMBIGIOUS_CMD_1);
this.write(Str.FormatC(Resources.CON_AMBIGUOUS_CMD, cmd_name));
this.write(Resources.CON_AMBIGUOUS_CMD_1);
string[] candidateArray = candidate.ToArray();
PrintCandidateHelp(null, candidateArray, 1, cmdList);
this.write(Resources.CON_AMBIGIOUS_CMD_2);
this.write(Resources.CON_AMBIGUOUS_CMD_2);
this.retCode = ConsoleErrorCode.ERR_BAD_COMMAND_OR_PARAM;
}
@ -1552,14 +1552,14 @@ namespace CoreUtil
{
if (candidate.Length >= 2)
{
this.write(Str.FormatC(Resources.CON_AMBIGIOUS_PARAM,
this.write(Str.FormatC(Resources.CON_AMBIGUOUS_PARAM,
param_list[i]));
this.write(Str.FormatC(Resources.CON_AMBIGIOUS_PARAM_1,
this.write(Str.FormatC(Resources.CON_AMBIGUOUS_PARAM_1,
cmdName));
PrintCandidateHelp(cmdName, candidate, 1, this.currentCmdList);
this.write(Resources.CON_AMBIGIOUS_PARAM_2);
this.write(Resources.CON_AMBIGUOUS_PARAM_2);
ok = false;
}

24
src/BuildUtil/Properties/Resources.Designer.cs generated
View File

@ -949,54 +949,54 @@ namespace BuildUtil.Properties {
/// <summary>
/// &quot;%S&quot;: The command-name is ambiguous. に類似しているローカライズされた文字列を検索します。
/// </summary>
internal static string CON_AMBIGIOUS_CMD {
internal static string CON_AMBIGUOUS_CMD {
get {
return ResourceManager.GetString("CON_AMBIGIOUS_CMD", resourceCulture);
return ResourceManager.GetString("CON_AMBIGUOUS_CMD", resourceCulture);
}
}
/// <summary>
/// The specified command name matches the following multiple commands. に類似しているローカライズされた文字列を検索します。
/// </summary>
internal static string CON_AMBIGIOUS_CMD_1 {
internal static string CON_AMBIGUOUS_CMD_1 {
get {
return ResourceManager.GetString("CON_AMBIGIOUS_CMD_1", resourceCulture);
return ResourceManager.GetString("CON_AMBIGUOUS_CMD_1", resourceCulture);
}
}
/// <summary>
/// Please re-specify the command name more strictly. に類似しているローカライズされた文字列を検索します。
/// </summary>
internal static string CON_AMBIGIOUS_CMD_2 {
internal static string CON_AMBIGUOUS_CMD_2 {
get {
return ResourceManager.GetString("CON_AMBIGIOUS_CMD_2", resourceCulture);
return ResourceManager.GetString("CON_AMBIGUOUS_CMD_2", resourceCulture);
}
}
/// <summary>
/// &quot;%S&quot;: The parameter name is ambiguous. に類似しているローカライズされた文字列を検索します。
/// </summary>
internal static string CON_AMBIGIOUS_PARAM {
internal static string CON_AMBIGUOUS_PARAM {
get {
return ResourceManager.GetString("CON_AMBIGIOUS_PARAM", resourceCulture);
return ResourceManager.GetString("CON_AMBIGUOUS_PARAM", resourceCulture);
}
}
/// <summary>
/// The specified parameter name matches with the following parameters that can be specified as a parameter of command &quot;%S&quot;. に類似しているローカライズされた文字列を検索します。
/// </summary>
internal static string CON_AMBIGIOUS_PARAM_1 {
internal static string CON_AMBIGUOUS_PARAM_1 {
get {
return ResourceManager.GetString("CON_AMBIGIOUS_PARAM_1", resourceCulture);
return ResourceManager.GetString("CON_AMBIGUOUS_PARAM_1", resourceCulture);
}
}
/// <summary>
/// Please re-specify the parameter name more strictly. に類似しているローカライズされた文字列を検索します。
/// </summary>
internal static string CON_AMBIGIOUS_PARAM_2 {
internal static string CON_AMBIGUOUS_PARAM_2 {
get {
return ResourceManager.GetString("CON_AMBIGIOUS_PARAM_2", resourceCulture);
return ResourceManager.GetString("CON_AMBIGUOUS_PARAM_2", resourceCulture);
}
}

12
src/BuildUtil/Properties/Resources.resx
View File

@ -386,22 +386,22 @@ IP アドレスは 192.168.0.1 のように 10 進数をドットで区切って
<data name="CMD_UNKNOWN_PARAM" xml:space="preserve">
<value>There is no description for this parameter.</value>
</data>
<data name="CON_AMBIGIOUS_CMD" xml:space="preserve">
<data name="CON_AMBIGUOUS_CMD" xml:space="preserve">
<value>"%S": The command-name is ambiguous.</value>
</data>
<data name="CON_AMBIGIOUS_CMD_1" xml:space="preserve">
<data name="CON_AMBIGUOUS_CMD_1" xml:space="preserve">
<value>The specified command name matches the following multiple commands.</value>
</data>
<data name="CON_AMBIGIOUS_CMD_2" xml:space="preserve">
<data name="CON_AMBIGUOUS_CMD_2" xml:space="preserve">
<value>Please re-specify the command name more strictly.</value>
</data>
<data name="CON_AMBIGIOUS_PARAM" xml:space="preserve">
<data name="CON_AMBIGUOUS_PARAM" xml:space="preserve">
<value>"%S": The parameter name is ambiguous.</value>
</data>
<data name="CON_AMBIGIOUS_PARAM_1" xml:space="preserve">
<data name="CON_AMBIGUOUS_PARAM_1" xml:space="preserve">
<value>The specified parameter name matches with the following parameters that can be specified as a parameter of command "%S".</value>
</data>
<data name="CON_AMBIGIOUS_PARAM_2" xml:space="preserve">
<data name="CON_AMBIGUOUS_PARAM_2" xml:space="preserve">
<value>Please re-specify the parameter name more strictly.</value>
</data>
<data name="CON_INFILE_ERROR" xml:space="preserve">

12
src/Cedar/Console.c
View File

@ -933,11 +933,11 @@ RETRY:
wchar_t tmp[MAX_SIZE];
// There is more than one candidate
UniFormat(tmp, sizeof(tmp), _UU("CON_AMBIGIOUS_CMD"), cmd_name);
UniFormat(tmp, sizeof(tmp), _UU("CON_AMBIGUOUS_CMD"), cmd_name);
c->Write(c, tmp);
c->Write(c, _UU("CON_AMBIGIOUS_CMD_1"));
c->Write(c, _UU("CON_AMBIGUOUS_CMD_1"));
PrintCandidateHelp(c, NULL, candidate, 1);
c->Write(c, _UU("CON_AMBIGIOUS_CMD_2"));
c->Write(c, _UU("CON_AMBIGUOUS_CMD_2"));
c->RetCode = ERR_BAD_COMMAND_OR_PARAM;
}
@ -1338,14 +1338,14 @@ LIST *ParseCommandList(CONSOLE *c, char *cmd_name, wchar_t *command, PARAM param
wchar_t tmp[MAX_SIZE];
// There is more than one candidate
UniFormat(tmp, sizeof(tmp), _UU("CON_AMBIGIOUS_PARAM"), param_list->Token[i]);
UniFormat(tmp, sizeof(tmp), _UU("CON_AMBIGUOUS_PARAM"), param_list->Token[i]);
c->Write(c, tmp);
UniFormat(tmp, sizeof(tmp), _UU("CON_AMBIGIOUS_PARAM_1"), cmd_name);
UniFormat(tmp, sizeof(tmp), _UU("CON_AMBIGUOUS_PARAM_1"), cmd_name);
c->Write(c, tmp);
PrintCandidateHelp(c, cmd_name, candidate, 1);
c->Write(c, _UU("CON_AMBIGIOUS_PARAM_2"));
c->Write(c, _UU("CON_AMBIGUOUS_PARAM_2"));
ok = false;
}

12
src/bin/hamcore/strtable_cn.stb
View File

@ -4309,13 +4309,13 @@ CON_INFILE_START 在文件 "%s" 中写入命令将被使用代替键盘输入
CON_OUTFILE_START 该消息输出到控制台将被保存在文件 "%s"。
CON_USER_CANCEL [EOF]
CON_UNKNOWN_CMD "%S": 命令未找到。\n您可以使用 "HELP" 命令来查看一个可用的命令列表。
CON_AMBIGIOUS_CMD "%S": 命令名称是模糊的。
CON_AMBIGIOUS_CMD_1 指定的命令名称匹配以下多个命令:
CON_AMBIGIOUS_CMD_2 请更严格地重新指定命令名称。
CON_AMBIGUOUS_CMD "%S": 命令名称是模糊的。
CON_AMBIGUOUS_CMD_1 指定的命令名称匹配以下多个命令:
CON_AMBIGUOUS_CMD_2 请更严格地重新指定命令名称。
CON_INVALID_PARAM 参数 "/%S" 已被指定。使用命令 "%S" 时，不可能指定此参数。输入 "%S /HELP" 来看被使用的参数清单。
CON_AMBIGIOUS_PARAM "/%S": 参数名称是不明确的。
CON_AMBIGIOUS_PARAM_1 指定的参数名称符合以下，被指定的做为命令 "%S" 参数的参数:
CON_AMBIGIOUS_PARAM_2 请更严格地重新指定参数名称。
CON_AMBIGUOUS_PARAM "/%S": 参数名称是不明确的。
CON_AMBIGUOUS_PARAM_1 指定的参数名称符合以下，被指定的做为命令 "%S" 参数的参数:
CON_AMBIGUOUS_PARAM_2 请更严格地重新指定参数名称。
# 不明命令

12
src/bin/hamcore/strtable_en.stb
View File

@ -4292,13 +4292,13 @@ CON_INFILE_START The commands written in the file "%s" will be used instead of
CON_OUTFILE_START The message output to the console will be saved in the file "%s".
CON_USER_CANCEL [EOF]
CON_UNKNOWN_CMD "%S": Command not found. \nYou can use the HELP command to view a list of the available commands.
CON_AMBIGIOUS_CMD "%S": The command-name is ambiguous.
CON_AMBIGIOUS_CMD_1 The specified command name matches the following multiple commands.
CON_AMBIGIOUS_CMD_2 Please re-specify the command name more strictly.
CON_AMBIGUOUS_CMD "%S": The command-name is ambiguous.
CON_AMBIGUOUS_CMD_1 The specified command name matches the following multiple commands.
CON_AMBIGUOUS_CMD_2 Please re-specify the command name more strictly.
CON_INVALID_PARAM The parameter "/%S" has been specified. It is not possible to specify this parameter when using the command "%S". Input "%S /HELP" to see the list of what parameters can be used.
CON_AMBIGIOUS_PARAM "%S": The parameter name is ambiguous.
CON_AMBIGIOUS_PARAM_1 The specified parameter name matches with the following parameters that can be specified as a parameter of command "%S".
CON_AMBIGIOUS_PARAM_2 Please re-specify the parameter name more strictly.
CON_AMBIGUOUS_PARAM "%S": The parameter name is ambiguous.
CON_AMBIGUOUS_PARAM_1 The specified parameter name matches with the following parameters that can be specified as a parameter of command "%S".
CON_AMBIGUOUS_PARAM_2 Please re-specify the parameter name more strictly.
# Unknown command

12
src/bin/hamcore/strtable_ja.stb
View File

@ -4297,13 +4297,13 @@ CON_INFILE_START ファイル "%s" に記述されているコマンドを、
CON_OUTFILE_START 画面に出力されたメッセージは、ファイル "%s" にも保存されます。
CON_USER_CANCEL [EOF]
CON_UNKNOWN_CMD "%S": コマンドが見つかりません。\nHELP コマンドで使用できるコマンド一覧を表示できます。
CON_AMBIGIOUS_CMD "%S": コマンドが曖昧です。
CON_AMBIGIOUS_CMD_1 指定されたコマンド名は、次の複数のコマンドに一致します:
CON_AMBIGIOUS_CMD_2 より厳密にコマンド名を指定し直してください。
CON_AMBIGUOUS_CMD "%S": コマンドが曖昧です。
CON_AMBIGUOUS_CMD_1 指定されたコマンド名は、次の複数のコマンドに一致します:
CON_AMBIGUOUS_CMD_2 より厳密にコマンド名を指定し直してください。
CON_INVALID_PARAM パラメータ "/%S" が指定されています。コマンド "%S" ではそのようなパラメータは指定できません。詳しくは "%S /HELP" と入力して使用できるパラメータ一覧を確認してください。
CON_AMBIGIOUS_PARAM "/%S": パラメータ名が曖昧です。
CON_AMBIGIOUS_PARAM_1 指定されたパラメータ名は、コマンド "%S" のパラメータとして指定可能な次の複数のパラメータに一致します:
CON_AMBIGIOUS_PARAM_2 より厳密にパラメータ名を指定し直してください。
CON_AMBIGUOUS_PARAM "/%S": パラメータ名が曖昧です。
CON_AMBIGUOUS_PARAM_1 指定されたパラメータ名は、コマンド "%S" のパラメータとして指定可能な次の複数のパラメータに一致します:
CON_AMBIGUOUS_PARAM_2 より厳密にパラメータ名を指定し直してください。
# 不明なコマンド

12
src/bin/hamcore/strtable_ko.stb
View File

@ -4293,13 +4293,13 @@ CON_INFILE_START 파일 "%s"에 설명 된 명령을 키보드 입력 대신 사
CON_OUTFILE_START 화면에 출력 된 메시지 파일 "%s"에 저장됩니다.
CON_USER_CANCEL [EOF]
CON_UNKNOWN_CMD "%S": 명령을 찾을 수 없습니다. \nHELP 명령에서 사용할 수있는 명령 목록을 볼 수 있습니다.
CON_AMBIGIOUS_CMD "%S": 명령이 모호합니다.
CON_AMBIGIOUS_CMD_1 지정된 명령 이름 다음의 여러 명령과 일치합니다:
CON_AMBIGIOUS_CMD_2 보다 엄격하게 명령 이름을 지정하고 다시 시도하십시오.
CON_AMBIGUOUS_CMD "%S": 명령이 모호합니다.
CON_AMBIGUOUS_CMD_1 지정된 명령 이름 다음의 여러 명령과 일치합니다:
CON_AMBIGUOUS_CMD_2 보다 엄격하게 명령 이름을 지정하고 다시 시도하십시오.
CON_INVALID_PARAM 매개 변수 "/%S"가 지정되어 있습니다. 명령 "%S"는 이러한 매개 변수는 지정할 수 없습니다. 자세한 내용은 "%S/HELP"를 입력하여 사용할 수있는 매개 변수 목록을 확인하십시오.
CON_AMBIGIOUS_PARAM "/%S": 매개 변수 이름이 모호합니다.
CON_AMBIGIOUS_PARAM_1 지정된 매개 변수 이름은 명령 "%S"매개 변수로 지정할 수있는 다음의 여러 매개 변수와 일치합니다:
CON_AMBIGIOUS_PARAM_2 보다 엄격하게 매개 변수 이름을 지정하고 다시 시도하십시오.
CON_AMBIGUOUS_PARAM "/%S": 매개 변수 이름이 모호합니다.
CON_AMBIGUOUS_PARAM_1 지정된 매개 변수 이름은 명령 "%S"매개 변수로 지정할 수있는 다음의 여러 매개 변수와 일치합니다:
CON_AMBIGUOUS_PARAM_2 보다 엄격하게 매개 변수 이름을 지정하고 다시 시도하십시오.
# 알 수없는 명령

12
src/bin/hamcore/strtable_tw.stb
View File

@ -4309,13 +4309,13 @@ CON_INFILE_START 在檔 "%s" 中寫入命令將被使用代替鍵盤輸入。
CON_OUTFILE_START 該消息輸出到控制台將被保存在檔 "%s"。
CON_USER_CANCEL [EOF]
CON_UNKNOWN_CMD "%S": 命令未找到。\n您可以使用 "HELP" 命令來查看一個可用的命令列表。
CON_AMBIGIOUS_CMD "%S": 命令名稱是模糊的。
CON_AMBIGIOUS_CMD_1 指定的命令名稱匹配以下多個命令:
CON_AMBIGIOUS_CMD_2 請更嚴格地重新指定命令名稱。
CON_AMBIGUOUS_CMD "%S": 命令名稱是模糊的。
CON_AMBIGUOUS_CMD_1 指定的命令名稱匹配以下多個命令:
CON_AMBIGUOUS_CMD_2 請更嚴格地重新指定命令名稱。
CON_INVALID_PARAM 參數 "/%S" 已被指定。使用命令 "%S" 時，不可能指定此參數。輸入 "%S /HELP" 來看被使用的參數清單。
CON_AMBIGIOUS_PARAM "/%S": 參數名稱是不明確的。
CON_AMBIGIOUS_PARAM_1 指定的參數名稱符合以下，被指定的做為命令 "%S" 參數的參數:
CON_AMBIGIOUS_PARAM_2 請更嚴格地重新指定參數名稱。
CON_AMBIGUOUS_PARAM "/%S": 參數名稱是不明確的。
CON_AMBIGUOUS_PARAM_1 指定的參數名稱符合以下，被指定的做為命令 "%S" 參數的參數:
CON_AMBIGUOUS_PARAM_2 請更嚴格地重新指定參數名稱。
# 不明命令