aboutsummaryrefslogtreecommitdiffhomepage
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po2926
1 files changed, 1587 insertions, 1339 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 85b6820e..08b54db5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,9 +1,8 @@
-
msgid ""
msgstr ""
"Project-Id-Version: fish 1.21.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-13 21:29+0800\n"
+"POT-Creation-Date: 2015-04-13 22:15+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: shankerwangmiao <shankerwangmiao@gmail.com>\n"
"Language: zh_CN\n"
@@ -16,12 +15,12 @@ msgstr ""
msgid "Could not autoload item '%ls', it is already being autoloaded. "
msgstr "不能自动加载项目 “%ls”,它已经被自动加载了。"
-#: builtin.cpp:83
+#: builtin.cpp:84
#, c-format
msgid "Send job %d, '%ls' to foreground\n"
msgstr "将任务 %d,“%ls” 发送到前台\n"
-#: builtin.cpp:344
+#: builtin.cpp:352
#, c-format
msgid ""
"%ls: Type 'help %ls' for related documentation\n"
@@ -30,99 +29,104 @@ msgstr ""
"%ls: 键入 “help %ls” 以获取相关的文档\n"
"\n"
-#: builtin.cpp:484
+#: builtin.cpp:531
#, c-format
msgid "%ls: No key with name '%ls' found\n"
msgstr "%ls:关键字 “%ls” 未找到\n"
-#: builtin.cpp:490
+#: builtin.cpp:537
#, c-format
msgid "%ls: Key with name '%ls' does not have any mapping\n"
msgstr "%ls:名为 “%ls” 的键没有任何映射\n"
-#: builtin.cpp:496
+#: builtin.cpp:543
#, c-format
msgid "%ls: Unknown error trying to bind to key named '%ls'\n"
msgstr "%ls:在尝试绑定名为 “%ls” 的键时发生未知错误\n"
-#: builtin.cpp:668
+#: builtin.cpp:794
#, fuzzy, c-format
-msgid "%ls: Expected zero or two parameters, got %d\n"
-msgstr "%ls:应有至多一个参数,提供了 %d 个\n"
+msgid "%ls: No binding found for key '%ls'\n"
+msgstr "%s: No description for type %s\n"
+
+#: builtin.cpp:798
+#, c-format
+msgid "%ls: No binding found for sequence '%ls'\n"
+msgstr ""
-#: builtin.cpp:692
+#: builtin.cpp:834
#, c-format
msgid "%ls: Invalid state\n"
msgstr "%ls:非法状态\n"
-#: builtin.cpp:796
+#: builtin.cpp:939
#, c-format
msgid "%ls: Can not specify scope when removing block\n"
msgstr "%ls:当移除区块时不能指定作用域\n"
-#: builtin.cpp:802
+#: builtin.cpp:945
#, c-format
msgid "%ls: No blocks defined\n"
msgstr "%ls:没有定义区块\n"
-#: builtin.cpp:1312 builtin.h:32
+#: builtin.cpp:1556 builtin.h:32
#, c-format
msgid "%ls: Invalid combination of options\n"
msgstr "%ls:非法的选项组合\n"
-#: builtin.cpp:1334
+#: builtin.cpp:1578
#, c-format
msgid "%ls: Expected exactly one function name\n"
msgstr "%ls:应恰好有一个函数名\n"
-#: builtin.cpp:1344 builtin.cpp:1406
+#: builtin.cpp:1588 builtin.cpp:1650
#, c-format
msgid "%ls: Function '%ls' does not exist\n"
msgstr "%ls:函数 “%ls” 不存在\n"
-#: builtin.cpp:1394
+#: builtin.cpp:1638
#, fuzzy, c-format
msgid ""
"%ls: Expected exactly two names (current function name, and new function "
"name)\n"
msgstr "%ls:应恰好有一个函数名\n"
-#: builtin.cpp:1417 builtin.cpp:1952 builtin.cpp:2259
+#: builtin.cpp:1661 builtin.cpp:2230
#, c-format
msgid "%ls: Illegal function name '%ls'\n"
msgstr "%ls:函数名 “%ls” 非法\n"
-#: builtin.cpp:1428
+#: builtin.cpp:1672
#, fuzzy, c-format
msgid "%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"
msgstr "%ls:函数 “%ls” 不存在\n"
-#: builtin.cpp:1809 builtin.cpp:2114
+#: builtin.cpp:2070
#, c-format
msgid "%ls: Unknown signal '%ls'\n"
msgstr "%ls:未知的信号 “%ls”\n"
-#: builtin.cpp:1824 builtin.cpp:1984 builtin.cpp:2129 builtin.cpp:2291
+#: builtin.cpp:2085 builtin.cpp:2195 builtin.cpp:2263
#, c-format
msgid "%ls: Invalid variable name '%ls'\n"
msgstr "%ls:变量名 “%ls” 非法\n"
-#: builtin.cpp:1877 builtin.cpp:2182
+#: builtin.cpp:2138
#, c-format
msgid "%ls: Cannot find calling job for event handler\n"
msgstr "%ls:Cannot find calling job for event handler\n"
-#: builtin.cpp:1895 builtin.cpp:2200
+#: builtin.cpp:2156
#, c-format
msgid "%ls: Invalid process id %ls\n"
msgstr "%ls:进程id %ls 非法\n"
-#: builtin.cpp:1945 builtin.cpp:2252
+#: builtin.cpp:2223
#, c-format
msgid "%ls: Expected function name\n"
msgstr "%ls:应有函数名\n"
-#: builtin.cpp:1962 builtin.cpp:2269
+#: builtin.cpp:2240
#, c-format
msgid ""
"%ls: The name '%ls' is reserved,\n"
@@ -131,395 +135,380 @@ msgstr ""
"%ls:名字 “%ls” 已经保留,\n"
"不能作为函数名\n"
-#: builtin.cpp:1970 builtin.cpp:2277 builtin.cpp:3824
+#: builtin.cpp:2248
#, fuzzy, c-format
msgid "%ls: No function name given\n"
msgstr "%ls:应有函数名\n"
-#: builtin.cpp:1997 builtin.cpp:2304
+#: builtin.cpp:2276
#, c-format
msgid "%ls: Expected one argument, got %d\n"
msgstr "%ls:应有一个参数,提供了 %d 个\n"
-#: builtin.cpp:2319
-msgid "Current functions are: "
-msgstr "当前的函数是: "
-
-#: builtin.cpp:2459
+#: builtin.cpp:2412
#, c-format
msgid "%ls: Seed value '%ls' is not a valid number\n"
msgstr "%ls:种子值 “%ls” 不是一个有效的数字\n"
-#: builtin.cpp:2473
+#: builtin.cpp:2426
#, c-format
msgid "%ls: Expected zero or one argument, got %d\n"
msgstr "%ls:至多应有一个参数,提供了 %d 个\n"
-#: builtin.cpp:2981 fish.cpp:518 parser.cpp:1095
+#: builtin.cpp:2593
+#, fuzzy, c-format
+msgid "%ls: Argument '%ls' is out of range\n"
+msgstr "%ls: Argument “%ls” is not a number\n"
+
+#: builtin.cpp:2601 builtin.cpp:3150 builtin.cpp:3817
+#, c-format
+msgid "%ls: Argument '%ls' must be an integer\n"
+msgstr "%ls:参数 “%ls” 必须是整数\n"
+
+#: builtin.cpp:2656
+#, fuzzy, c-format
+msgid "%ls: --array option requires a single variable name.\n"
+msgstr ""
+"%ls:Erase 需要一个变量名\n"
+"%ls\n"
+
+#: builtin.cpp:3065 fish.cpp:620 parser.cpp:764
msgid "Standard input"
msgstr "标准输入"
-#: builtin.cpp:3024
+#: builtin.cpp:3108
msgid "This is a login shell\n"
msgstr "这是登录shell\n"
-#: builtin.cpp:3026
+#: builtin.cpp:3110
msgid "This is not a login shell\n"
msgstr "这不是登录shell\n"
-#: builtin.cpp:3028
+#: builtin.cpp:3112
#, c-format
msgid "Job control: %ls\n"
msgstr "任务控制:%ls\n"
-#: builtin.cpp:3029
+#: builtin.cpp:3113
msgid "Only on interactive jobs"
msgstr "只在不活跃的进程上"
-#: builtin.cpp:3030
+#: builtin.cpp:3114
msgid "Never"
msgstr "从不"
-#: builtin.cpp:3030
+#: builtin.cpp:3114
msgid "Always"
msgstr "总是"
-#: builtin.cpp:3066 builtin.cpp:3995
-#, c-format
-msgid "%ls: Argument '%ls' must be an integer\n"
-msgstr "%ls:参数 “%ls” 必须是整数\n"
-
-#: builtin.cpp:3108
+#: builtin.cpp:3192
#, c-format
msgid "%ls: Could not find home directory\n"
msgstr "%ls:找不到home目录\n"
-#: builtin.cpp:3128 builtin.cpp:3182
+#: builtin.cpp:3212 builtin.cpp:3266
#, c-format
msgid "%ls: '%ls' is not a directory\n"
msgstr "%ls:“%ls” 不是一个目录\n"
-#: builtin.cpp:3135
+#: builtin.cpp:3219
#, c-format
msgid "%ls: The directory '%ls' does not exist\n"
msgstr "%ls:目录 “%ls” 不存在\n"
-#: builtin.cpp:3142
+#: builtin.cpp:3226
#, c-format
msgid "%ls: '%ls' is a rotten symlink\n"
msgstr "%ls:“%ls” 是一个损坏的符号链接\n"
-#: builtin.cpp:3150
+#: builtin.cpp:3234
#, c-format
msgid "%ls: Unknown error trying to locate directory '%ls'\n"
msgstr "%ls:定位目录“%ls”时发生未知错误\n"
-#: builtin.cpp:3173
+#: builtin.cpp:3257
#, c-format
msgid "%ls: Permission denied: '%ls'\n"
msgstr "%ls:拒绝访问:“%ls”\n"
-#: builtin.cpp:3197
+#: builtin.cpp:3281
#, c-format
msgid "%ls: Could not set PWD variable\n"
msgstr "%ls:不能设置 PWD 变量\n"
-#: builtin.cpp:3284
+#: builtin.cpp:3368
#, c-format
msgid "%ls: Key not specified\n"
msgstr "%ls:没有指定键\n"
-#: builtin.cpp:3328 builtin.cpp:3336
+#: builtin.cpp:3412 builtin.cpp:3420
#, c-format
msgid "%ls: Error encountered while sourcing file '%ls':\n"
msgstr "%ls:读取源文件“%ls”时遇到错误:\n"
-#: builtin.cpp:3344
+#: builtin.cpp:3428
#, c-format
msgid "%ls: '%ls' is not a file\n"
msgstr "%ls:“%ls” 不是一个文件\n"
-#: builtin.cpp:3363
+#: builtin.cpp:3447
#, c-format
msgid "%ls: Error while reading file '%ls'\n"
msgstr "%ls:读取文件 “%ls” 时发生错误\n"
-#: builtin.cpp:3419 builtin.cpp:3599
+#: builtin.cpp:3503 builtin.cpp:3682
#, c-format
msgid "%ls: There are no suitable jobs\n"
msgstr "%ls:没有匹配的任务\n"
-#: builtin.cpp:3448
+#: builtin.cpp:3531
#, c-format
msgid "%ls: Ambiguous job\n"
msgstr "%ls:不明确的任务\n"
-#: builtin.cpp:3454 builtin.cpp:3622 builtin_jobs.cpp:301
+#: builtin.cpp:3537 builtin.cpp:3705 builtin_jobs.cpp:301
#, c-format
msgid "%ls: '%ls' is not a job\n"
msgstr "%ls:“%ls” 不是一个任务\n"
-#: builtin.cpp:3485 builtin_jobs.cpp:316
+#: builtin.cpp:3568 builtin_jobs.cpp:316
#, c-format
msgid "%ls: No suitable job: %d\n"
msgstr "%ls:没有匹配的任务:%d\n"
-#: builtin.cpp:3494
+#: builtin.cpp:3577
#, c-format
msgid ""
"%ls: Can't put job %d, '%ls' to foreground because it is not under job "
"control\n"
-msgstr ""
-"%ls:不能将任务 %d, “%ls” 带到前台,因为它不受到任务"
-"控制\n"
+msgstr "%ls:不能将任务 %d, “%ls” 带到前台,因为它不受到任务控制\n"
-#: builtin.cpp:3547
+#: builtin.cpp:3630
#, c-format
msgid "%ls: Unknown job '%ls'\n"
msgstr "%ls:未知的任务 “%ls”\n"
-#: builtin.cpp:3556
+#: builtin.cpp:3639
#, c-format
msgid ""
"%ls: Can't put job %d, '%ls' to background because it is not under job "
"control\n"
-msgstr ""
-"%ls:不能将任务 %d, “%ls” 置于后台,因为它不受到任务"
-"控制\n"
+msgstr "%ls:不能将任务 %d, “%ls” 置于后台,因为它不受到任务控制\n"
-#: builtin.cpp:3566
+#: builtin.cpp:3649
#, c-format
msgid "Send job %d '%ls' to background\n"
msgstr "将任务 %d “%ls” 置于后台\n"
-#: builtin.cpp:3605
+#: builtin.cpp:3688
msgid "(default)"
msgstr "(默认)"
-#: builtin.cpp:3737
-#, c-format
-msgid "%ls: Not inside of block\n"
-msgstr "%ls:不在区块之内\n"
-
-#: builtin.cpp:3884
-#, c-format
-msgid "%ls: Not inside of 'if' block\n"
-msgstr "%ls:不在 “if” 区块之内\n"
-
-#: builtin.cpp:3938
+#: builtin.cpp:3760
#, c-format
msgid "%ls: Not inside of loop\n"
msgstr "%ls:不在循环体内部\n"
-#: builtin.cpp:4005 builtin_complete.cpp:539 builtin_set_color.cpp:140
-#: builtin.h:83
+#: builtin.cpp:3827 builtin_complete.cpp:551 builtin.h:83
#, c-format
msgid "%ls: Too many arguments\n"
msgstr "%ls:参数过多\n"
-#: builtin.cpp:4023
+#: builtin.cpp:3845
#, c-format
msgid "%ls: Not inside of function\n"
msgstr "%ls:不在函数体之内\n"
-#: builtin.cpp:4059
-#, c-format
-msgid "%ls: Expected exactly one argument, got %d\n"
-msgstr "%ls:应恰好有一个参数,提供了 %d 个\n"
-
-#: builtin.cpp:4090
-#, c-format
-msgid "%ls: 'case' command while not in switch block\n"
-msgstr "%ls:“case” 命令不在 switch 块内\n"
-
-#: builtin.cpp:4317 builtin.cpp:4360
+#: builtin.cpp:4069 builtin.cpp:4113
#, fuzzy
msgid "Test a condition"
msgstr "设置配置选项"
-#: builtin.cpp:4318
+#: builtin.cpp:4070
msgid "Try out the new parser"
msgstr ""
-#: builtin.cpp:4319
+#: builtin.cpp:4071
msgid "Execute command if previous command suceeded"
msgstr "如果上一个命令成功,执行命令"
-#: builtin.cpp:4320
+#: builtin.cpp:4072
msgid "Create a block of code"
msgstr "创建代码区块"
-#: builtin.cpp:4321
+#: builtin.cpp:4073
msgid "Send job to background"
msgstr "将任务置于后台"
-#: builtin.cpp:4322
+#: builtin.cpp:4074
msgid "Handle fish key bindings"
msgstr "处理 fish 键 绑定"
-#: builtin.cpp:4323
+#: builtin.cpp:4075
msgid "Temporarily block delivery of events"
msgstr "Temporarily block delivery of events"
-#: builtin.cpp:4324
+#: builtin.cpp:4076
msgid "Stop the innermost loop"
msgstr "停止最内层的循环"
-#: builtin.cpp:4325
+#: builtin.cpp:4077
msgid ""
"Temporarily halt execution of a script and launch an interactive debug prompt"
-msgstr ""
-"暂时终止一个脚本的执行并运行一个交互式的 debug 提示符"
+msgstr "暂时终止一个脚本的执行并运行一个交互式的 debug 提示符"
-#: builtin.cpp:4326
+#: builtin.cpp:4078
msgid "Run a builtin command instead of a function"
msgstr "执行内部命令而不是一个函数"
-#: builtin.cpp:4327 builtin.cpp:4359
+#: builtin.cpp:4079 builtin.cpp:4112
msgid "Conditionally execute a block of commands"
msgstr "有条件地执行一个命令区块"
-#: builtin.cpp:4328
+#: builtin.cpp:4080
msgid "Change working directory"
msgstr "改变工作目录(当前目录)"
-#: builtin.cpp:4329
+#: builtin.cpp:4081
msgid "Run a program instead of a function or builtin"
msgstr "执行一个程序,而不是一个函数或内部命令"
-#: builtin.cpp:4330
+#: builtin.cpp:4082
msgid "Set or get the commandline"
msgstr "设置或取得命令行"
-#: builtin.cpp:4331
+#: builtin.cpp:4083
msgid "Edit command specific completions"
msgstr "编辑命令相关的补全"
-#: builtin.cpp:4332
+#: builtin.cpp:4084
msgid "Search for a specified string in a list"
msgstr "在指定列表中搜索一个特定的字符串"
-#: builtin.cpp:4333
+#: builtin.cpp:4085
msgid "Skip the rest of the current lap of the innermost loop"
msgstr "跳过最内层循环的当前一轮的剩余部分"
-#: builtin.cpp:4334
+#: builtin.cpp:4086
msgid "Count the number of arguments"
msgstr "参数的个数的计数"
-#: builtin.cpp:4335
+#: builtin.cpp:4087
#, fuzzy
msgid "Print arguments"
msgstr "打印单词计数"
-#: builtin.cpp:4336
+#: builtin.cpp:4088
msgid "Evaluate block if condition is false"
msgstr "条件为假时对区块求值"
-#: builtin.cpp:4337
+#: builtin.cpp:4089
msgid "Emit an event"
msgstr "触发一个事件️"
-#: builtin.cpp:4338
+#: builtin.cpp:4090
msgid "End a block of commands"
msgstr "结束一个命令块"
-#: builtin.cpp:4339
+#: builtin.cpp:4091
msgid "Run command in current process"
msgstr "在当前进程下执行命令"
-#: builtin.cpp:4340
+#: builtin.cpp:4092
msgid "Exit the shell"
msgstr "退出这个 shell"
-#: builtin.cpp:4341
+#: builtin.cpp:4093
+msgid "Return an unsuccessful result"
+msgstr ""
+
+#: builtin.cpp:4094
msgid "Send job to foreground"
msgstr "将任务带回到前台"
-#: builtin.cpp:4342
+#: builtin.cpp:4095
msgid "Perform a set of commands multiple times"
msgstr "多次执行一组指令"
-#: builtin.cpp:4343
+#: builtin.cpp:4096
msgid "Define a new function"
msgstr "定义一个新函数"
-#: builtin.cpp:4344
+#: builtin.cpp:4097
msgid "List or remove functions"
msgstr "列出或移除函数"
-#: builtin.cpp:4345
+#: builtin.cpp:4098
msgid "History of commands executed by user"
msgstr "用户执行的历史命令"
-#: builtin.cpp:4346
+#: builtin.cpp:4099
msgid "Evaluate block if condition is true"
msgstr "条件为真时对区块求值"
-#: builtin.cpp:4347
+#: builtin.cpp:4100
msgid "Print currently running jobs"
msgstr "列出当前运行的任务"
-#: builtin.cpp:4348
+#: builtin.cpp:4101
msgid "Negate exit status of job"
msgstr "负的任务退出代码(exit status)"
-#: builtin.cpp:4349
+#: builtin.cpp:4102
msgid "Execute command if previous command failed"
msgstr "如果前一条命令失败执行命令"
-#: builtin.cpp:4350
+#: builtin.cpp:4103
#, fuzzy
msgid "Prints formatted text"
msgstr "显示命令类型"
-#: builtin.cpp:4351
+#: builtin.cpp:4104
#, fuzzy
msgid "Print the working directory"
msgstr "显示工作目录"
-#: builtin.cpp:4352
+#: builtin.cpp:4105
msgid "Generate random number"
msgstr "生成随机数"
-#: builtin.cpp:4353
+#: builtin.cpp:4106
msgid "Read a line of input into variables"
msgstr "将输入的一行读入到变量中"
-#: builtin.cpp:4354
+#: builtin.cpp:4107
msgid "Stop the currently evaluated function"
msgstr "停止当前求值的函数"
-#: builtin.cpp:4355
+#: builtin.cpp:4108
msgid "Handle environment variables"
msgstr "处理环境变量"
-#: builtin.cpp:4356
+#: builtin.cpp:4109
msgid "Set the terminal color"
msgstr "设置终端颜色"
-#: builtin.cpp:4357
+#: builtin.cpp:4110
msgid "Evaluate contents of file"
msgstr "对文件内容求值"
-#: builtin.cpp:4358
+#: builtin.cpp:4111
msgid "Return status information about fish"
msgstr "返回 fish 的状态信息"
-#: builtin.cpp:4361
+#: builtin.cpp:4114
+msgid "Return a successful result"
+msgstr ""
+
+#: builtin.cpp:4115
msgid "Set or get the shells resource usage limits"
msgstr "显示或设置 shell 资源使用限制"
-#: builtin.cpp:4362
+#: builtin.cpp:4116
msgid "Perform a command multiple times"
msgstr "多次执行一条命令"
-#: builtin.cpp:4442 parser.cpp:53
-#, c-format
-msgid "Unknown builtin '%ls'"
-msgstr "未知的内置命令 “%ls”"
-
-#: builtin_commandline.cpp:411
+#: builtin_commandline.cpp:466
#, c-format
msgid "%ls: Unknown input function '%ls'\n"
msgstr "%ls:未知的输入函数 “%ls”\n"
@@ -536,7 +525,7 @@ msgstr "CPU\t"
msgid "State\tCommand\n"
msgstr "状态\t命令\n"
-#: builtin_jobs.cpp:99 proc.cpp:751
+#: builtin_jobs.cpp:99 proc.cpp:843
msgid "stopped"
msgstr "已终止"
@@ -582,31 +571,31 @@ msgstr ""
msgid "missing hexadecimal number in escape"
msgstr ""
-#: builtin_printf.cpp:387
+#: builtin_printf.cpp:388
msgid "Missing hexadecimal number in Unicode escape"
msgstr ""
-#: builtin_printf.cpp:401
+#: builtin_printf.cpp:402
#, c-format
msgid "Unicode character out of range: \\%c%0*x"
msgstr ""
-#: builtin_printf.cpp:668
+#: builtin_printf.cpp:670
#, c-format
msgid "invalid field width: %ls"
msgstr ""
-#: builtin_printf.cpp:706
+#: builtin_printf.cpp:708
#, fuzzy, c-format
msgid "invalid precision: %ls"
msgstr "%ls:非法的进程ID %ls\n"
-#: builtin_printf.cpp:737
+#: builtin_printf.cpp:739
#, fuzzy, c-format
msgid "%.*ls: invalid conversion specification"
msgstr "%ls:非法的选项组合\n"
-#: builtin_printf.cpp:769
+#: builtin_printf.cpp:771
msgid "printf: not enough arguments"
msgstr ""
@@ -616,58 +605,63 @@ msgid "%ls: Tried to change the read-only variable '%ls'\n"
msgstr "%ls:试图改变只读变量 “%ls” 的值\n"
#: builtin_set.cpp:162
-#, c-format
-msgid "%ls: Unknown error"
-msgstr "%ls:未知错误"
+#, fuzzy, c-format
+msgid "%ls: Tried to set the special variable '%ls' with the wrong scope\n"
+msgstr "%ls:试图改变只读变量 “%ls” 的值\n"
-#: builtin_set.cpp:214
+#: builtin_set.cpp:169
+#, fuzzy, c-format
+msgid "%ls: Tried to set the special variable '%ls' to an invalid value\n"
+msgstr "%ls:试图改变只读变量 “%ls” 的值\n"
+
+#: builtin_set.cpp:221
#, c-format
msgid "%ls: Multiple variable names specified in single call (%ls and %.*ls)\n"
-msgstr ""
-"%ls:在一个调用中指定了多个变量 (%ls and %.*ls)\n"
+msgstr "%ls:在一个调用中指定了多个变量 (%ls and %.*ls)\n"
-#: builtin_set.cpp:241
+#: builtin_set.cpp:248
#, c-format
msgid "%ls: Invalid index starting at '%ls'\n"
msgstr "%ls:开始于 “%ls” 的索引非法\n"
-#: builtin_set.cpp:640
+#: builtin_set.cpp:647
#, fuzzy, c-format
msgid "%ls: Erase needs a variable name\n"
msgstr ""
"%ls:Erase 需要一个变量名\n"
"%ls\n"
-#: builtin_set.cpp:684
-#, c-format
-msgid "%ls: Can not specify scope when erasing array slice\n"
-msgstr "%ls: Can not specify scope when erasing array slice\n"
-
-#: builtin_set.cpp:783
+#: builtin_set.cpp:791
#, c-format
msgid "%ls: Values cannot be specfied with erase\n"
msgstr "%ls: Values cannot be specfied with erase\n"
-#: builtin_set_color.cpp:149
-#, fuzzy, c-format
-msgid "%ls: Expected an argument\n"
-msgstr "%s: Expected an argument\n"
+#: builtin_set.cpp:817
+#, c-format
+msgid ""
+"%ls: Warning: universal scope selected, but a global variable '%ls' exists.\n"
+msgstr ""
-#: builtin_set_color.cpp:157 builtin_set_color.cpp:164
+#: builtin_set_color.cpp:144 builtin_set_color.cpp:166
#, fuzzy, c-format
msgid "%ls: Unknown color '%ls'\n"
msgstr "%s: Unknown color “%s”\n"
-#: builtin_set_color.cpp:171
+#: builtin_set_color.cpp:153
+#, fuzzy, c-format
+msgid "%ls: Expected an argument\n"
+msgstr "%s: Expected an argument\n"
+
+#: builtin_set_color.cpp:173
#, fuzzy, c-format
msgid "%ls: Could not set up terminal\n"
msgstr "Could not set up terminal"
-#: common.cpp:1882
+#: common.cpp:1917
msgid "This is a bug. Break on bugreport to debug."
msgstr ""
-#: common.cpp:1901
+#: common.cpp:1936
msgid "empty"
msgstr "empty"
@@ -681,72 +675,70 @@ msgstr ""
msgid "Variable: %ls"
msgstr "Variable: %ls"
-#: complete.cpp:907 complete.cpp:925
+#: complete.cpp:901 complete.cpp:919
msgid "Unknown option: "
msgstr "Unknown option: "
-#: complete.cpp:929
+#: complete.cpp:923
msgid "Multiple matches for option: "
msgstr "Multiple matches for option: "
-#: env.cpp:251
-msgid "Could not get user information"
-msgstr "Could not get user information"
-
-#: env.cpp:362
+#: env.cpp:315
msgid "Changing language to English"
msgstr "Changing language to English"
-#: env.cpp:1252
+#: env.cpp:1180
msgid "Tried to pop empty environment stack."
msgstr "Tried to pop empty environment stack."
-#: env_universal_common.cpp:529
-#, c-format
-msgid "Could not convert message '%s' to wide character string"
-msgstr "Could not convert message “%s” to wide character string"
+#: env_universal_common.cpp:617 path.cpp:279
+msgid ""
+"Unable to create a configuration directory for fish. Your personal settings "
+"will not be saved. Please set the $XDG_CONFIG_HOME variable to a directory "
+"where the current user has write access."
+msgstr ""
-#: event.cpp:168
+#: event.cpp:178
#, c-format
msgid "signal handler for %ls (%ls)"
msgstr "signal handler for %ls (%ls)"
-#: event.cpp:172
+#: event.cpp:182
#, c-format
msgid "handler for variable '%ls'"
msgstr "handler for variable “%ls”"
-#: event.cpp:178
+#: event.cpp:188
#, c-format
msgid "exit handler for process %d"
msgstr "exit handler for process %d"
-#: event.cpp:184 event.cpp:195
+#: event.cpp:194 event.cpp:205
#, c-format
msgid "exit handler for job %d, '%ls'"
msgstr "exit handler for job %d, “%ls”"
-#: event.cpp:186
+#: event.cpp:196
#, c-format
msgid "exit handler for job with process group %d"
msgstr "exit handler for job with process group %d"
-#: event.cpp:197
+#: event.cpp:207
#, c-format
msgid "exit handler for job with job id %d"
msgstr "exit handler for job with job id %d"
-#: event.cpp:203
+#: event.cpp:213
#, c-format
msgid "handler for generic event '%ls'"
msgstr "handler for generic event “%ls”"
-#: event.cpp:207
+#: event.cpp:217
#, fuzzy, c-format
msgid "Unknown event type '0x%x'"
msgstr "Unknown event type"
-#: event.cpp:621
+#: event.cpp:613
msgid "Signal list overflow. Signals have been ignored."
msgstr "Signal list overflow. Signals have been ignored."
@@ -765,12 +757,12 @@ msgstr "An error occurred while setting up pipe"
msgid "An error occurred while redirecting file '%s'"
msgstr "An error occurred while redirecting file “%ls”"
-#: exec.cpp:912
+#: exec.cpp:795
#, c-format
msgid "Unknown function '%ls'"
msgstr "Unknown function “%ls”"
-#: exec.cpp:1063
+#: exec.cpp:943
#, c-format
msgid "Unknown input redirection type %d"
msgstr "Unknown input redirection type %d"
@@ -800,170 +792,158 @@ msgstr "Shell process"
msgid "Last background job"
msgstr "Last background job"
-#: expand.cpp:1306
+#: expand.cpp:1419
msgid "Mismatched brackets"
msgstr "Mismatched brackets"
-#: fish.cpp:320
+#: fish.cpp:330
+msgid ""
+"Old versions of fish appear to be running. You will not be able to share "
+"variable values between old and new fish sessions. For best results, restart "
+"all running instances of fish."
+msgstr ""
+
+#: fish.cpp:420
#, c-format
msgid "Invalid value '%s' for debug level switch"
msgstr "Invalid value “%s” for debug level switch"
-#: fish.cpp:361 mimedb.cpp:1335
+#: fish.cpp:461 mimedb.cpp:1343
#, c-format
msgid "%s, version %s\n"
msgstr "%s, version %s\n"
-#: fish.cpp:416
+#: fish.cpp:516
msgid "Can not use the no-execute mode when running an interactive session"
msgstr "Can not use the no-execute mode when running an interactive session"
-#: fish.cpp:517
+#: fish.cpp:619
#, c-format
msgid "Error while reading file %ls\n"
msgstr "Error while reading file %ls\n"
-#: fish_indent.cpp:345
+#: fish_indent.cpp:332
#, c-format
msgid "%ls, version %s\n"
msgstr "%ls, version %s\n"
-#: fish_pager.cpp:113
-#, c-format
-msgid "%ls: Argument '%s' is not a valid file descriptor\n"
-msgstr "%ls: Argument “%s” is not a valid file descriptor\n"
-
-#: fish_pager.cpp:703
-#, c-format
-msgid " %d to %d of %d"
-msgstr ""
-
-#: fish_pager.cpp:1012
-msgid "Could not set up output file descriptors for pager"
-msgstr ""
-
-#: fish_pager.cpp:1018
-msgid "Could not set up input file descriptors for pager"
-msgstr "Could not set up input file descriptors for pager"
-
-#: fish_pager.cpp:1024
-msgid "Could not open tty for pager"
-msgstr "Could not open tty for pager"
-
-#: fish_pager.cpp:1031
-msgid "Could not initialize result pipe"
-msgstr ""
-
-#: fish_pager.cpp:1075 input.cpp:384 input.cpp:394
+#: input.cpp:483 input.cpp:493
msgid "Could not set up terminal"
msgstr "Could not set up terminal"
-#: fish_pager.cpp:1110 input.cpp:436
-msgid "Error while closing terminfo"
-msgstr "Error while closing terminfo"
-
-#: fish_pager.cpp:1306
-msgid "Unspecified file descriptors"
-msgstr "Unspecified file descriptors"
-
-#: fish_pager.cpp:1318
-msgid "Could not read completions"
-msgstr "Could not read completions"
-
-#: fishd.cpp:766 path.cpp:358
-msgid ""
-"Unable to create a configuration directory for fish. Your personal settings "
-"will not be saved. Please set the $XDG_CONFIG_HOME variable to a directory "
-"where the current user has write access."
-msgstr ""
-
-#: input.cpp:387
+#: input.cpp:486
#, c-format
msgid "Check that your terminal type, '%ls', is supported on this system"
msgstr ""
-#: input.cpp:389
+#: input.cpp:488
#, c-format
msgid "Attempting to use '%ls' instead"
msgstr ""
-#: io.cpp:110
+#: input.cpp:535
+msgid "Error while closing terminfo"
+msgstr "Error while closing terminfo"
+
+#: io.cpp:112
#, c-format
msgid ""
"An error occured while reading output from code block on file descriptor %d"
msgstr ""
"An error occured while reading output from code block on file descriptor %d"
-#: mimedb.cpp:173 mimedb.cpp:187 mimedb.cpp:1177
+#: mimedb.cpp:174 mimedb.cpp:188 mimedb.cpp:1179
#, c-format
msgid "%s: Out of memory\n"
msgstr "%s: Out of memory\n"
-#: mimedb.cpp:462
+#: mimedb.cpp:463
#, c-format
msgid "%s: Unknown error in munge()\n"
msgstr "%s: Unknown error in munge()\n"
-#: mimedb.cpp:480
+#: mimedb.cpp:481
#, c-format
msgid "%s: Locale string too long\n"
msgstr "%s: Locale string too long\n"
-#: mimedb.cpp:550 mimedb.cpp:558
+#: mimedb.cpp:551 mimedb.cpp:559
#, c-format
msgid "%s: Could not compile regular expressions %s with error %s\n"
msgstr "%s: Could not compile regular expressions %s with error %s\n"
-#: mimedb.cpp:674
+#: mimedb.cpp:676
#, c-format
msgid "%s: No description for type %s\n"
msgstr "%s: No description for type %s\n"
-#: mimedb.cpp:742
+#: mimedb.cpp:744
#, c-format
msgid "%s: Could not parse launcher string '%s'\n"
msgstr "%s: Could not parse launcher string “%s”\n"
-#: mimedb.cpp:778
+#: mimedb.cpp:780
#, c-format
msgid "%s: Default launcher '%s' does not specify how to start\n"
msgstr "%s: Default launcher “%s” does not specify how to start\n"
-#: mimedb.cpp:1156
+#: mimedb.cpp:1158
#, c-format
msgid "%s: Unsupported switch '%c' in launch string '%s'\n"
msgstr "%s: Unsupported switch “%c” in launch string “%s”\n"
-#: mimedb.cpp:1346
+#: mimedb.cpp:1354
#, c-format
msgid "%s: Can not launch a mimetype\n"
msgstr "%s: Can not launch a mimetype\n"
-#: mimedb.cpp:1374
+#: mimedb.cpp:1382
#, c-format
msgid "%s: Could not parse mimetype from argument '%s'\n"
msgstr "%s: Could not parse mimetype from argument “%s”\n"
-#: mimedb.cpp:1394 signal.cpp:407 signal.cpp:422
+#: mimedb.cpp:1402 signal.cpp:407 signal.cpp:422
msgid "Unknown"
msgstr "Unknown"
+#: output.cpp:608
+#, c-format
+msgid ""
+"Tried to use terminfo string %s on line %ld of %s, which is undefined in "
+"terminal of type \"%ls\". Please report this error to %s"
+msgstr ""
+
#: pager.cpp:24
#, fuzzy
msgid "search: "
msgstr "Set arch"
-#: parse_execution.cpp:526 parse_execution.cpp:961 parser.cpp:1404
+#: pager.cpp:562
+#, c-format
+msgid "%lsand 1 more row"
+msgstr ""
+
+#: pager.cpp:566
+#, c-format
+msgid "%lsand %lu more rows"
+msgstr ""
+
+#: pager.cpp:571
#, c-format
-msgid "Could not expand string '%ls'"
-msgstr "Could not expand string “%ls”"
+msgid "rows %lu to %lu of %lu"
+msgstr ""
+
+#: pager.cpp:576
+#, fuzzy
+msgid "(no matches)"
+msgstr "Set watches"
-#: parse_execution.cpp:549
+#: parse_execution.cpp:555
#, fuzzy, c-format
msgid "switch: Expected exactly one argument, got %lu\n"
msgstr "%ls: Expected exactly one argument, got %d\n"
-#: parse_execution.cpp:749 parser.cpp:2053
+#: parse_execution.cpp:799
#, fuzzy, c-format
msgid ""
"Unknown command '%ls'. Did you mean to run %ls with a modified environment? "
@@ -974,7 +954,7 @@ msgstr ""
"assigning values to variables, see the help section on the set command by "
"typing “help set”."
-#: parse_execution.cpp:774 parser.cpp:2078
+#: parse_execution.cpp:824
#, fuzzy, c-format
msgid ""
"Variables may not be used as commands. Instead, define a function like "
@@ -986,7 +966,7 @@ msgstr ""
"“function %ls; %ls $argv; end”. See the help section for the function "
"command by typing “help function”."
-#: parse_execution.cpp:783 parser.cpp:2087
+#: parse_execution.cpp:833
#, fuzzy, c-format
msgid ""
"Variables may not be used as commands. Instead, define a function or use the "
@@ -996,7 +976,7 @@ msgstr ""
"Variables may not be used as commands. Instead, define a function. See the "
"help section for the function command by typing “help function”."
-#: parse_execution.cpp:791 parser.cpp:2095
+#: parse_execution.cpp:841
#, c-format
msgid ""
"Commands may not contain variables. Use the eval builtin instead, like 'eval "
@@ -1005,387 +985,306 @@ msgstr ""
"Commands may not contain variables. Use the eval builtin instead, like “eval "
"%ls”. See the help section for the eval command by typing “help eval”."
-#: parse_execution.cpp:798 parser.cpp:2102
+#: parse_execution.cpp:848
#, fuzzy, c-format
msgid "The file '%ls' is not executable by this user"
msgstr "The file “%ls” already exists"
-#: parse_execution.cpp:1029
+#: parse_execution.cpp:1057
#, fuzzy, c-format
msgid "Invalid redirection target: %ls"
msgstr "Invalid IO redirection"
-#: parse_execution.cpp:1053
+#: parse_execution.cpp:1081
#, fuzzy, c-format
msgid "Requested redirection to '%ls', which is not a valid file descriptor"
msgstr "Requested redirection to something that is not a file descriptor %ls"
-#: parse_util.cpp:47
+#: parse_util.cpp:46
#, fuzzy, c-format
msgid "The '%ls' command can not be used in a pipeline"
msgstr "This command can not be used in a pipeline"
-#: parser.cpp:58
-msgid "This command can not be used in a pipeline"
+#: parse_util.cpp:49
+#, fuzzy, c-format
+msgid "The '%ls' command can not be used immediately after a backgrounded job"
msgstr "This command can not be used in a pipeline"
-#: parser.cpp:64
+#: parse_util.cpp:52
+#, fuzzy
+msgid "Backgrounded commands can not be used as conditionals"
+msgstr "This command can not be used in a pipeline"
+
+#: parser.cpp:52
#, c-format
msgid "Tokenizer error: '%ls'"
msgstr "Tokenizer error: “%ls”"
-#: parser.cpp:69
-msgid "An additional command is required"
-msgstr "An additional command is required"
-
-#: parser.cpp:74
-msgid ""
-"The function calls itself immediately, which would result in an infinite "
-"loop."
-msgstr ""
-
-#: parser.cpp:79
-msgid ""
-"Could not locate end of block. The 'end' command is missing, misspelled or a "
-"';' is missing."
-msgstr ""
-"Could not locate end of block. The “end” command is missing, misspelled or a "
-"“;” is missing."
-
-#: parser.cpp:82
-#, c-format
-msgid "Expected a command name, got token of type '%ls'"
-msgstr "Expected a command name, got token of type “%ls”"
-
-#: parser.cpp:87 parse_constants.h:158
-#, c-format
-msgid "Illegal command name '%ls'"
-msgstr "Illegal command name “%ls”"
-
-#: parser.cpp:92 parse_constants.h:164
-#, fuzzy, c-format
-msgid "Illegal file descriptor in redirection '%ls'"
-msgstr "Illegal file descriptor “%ls”"
-
-#: parser.cpp:97 parse_constants.h:167
-#, c-format
-msgid "No matches for wildcard '%ls'."
-msgstr ""
-
-#: parser.cpp:102
-msgid "'case' builtin not inside of switch block"
-msgstr "“case” builtin not inside of switch block"
-
-#: parser.cpp:107
-msgid "Loop control command while not inside of loop"
-msgstr "Loop control command while not inside of loop"
-
-#: parser.cpp:112 parse_constants.h:176
-msgid "'return' builtin command outside of function definition"
-msgstr "“return” builtin command outside of function definition"
-
-#: parser.cpp:117
-#, fuzzy, c-format
-msgid "'%ls' builtin not inside of if block"
-msgstr "“else” builtin not inside of if block"
-
-#: parser.cpp:122
-#, c-format
-msgid "'%ls' used past terminating 'else'"
-msgstr ""
-
-#: parser.cpp:127
-msgid "'end' command outside of block"
-msgstr "“end” command outside of block"
-
-#: parser.cpp:132 parse_constants.h:179
-#, fuzzy, c-format
-msgid ""
-"Unknown command '%ls'. Did you mean 'set %ls %ls'? See the help section on "
-"the set command by typing 'help set'."
-msgstr ""
-"Unknown command “%ls”. Did you mean “set %ls %ls”? For information on "
-"assigning values to variables, see the help section on the set command by "
-"typing “help set”."
-
-#: parser.cpp:137
-#, c-format
-msgid "Expected redirection specification, got token of type '%ls'"
-msgstr "Expected redirection specification, got token of type “%ls”"
-
-#: parser.cpp:142
-msgid ""
-"Encountered redirection when expecting a command name. Fish does not allow a "
-"redirection operation before a command."
-msgstr ""
-"Encountered redirection when expecting a command name. Fish does not allow a "
-"redirection operation before a command."
-
-#: parser.cpp:147
+#: parser.cpp:57
#, c-format
msgid "Tried to evaluate commands using invalid block type '%ls'"
msgstr "Tried to evaluate commands using invalid block type “%ls”"
-#: parser.cpp:153
+#: parser.cpp:62
#, c-format
msgid "Unexpected token of type '%ls'"
msgstr "Unexpected token of type “%ls”"
-#: parser.cpp:158 parse_constants.h:209
+#: parser.cpp:67 parse_constants.h:255
msgid "'while' block"
msgstr "“while” block"
-#: parser.cpp:163 parse_constants.h:214
+#: parser.cpp:72 parse_constants.h:260
msgid "'for' block"
msgstr "“for” block"
-#: parser.cpp:168 parse_constants.h:219
+#: parser.cpp:77 parse_constants.h:265
msgid "Block created by breakpoint"
msgstr "Block created by breakpoint"
-#: parser.cpp:175 parse_constants.h:226
+#: parser.cpp:82 parse_constants.h:272
msgid "'if' conditional block"
msgstr "“if” conditional block"
-#: parser.cpp:181 parse_constants.h:232
+#: parser.cpp:87 parse_constants.h:278
msgid "function definition block"
msgstr "function definition block"
-#: parser.cpp:187 parse_constants.h:238
+#: parser.cpp:92 parse_constants.h:284
msgid "function invocation block"
msgstr "function invocation block"
-#: parser.cpp:192 parse_constants.h:243
+#: parser.cpp:97 parse_constants.h:289
msgid "function invocation block with no variable shadowing"
msgstr "function invocation block with no variable shadowing"
-#: parser.cpp:198 parse_constants.h:249
+#: parser.cpp:102 parse_constants.h:295
msgid "'switch' block"
msgstr "“switch” block"
-#: parser.cpp:204 parse_constants.h:255
+#: parser.cpp:107 parse_constants.h:301
msgid "unexecutable block"
msgstr "unexecutable block"
-#: parser.cpp:210 parse_constants.h:261
+#: parser.cpp:112 parse_constants.h:307
msgid "global root block"
msgstr "global root block"
-#: parser.cpp:216 parse_constants.h:267
+#: parser.cpp:117 parse_constants.h:313
msgid "command substitution block"
msgstr "command substitution block"
-#: parser.cpp:222 parse_constants.h:273
+#: parser.cpp:122 parse_constants.h:319
msgid "'begin' unconditional block"
msgstr "“begin” unconditional block"
-#: parser.cpp:228 parse_constants.h:279
+#: parser.cpp:127 parse_constants.h:325
msgid "Block created by the . builtin"
msgstr "Block created by the . builtin"
-#: parser.cpp:233 parse_constants.h:284
+#: parser.cpp:132 parse_constants.h:330
msgid "event handler block"
msgstr "event handler block"
-#: parser.cpp:239 parse_constants.h:290
+#: parser.cpp:137 parse_constants.h:336
msgid "unknown/invalid block"
msgstr "unknown/invalid block"
-#: parser.cpp:645
+#: parser.cpp:474
#, c-format
msgid "Could not write profiling information to file '%s'"
msgstr "Could not write profiling information to file “%s”"
-#: parser.cpp:651
+#: parser.cpp:480
msgid "Time\tSum\tCommand\n"
msgstr "Time\tSum\tCommand\n"
-#: parser.cpp:811
+#: parser.cpp:562
#, c-format
msgid "in event handler: %ls\n"
msgstr "in event handler: %ls\n"
-#: parser.cpp:839
+#: parser.cpp:590
#, fuzzy, c-format
msgid "from sourcing file %ls\n"
msgstr "Error while reading file %ls\n"
-#: parser.cpp:845
+#: parser.cpp:597
#, fuzzy, c-format
msgid "in function '%ls'\n"
msgstr "in function “%ls”,\n"
-#: parser.cpp:850
+#: parser.cpp:602
msgid "in command substitution\n"
msgstr "in command substitution\n"
-#: parser.cpp:863
+#: parser.cpp:615
#, fuzzy, c-format
msgid "\tcalled on line %d of file %ls\n"
msgstr "\tcalled on line %d of file “%ls”,\n"
-#: parser.cpp:869
+#: parser.cpp:621
#, fuzzy
msgid "\tcalled during startup\n"
msgstr "\tcalled on standard input,\n"
-#: parser.cpp:873
+#: parser.cpp:625
#, fuzzy
msgid "\tcalled on standard input\n"
msgstr "\tcalled on standard input,\n"
-#: parser.cpp:890
+#: parser.cpp:642
#, c-format
msgid "\twith parameter list '%ls'\n"
msgstr "\twith parameter list “%ls”\n"
-#: parser.cpp:1087
+#: parser.cpp:756
#, c-format
msgid "%ls (line %d): "
msgstr "%ls (line %d): "
-#: parser.cpp:1091
+#: parser.cpp:760
msgid "Startup"
msgstr ""
-#: parser.cpp:1197
+#: parser.cpp:803
msgid "Job inconsistency"
msgstr "Job inconsistency"
-#: parser.cpp:1520
-msgid "Invalid IO redirection"
-msgstr "Invalid IO redirection"
-
-#: parser.cpp:1541
-#, c-format
-msgid "Requested redirection to something that is not a file descriptor %ls"
-msgstr "Requested redirection to something that is not a file descriptor %ls"
-
-#: parser.cpp:2667 parser.cpp:2750
+#: parser.cpp:956
msgid "End of block mismatch. Program terminating."
msgstr "End of block mismatch. Program terminating."
-#: parser.cpp:3034
+#: parser.cpp:1047
#, fuzzy, c-format
msgid "%ls (line %lu): "
msgstr "%ls (line %d): "
+#: parser.cpp:1051
+#, c-format
+msgid "%ls: "
+msgstr ""
+
#: path.cpp:24
#, c-format
msgid "Error while searching for command '%ls'"
msgstr "Error while searching for command “%ls”"
-#: proc.cpp:615
+#: proc.cpp:690
+#, fuzzy, c-format
+msgid "'%ls' has %ls"
+msgstr "Job %d, “%ls” has %ls"
+
+#: proc.cpp:694
#, c-format
msgid "Job %d, '%ls' has %ls"
msgstr "Job %d, “%ls” has %ls"
-#: proc.cpp:699
-#, c-format
-msgid "%ls: Job %d, '%ls' terminated by signal %ls (%ls)"
+#: proc.cpp:786
+#, fuzzy, c-format
+msgid "%ls: %ls'%ls' terminated by signal %ls (%ls)"
msgstr "%ls: Job %d, “%ls” terminated by signal %ls (%ls)"
-#: proc.cpp:707
-#, c-format
-msgid ""
-"%ls: Process %d, '%ls' from job %d, '%ls' terminated by signal %ls (%ls)"
+#: proc.cpp:797
+#, fuzzy, c-format
+msgid "%ls: Process %d, '%ls' %ls'%ls' terminated by signal %ls (%ls)"
msgstr ""
"%ls: Process %d, “%ls” from job %d, “%ls” terminated by signal %ls (%ls)"
-#: proc.cpp:736
+#: proc.cpp:828
msgid "ended"
msgstr "ended"
-#: proc.cpp:969
+#: proc.cpp:1065
msgid "An error occured while reading output from code block"
msgstr "An error occured while reading output from code block"
-#: proc.cpp:998 proc.cpp:1010
+#: proc.cpp:1094 proc.cpp:1106
#, c-format
msgid "Could not send job %d ('%ls') to foreground"
msgstr "Could not send job %d (“%ls”) to foreground"
-#: proc.cpp:1030 proc.cpp:1040 proc.cpp:1055
+#: proc.cpp:1126 proc.cpp:1136 proc.cpp:1151
msgid "Could not return shell to foreground"
msgstr "Could not return shell to foreground"
-#: proc.cpp:1280 proc.cpp:1304
+#: proc.cpp:1354 proc.cpp:1380
msgid "Process list pointer"
msgstr "Process list pointer"
-#: proc.cpp:1291
+#: proc.cpp:1365
#, c-format
msgid "More than one job in foreground: job 1: '%ls' job 2: '%ls'"
msgstr "More than one job in foreground: job 1: “%ls” job 2: “%ls”"
-#: proc.cpp:1302
+#: proc.cpp:1378
msgid "Process argument list"
msgstr "Process argument list"
-#: proc.cpp:1303
+#: proc.cpp:1379
msgid "Process name"
msgstr "Process name"
-#: proc.cpp:1309
+#: proc.cpp:1385
#, c-format
msgid "Job '%ls', process '%ls' has inconsistent state 'stopped'=%d"
msgstr "Job “%ls”, process “%ls” has inconsistent state “stopped”=%d"
-#: proc.cpp:1319
+#: proc.cpp:1395
#, c-format
msgid "Job '%ls', process '%ls' has inconsistent state 'completed'=%d"
msgstr "Job “%ls”, process “%ls” has inconsistent state “completed”=%d"
-#: reader.cpp:453
+#: reader.cpp:478
msgid "Could not set terminal mode for new job"
msgstr "Could not set terminal mode for new job"
-#: reader.cpp:477
+#: reader.cpp:525
msgid "Could not set terminal mode for shell"
msgstr "Could not set terminal mode for shell"
-#: reader.cpp:2133
+#: reader.cpp:2059
msgid "No TTY for interactive shell (tcgetpgrp failed)"
msgstr ""
-#: reader.cpp:2148
+#: reader.cpp:2074
#, c-format
msgid ""
"I appear to be an orphaned process, so I am quitting politely. My pid is %d."
msgstr ""
-#: reader.cpp:2179
+#: reader.cpp:2105
msgid "Couldn't put the shell in its own process group"
msgstr "Couldn't put the shell in its own process group"
-#: reader.cpp:2189
+#: reader.cpp:2115
msgid "Couldn't grab control of terminal"
msgstr "Couldn't grab control of terminal"
-#: reader.cpp:2703
+#: reader.cpp:2616
msgid "Pop null reader block"
msgstr "Pop null reader block"
-#: reader.cpp:2956
+#: reader.cpp:2882
msgid ""
"There are stopped jobs. A second attempt to exit will enforce their "
"termination.\n"
msgstr ""
-#: reader.cpp:4069
+#: reader.cpp:4115
#, c-format
msgid "Unknown keybinding %d"
msgstr "Unknown keybinding %d"
-#: reader.cpp:4210
+#: reader.cpp:4226
msgid "Error while reading from file descriptor"
msgstr "Error while reading from file descriptor"
-#: reader.cpp:4227
+#: reader.cpp:4243
msgid "Error while closing input stream"
msgstr "Error while closing input stream"
-#: reader.cpp:4248
+#: reader.cpp:4270
msgid "Error while opening input stream"
msgstr "Error while opening input stream"
@@ -1618,7 +1517,7 @@ msgstr "Run job in background"
msgid "Comment"
msgstr "Comment"
-#: tokenizer.cpp:602
+#: tokenizer.cpp:561
msgid "Invalid token type"
msgstr "Invalid token type"
@@ -1662,7 +1561,7 @@ msgstr "%ls: Illegal option -- %lc\n"
msgid "%ls: Invalid option -- %lc\n"
msgstr "%ls: Invalid option -- %lc\n"
-#: wgetopt.cpp:673
+#: wgetopt.cpp:676
#, c-format
msgid "%ls: Option requires an argument -- %lc\n"
msgstr "%ls: Option requires an argument -- %lc\n"
@@ -1675,7 +1574,7 @@ msgstr "Executable"
msgid "Executable link"
msgstr "Executable link"
-#: wildcard.cpp:67 share/completions/git.fish:146
+#: wildcard.cpp:67 share/completions/git.fish:178
msgid "File"
msgstr "File"
@@ -1803,31 +1702,24 @@ msgstr "%ls: Argument “%ls” is not a number\n"
msgid "An error occurred while setting up pipe"
msgstr "An error occurred while setting up pipe"
-#: expand.h:132
+#: expand.h:135
msgid "Array index out of bounds"
msgstr "Array index out of bounds"
-#: output.h:91
-#, c-format
-msgid ""
-"Tried to use terminfo string %s on line %d of %s, which is undefined in "
-"terminal of type \"%ls\". Please report this error to %s"
-msgstr ""
-
-#: parse_constants.h:145
+#: parse_constants.h:185
#, c-format
msgid ""
"The function '%ls' calls itself immediately, which would result in an "
"infinite loop."
msgstr ""
-#: parse_constants.h:149
+#: parse_constants.h:189
msgid ""
"The function call stack limit has been exceeded. Do you have an accidental "
"infinite loop?"
msgstr ""
-#: parse_constants.h:152
+#: parse_constants.h:192
#, fuzzy
msgid ""
"Expected a command, but instead found a pipe. Did you mean 'COMMAND; or "
@@ -1838,10 +1730,10 @@ msgstr ""
"COMMAND”? See the help section for the “or” builtin command by typing “help "
"or”."
-#: parse_constants.h:155
+#: parse_constants.h:195
#, fuzzy
msgid ""
-"Expected a command, but instead found a '&'. Did you mean 'COMMAND; and "
+"Expected a command, but instead found an '&'. Did you mean 'COMMAND; and "
"COMMAND'? See the help section for the 'and' builtin command by typing 'help "
"and'."
msgstr ""
@@ -1849,22 +1741,61 @@ msgstr ""
"COMMAND”? See the help section for the “and” builtin command by typing “help "
"and”."
-#: parse_constants.h:161
+#: parse_constants.h:198
+#, c-format
+msgid "Illegal command name '%ls'"
+msgstr "Illegal command name “%ls”"
+
+#: parse_constants.h:201
+#, c-format
+msgid "Unknown builtin '%ls'"
+msgstr "未知的内置命令 “%ls”"
+
+#: parse_constants.h:204
#, fuzzy, c-format
msgid "Unable to expand variable name '%ls'"
msgstr "%ls: Invalid variable name “%ls”\n"
-#: parse_constants.h:170
+#: parse_constants.h:207
+#, fuzzy, c-format
+msgid "Unable to find a process '%ls'"
+msgstr "Failed to execute process “%ls”"
+
+#: parse_constants.h:210
+#, fuzzy, c-format
+msgid "Illegal file descriptor in redirection '%ls'"
+msgstr "Illegal file descriptor “%ls”"
+
+#: parse_constants.h:213
+#, c-format
+msgid "No matches for wildcard '%ls'."
+msgstr ""
+
+#: parse_constants.h:216
#, fuzzy
msgid "break command while not inside of loop"
msgstr "Loop control command while not inside of loop"
-#: parse_constants.h:173
+#: parse_constants.h:219
#, fuzzy
msgid "continue command while not inside of loop"
msgstr "Loop control command while not inside of loop"
-#: parse_constants.h:184
+#: parse_constants.h:222
+msgid "'return' builtin command outside of function definition"
+msgstr "“return” builtin command outside of function definition"
+
+#: parse_constants.h:225
+#, fuzzy, c-format
+msgid ""
+"Unknown command '%ls'. Did you mean 'set %ls %ls'? See the help section on "
+"the set command by typing 'help set'."
+msgstr ""
+"Unknown command “%ls”. Did you mean “set %ls %ls”? For information on "
+"assigning values to variables, see the help section on the set command by "
+"typing “help set”."
+
+#: parse_constants.h:230
#, c-format
msgid ""
"The '$' character begins a variable name. The character '%lc', which "
@@ -1877,13 +1808,13 @@ msgstr ""
"variable names may not be zero characters long. To learn more about variable "
"expansion in fish, type “help expand-variable”."
-#: parse_constants.h:189
+#: parse_constants.h:235
msgid ""
"$? is not a valid variable in fish. If you want the exit status of the last "
"command, try $status."
msgstr ""
-#: parse_constants.h:194
+#: parse_constants.h:240
msgid ""
"The '$' begins a variable name. It was given at the end of an argument. "
"Variable names may not be zero characters long. To learn more about variable "
@@ -1893,7 +1824,7 @@ msgstr ""
"Variable names may not be zero characters long. To learn more about variable "
"expansion in fish, type “help expand-variable”."
-#: parse_constants.h:199
+#: parse_constants.h:245
#, c-format
msgid ""
"Did you mean %ls{$%ls}%ls? The '$' character begins a variable name. A "
@@ -1906,7 +1837,7 @@ msgstr ""
"variable name, and variable names may not be zero characters long. To learn "
"more about variable expansion in fish, type “help expand-variable”."
-#: parse_constants.h:204
+#: parse_constants.h:250
msgid ""
"Did you mean (COMMAND)? In fish, the '$' character is only used for "
"accessing variables. To learn more about command substitution in fish, type "
@@ -3036,228 +2967,325 @@ msgstr "Test if aptitude has yet to be given the subcommand"
msgid "Test if bundle has been given a specific subcommand"
msgstr "Test if aptitude has yet to be given the subcommand"
-#: share/completions/bundle.fish:30
+#: share/completions/bundle.fish:31
#, fuzzy
msgid "Display a help page"
msgstr "Display man page"
-#: share/completions/bundle.fish:38 share/completions/bundle.fish:65
+#: share/completions/bundle.fish:39 share/completions/bundle.fish:83
msgid "Install the gems specified by the Gemfile or Gemfile.lock"
msgstr ""
-#: share/completions/bundle.fish:39 share/completions/bundle.fish:87
-msgid "The location of the Gemfile bundler should use."
-msgstr ""
-
-#: share/completions/bundle.fish:40
+#: share/completions/bundle.fish:40 share/completions/bundle.fish:106
#, fuzzy
-msgid "The location to install the gems in the bundle to."
+msgid "The location of the Gemfile bundler should use"
msgstr "Commit an unversioned file or tree into the repository"
#: share/completions/bundle.fish:41
-msgid "Installs the gems in the bundle to the system location."
-msgstr ""
+#, fuzzy
+msgid "The location to install the gems in the bundle to"
+msgstr "Commit an unversioned file or tree into the repository"
#: share/completions/bundle.fish:42
-msgid "A space-separated list of groups to skip installing."
-msgstr ""
+#, fuzzy
+msgid "Installs the gems in the bundle to the system location"
+msgstr "Commit an unversioned file or tree into the repository"
#: share/completions/bundle.fish:43
-msgid "Use cached gems instead of connecting to rubygems.org."
+msgid "A space-separated list of groups to skip installing"
msgstr ""
#: share/completions/bundle.fish:44
-msgid "Switches bundler's defaults into deployment mode."
+msgid "Use cached gems instead of connecting to rubygems.org"
msgstr ""
#: share/completions/bundle.fish:45
-msgid ""
-"Create a directory containing executabes that run in the context of the "
-"bundle."
+msgid "Switches bundler's defaults into deployment mode."
msgstr ""
#: share/completions/bundle.fish:46
-msgid "Specify a ruby executable to use with generated binstubs."
+msgid ""
+"Create a directory containing executabes that run in the context of the "
+"bundle"
msgstr ""
#: share/completions/bundle.fish:47
-msgid "Make a bundle that can work without RubyGems or Bundler at run-time."
+msgid "Specify a ruby executable to use with generated binstubs"
msgstr ""
#: share/completions/bundle.fish:48
-msgid "Apply a RubyGems security policy: {High,Medium,Low,No}Security"
+msgid "Make a bundle that can work without RubyGems or Bundler at run-time"
msgstr ""
#: share/completions/bundle.fish:49
-msgid "Do not update the cache in vendor/cache with the newly bundled gems."
+msgid "Apply a RubyGems security policy: {High,Medium,Low,No}Security"
msgstr ""
#: share/completions/bundle.fish:50
+msgid "Install gems parallely by starting size number of parallel workers"
+msgstr ""
+
+#: share/completions/bundle.fish:51
+msgid "Do not update the cache in vendor/cache with the newly bundled gems"
+msgstr ""
+
+#: share/completions/bundle.fish:52
#, fuzzy
-msgid "Do not print progress information to stdout."
+msgid "Do not print progress information to stdout"
msgstr "Don't print group information"
-#: share/completions/bundle.fish:53 share/completions/bundle.fish:66
+#: share/completions/bundle.fish:53
+#, fuzzy
+msgid "Run bundle clean automatically after install"
+msgstr "Upgrade package if already installed"
+
+#: share/completions/bundle.fish:54 share/completions/bundle.fish:63
+msgid "Use the rubygems modern index instead of the API endpoint"
+msgstr ""
+
+#: share/completions/bundle.fish:55 share/completions/bundle.fish:164
+#, fuzzy
+msgid "Do not remove stale gems from the cache"
+msgstr "Remove all gz files from cache"
+
+#: share/completions/bundle.fish:56
+msgid "Do not allow the Gemfile.lock to be updated after this install"
+msgstr ""
+
+#: share/completions/bundle.fish:59 share/completions/bundle.fish:84
#, fuzzy
msgid "Update dependencies to their latest versions"
msgstr "Updates packages to the best version available"
-#: share/completions/bundle.fish:54
-msgid "The name of a :git or :path source used in the Gemfile."
+#: share/completions/bundle.fish:60
+msgid "The name of a :git or :path source used in the Gemfile"
+msgstr ""
+
+#: share/completions/bundle.fish:61
+msgid "Do not attempt to fetch gems remotely and use the gem cache instead"
+msgstr ""
+
+#: share/completions/bundle.fish:62
+msgid "Only output warnings and errors"
msgstr ""
-#: share/completions/bundle.fish:58
+#: share/completions/bundle.fish:64
+#, fuzzy
+msgid "Specify the number of jobs to run in parallel"
+msgstr "Specifies the number of data bytes to be sent"
+
+#: share/completions/bundle.fish:65
+#, fuzzy
+msgid "Update a specific group"
+msgstr "Use a specified tag"
+
+#: share/completions/bundle.fish:69
msgid ""
"Package the .gem files required by your application into the vendor/cache "
"directory"
msgstr ""
-#: share/completions/bundle.fish:61 share/completions/bundle.fish:68
+#: share/completions/bundle.fish:72
+#, fuzzy
+msgid "Install the binstubs of the listed gem"
+msgstr "Display the pretend output in a tabular form"
+
+#: share/completions/bundle.fish:73
+#, fuzzy
+msgid "Binstub destination directory (default bin)"
+msgstr "Install documentation files (default)"
+
+#: share/completions/bundle.fish:74
+msgid "Overwrite existing binstubs if they exist"
+msgstr ""
+
+#: share/completions/bundle.fish:78 share/completions/bundle.fish:86
msgid "Execute a script in the context of the current bundle"
msgstr ""
-#: share/completions/bundle.fish:64
+#: share/completions/bundle.fish:79
+msgid "Exec runs a command, providing it access to the gems in the bundle"
+msgstr ""
+
+#: share/completions/bundle.fish:82
msgid "Describe available tasks or one specific task"
msgstr ""
-#: share/completions/bundle.fish:67
+#: share/completions/bundle.fish:85
#, fuzzy
msgid "Package .gem files into the vendor/cache directory"
msgstr "Change working directory"
-#: share/completions/bundle.fish:69
+#: share/completions/bundle.fish:87
+#, fuzzy
+msgid "Specify and read configuration options for bundler"
+msgstr "Specify a configuration file"
+
+#: share/completions/bundle.fish:88
msgid "Check bundler requirements for your application"
msgstr ""
-#: share/completions/bundle.fish:70 share/completions/bundle.fish:92
+#: share/completions/bundle.fish:89
#, fuzzy
msgid "Show all of the gems in the current bundle"
msgstr "Do not ever ascend to the parent directory"
-#: share/completions/bundle.fish:71 share/completions/bundle.fish:96
+#: share/completions/bundle.fish:90
#, fuzzy
msgid "Show the source location of a particular gem in the bundle"
msgstr "Show the process id of each process in the job"
-#: share/completions/bundle.fish:72 share/completions/bundle.fish:100
+#: share/completions/bundle.fish:91 share/completions/bundle.fish:121
msgid "Show all of the outdated gems in the current bundle"
msgstr ""
-#: share/completions/bundle.fish:73 share/completions/bundle.fish:107
+#: share/completions/bundle.fish:92 share/completions/bundle.fish:129
msgid "Start an IRB session in the context of the current bundle"
msgstr ""
-#: share/completions/bundle.fish:74 share/completions/bundle.fish:110
+#: share/completions/bundle.fish:93 share/completions/bundle.fish:132
#, sh-format
msgid "Open an installed gem in your $EDITOR"
msgstr ""
-#: share/completions/bundle.fish:75 share/completions/bundle.fish:114
+#: share/completions/bundle.fish:94 share/completions/bundle.fish:136
msgid "Generate a visual representation of your dependencies"
msgstr ""
-#: share/completions/bundle.fish:76
+#: share/completions/bundle.fish:95
#, fuzzy
msgid "Generate a simple Gemfile"
msgstr "Generate master file"
-#: share/completions/bundle.fish:77 share/completions/bundle.fish:125
+#: share/completions/bundle.fish:96 share/completions/bundle.fish:147
msgid "Create a simple gem, suitable for development with bundler"
msgstr ""
-#: share/completions/bundle.fish:78 share/completions/bundle.fish:131
+#: share/completions/bundle.fish:97 share/completions/bundle.fish:154
#, fuzzy
msgid "Displays platform compatibility information"
msgstr "Display update information"
-#: share/completions/bundle.fish:79 share/completions/bundle.fish:135
+#: share/completions/bundle.fish:98 share/completions/bundle.fish:158
msgid "Cleans up unused gems in your bundler directory"
msgstr ""
-#: share/completions/bundle.fish:86
+#: share/completions/bundle.fish:105
msgid ""
"Determine whether the requirements for your application are installed and "
"available to bundler"
msgstr ""
-#: share/completions/bundle.fish:88
-msgid "Specify a path other than the system default (BUNDLE_PATH or GEM_HOME)."
+#: share/completions/bundle.fish:107
+msgid "Specify a path other than the system default (BUNDLE_PATH or GEM_HOME)"
msgstr ""
-#: share/completions/bundle.fish:89
+#: share/completions/bundle.fish:108
#, fuzzy
msgid "Lock the Gemfile"
msgstr "Log to tracefile"
-#: share/completions/bundle.fish:93
+#: share/completions/bundle.fish:111 share/completions/bundle.fish:116
+msgid ""
+"Show lists the names and versions of all gems that are required by your "
+"Gemfile"
+msgstr ""
+
+#: share/completions/bundle.fish:112 share/completions/bundle.fish:117
msgid "List the paths of all gems required by your Gemfile"
msgstr ""
-#: share/completions/bundle.fish:101
+#: share/completions/bundle.fish:122
#, fuzzy
msgid "Check for newer pre-release gems"
msgstr "Check for memory leaks"
-#: share/completions/bundle.fish:102
+#: share/completions/bundle.fish:123
msgid "Check against a specific source"
msgstr ""
-#: share/completions/bundle.fish:103
+#: share/completions/bundle.fish:124
msgid "Use cached gems instead of attempting to fetch gems remotely"
msgstr ""
-#: share/completions/bundle.fish:115
+#: share/completions/bundle.fish:125
+msgid "Only list newer versions allowed by your Gemfile requirements"
+msgstr ""
+
+#: share/completions/bundle.fish:137
msgid "The name to use for the generated file (see format option)"
msgstr ""
-#: share/completions/bundle.fish:116
+#: share/completions/bundle.fish:138
#, fuzzy
msgid "Show each gem version"
msgstr "Source tree version"
-#: share/completions/bundle.fish:117
+#: share/completions/bundle.fish:139
msgid "Show the version of each required dependency"
msgstr ""
-#: share/completions/bundle.fish:118
+#: share/completions/bundle.fish:140
msgid "Output a specific format (png, jpg, svg, dot, ...)"
msgstr ""
-#: share/completions/bundle.fish:121
+#: share/completions/bundle.fish:143
#, fuzzy
msgid "Generate a simple Gemfile, placed in the current directory"
msgstr "Do not ever ascend to the parent directory"
-#: share/completions/bundle.fish:122
+#: share/completions/bundle.fish:144
msgid "Use a specified .gemspec to create the Gemfile"
msgstr ""
-#: share/completions/bundle.fish:126
+#: share/completions/bundle.fish:148
msgid "Generate a binary for your library"
msgstr ""
-#: share/completions/bundle.fish:127
+#: share/completions/bundle.fish:149
msgid "Generate a test directory for your library (rspec or minitest)"
msgstr ""
-#: share/completions/bundle.fish:128
+#: share/completions/bundle.fish:150
#, fuzzy
msgid "Path to your editor"
msgstr "Set source directory"
-#: share/completions/bundle.fish:132
+#: share/completions/bundle.fish:151
+msgid "Generate the boilerplate for C extension code"
+msgstr ""
+
+#: share/completions/bundle.fish:155
#, fuzzy
msgid "Only display Ruby directive information"
msgstr "Display update information"
-#: share/completions/bundle.fish:136
+#: share/completions/bundle.fish:159
msgid "Only print out changes, do not actually clean gems"
msgstr ""
-#: share/completions/bundle.fish:137
+#: share/completions/bundle.fish:160
msgid "Forces clean even if --path is not set"
msgstr ""
+#: share/completions/bundle.fish:163
+msgid "Cache all the gems to vendor/cache"
+msgstr ""
+
+#: share/completions/bundle.fish:165
+msgid "Include all sources (including path and git)"
+msgstr ""
+
+#: share/completions/bundle.fish:168
+#, fuzzy
+msgid "Prints the license of all gems in the bundle"
+msgstr "Commit an unversioned file or tree into the repository"
+
+#: share/completions/bundle.fish:171
+#, fuzzy
+msgid "Print information about the environment Bundler is running under"
+msgstr "Output extra information about the work being done"
+
#: share/completions/configure.fish:1
#: share/functions/__fish_complete_diff.fish:27
#: share/functions/__fish_complete_grep.fish:22
@@ -3270,19 +3298,15 @@ msgstr "Display help and exit"
msgid "Cache test results in specified file"
msgstr "Cache test results in specified file"
-#: share/completions/cp.fish:10 share/completions/mv.fish:6
+#: share/completions/cp.fish:11 share/completions/mv.fish:6
msgid "Backup suffix"
msgstr "Backup suffix"
#: share/completions/cp.fish:20
-msgid "Don't preserve the specified attributes"
-msgstr "Don't preserve the specified attributes"
-
-#: share/completions/cp.fish:24
-msgid "Control creation of sparse files"
-msgstr "Control creation of sparse files"
+msgid "Preserve ATTRIBUTES if possible"
+msgstr ""
-#: share/completions/cp.fish:28
+#: share/completions/cp.fish:29
msgid "Set security context of copy to CONTEXT"
msgstr "Set security context of copy to CONTEXT"
@@ -3901,6 +3925,33 @@ msgstr "Show filesystems of specified type"
msgid "Block size"
msgstr "Block size"
+#: share/completions/docker.fish:19
+#, fuzzy
+msgid "Show all containers"
+msgstr "Show arp entries"
+
+#: share/completions/docker.fish:24
+#, fuzzy
+msgid "Show the running containers"
+msgstr "Show hidden functions"
+
+#: share/completions/docker.fish:28
+#, fuzzy
+msgid "Show the exited containers"
+msgstr "Show the time"
+
+#: share/completions/docker.fish:70 share/completions/docker.fish:92
+msgid "Docker container"
+msgstr ""
+
+#: share/completions/docker.fish:82
+msgid "Stopped container"
+msgstr ""
+
+#: share/completions/docker.fish:87
+msgid "Container running"
+msgstr ""
+
#: share/completions/du.fish:15
#, fuzzy
msgid "Exclude files that match pattern in file"
@@ -3914,96 +3965,96 @@ msgstr "Exclude files that match pattern"
msgid "Recursion limit"
msgstr "Recursion limit"
-#: share/completions/duply.fish:5
+#: share/completions/duply.fish:3
#, fuzzy
msgid "Profile"
msgstr "Conf file"
-#: share/completions/duply.fish:6
+#: share/completions/duply.fish:4
msgid "Get usage help text"
msgstr ""
-#: share/completions/duply.fish:9
+#: share/completions/duply.fish:7
#, fuzzy
msgid "Creates a configuration profile"
msgstr "Set configuration file"
-#: share/completions/duply.fish:10
+#: share/completions/duply.fish:8
msgid "Backup with pre/post script execution"
msgstr ""
-#: share/completions/duply.fish:11
+#: share/completions/duply.fish:9
#, fuzzy
msgid "Backup without executing pre/post scripts"
msgstr "Don't execute post scripts"
-#: share/completions/duply.fish:12
+#: share/completions/duply.fish:10
#, fuzzy
msgid "Execute <profile>/pre script"
msgstr "Don't execute pre scripts"
-#: share/completions/duply.fish:13
+#: share/completions/duply.fish:11
#, fuzzy
msgid "Execute <profile>/post script"
msgstr "Don't execute post scripts"
-#: share/completions/duply.fish:14
+#: share/completions/duply.fish:12
msgid "Force full backup"
msgstr ""
-#: share/completions/duply.fish:15
+#: share/completions/duply.fish:13
msgid "Force incremental backup"
msgstr ""
-#: share/completions/duply.fish:16
+#: share/completions/duply.fish:14
msgid "List all files in backup (as it was at <age>, default: now)"
msgstr ""
-#: share/completions/duply.fish:17
+#: share/completions/duply.fish:15
msgid "Prints backup sets and chains currently in repository"
msgstr ""
-#: share/completions/duply.fish:18
+#: share/completions/duply.fish:16
msgid "List files changed since latest backup"
msgstr ""
-#: share/completions/duply.fish:19
+#: share/completions/duply.fish:17
msgid "Shows outdated backup archives [--force, delete these files]"
msgstr ""
-#: share/completions/duply.fish:20
+#: share/completions/duply.fish:18
msgid "Shows outdated backups [--force, delete these files]"
msgstr ""
-#: share/completions/duply.fish:21
+#: share/completions/duply.fish:19
msgid "Shows broken backup archives [--force, delete these files]"
msgstr ""
-#: share/completions/duply.fish:22
+#: share/completions/duply.fish:20
msgid "Restore the backup to <target_path> [as it was at <age>]"
msgstr ""
-#: share/completions/duply.fish:23
+#: share/completions/duply.fish:21
msgid "Restore single file/folder from backup [as it was at <age>]"
msgstr ""
-#: share/completions/duply.fish:26
+#: share/completions/duply.fish:24
msgid "Really execute the commands: purge, purge-full, cleanup"
msgstr ""
-#: share/completions/duply.fish:27
+#: share/completions/duply.fish:25
msgid "Do nothing but print out generated duplicity command lines"
msgstr ""
-#: share/completions/duply.fish:28
+#: share/completions/duply.fish:26
msgid "Calculate what would be done, but dont perform any actions"
msgstr ""
-#: share/completions/duply.fish:29
+#: share/completions/duply.fish:27
msgid "Dont abort when backup different dirs to the same backend"
msgstr ""
-#: share/completions/duply.fish:30
+#: share/completions/duply.fish:28
#, fuzzy
msgid "Output verbosity level"
msgstr "Output sources.list file"
@@ -4014,76 +4065,27 @@ msgid ""
msgstr ""
"Prints completions for installed packages on the system from /var/db/pkg"
-#: share/completions/emerge.fish:12 share/completions/equery.fish:12
+#: share/completions/emerge.fish:13 share/completions/equery.fish:12
#, fuzzy
msgid ""
"Prints completions for all available packages on the system from /usr/portage"
msgstr ""
"Prints completions for installed packages on the system from /var/db/pkg"
-#: share/completions/emerge.fish:19
+#: share/completions/emerge.fish:22
#, fuzzy
msgid ""
"Tests if emerge command should have an installed package as potential "
"completion"
msgstr "Test if emerge command should have packages as potential completion"
-#: share/completions/emerge.fish:30 share/completions/emerge.fish:31
+#: share/completions/emerge.fish:32
#, fuzzy
-msgid "All base system packages"
-msgstr "Erase built packages"
-
-#: share/completions/emerge.fish:30 share/completions/emerge.fish:31
-#, fuzzy
-msgid "All packages in world"
-msgstr "Sync packages installed"
-
-#: share/completions/emerge.fish:30
-#, fuzzy
-msgid "Installed package"
-msgstr "Install new package"
-
-#: share/completions/emerge.fish:31
-#: share/functions/__fish_print_packages.fish:13
-msgid "Package"
-msgstr "Package"
-
-#: share/completions/emerge.fish:35
-msgid "Usage overview of emerge"
-msgstr ""
-
-#: share/completions/emerge.fish:35
-msgid "Help on subject system"
-msgstr ""
-
-#: share/completions/emerge.fish:35
-#, fuzzy
-msgid "Help on subject config"
-msgstr "Help section"
-
-#: share/completions/emerge.fish:35
-#, fuzzy
-msgid "Help on subject sync"
-msgstr "Help section"
-
-#: share/completions/emerge.fish:57
-#, fuzzy
-msgid "Use colors in output"
-msgstr "Use colors"
-
-#: share/completions/emerge.fish:57
-msgid "Don't use colors in output"
+msgid ""
+"Print completions for all packages including the version compare if that is "
+"already typed"
msgstr ""
-
-#: share/completions/emerge.fish:81
-#, fuzzy
-msgid "Pull in build time dependencies"
-msgstr "Show build dependencies"
-
-#: share/completions/emerge.fish:81
-#, fuzzy
-msgid "Don't pull in build time dependencies"
-msgstr "Don't automatically fulfill dependencies"
+"Prints completions for installed packages on the system from /var/db/pkg"
#: share/completions/env.fish:2
#, fuzzy
@@ -4618,11 +4620,16 @@ msgstr ""
msgid "Update the RubyGems system software"
msgstr ""
-#: share/completions/git.fish:121 share/completions/git.fish:144
+#: share/completions/git.fish:98
+#, fuzzy
+msgid "name"
+msgstr "Username"
+
+#: share/completions/git.fish:153 share/completions/git.fish:176
msgid "Branch"
msgstr ""
-#: share/completions/git.fish:145
+#: share/completions/git.fish:177
#, fuzzy
msgid "Tag"
msgstr "Target"
@@ -4865,840 +4872,699 @@ msgstr "Help on command substitution (SUBCOMMAND)"
msgid "Help on process expansion %JOB"
msgstr "Help on process expansion %JOB"
-#: share/completions/hg.fish:17
-#, fuzzy
-msgid "add the specified files on the next commit"
-msgstr "Add specified file to the current list of keyrings"
+#: share/completions/history.fish:1
+msgid "Match history items that start with the given prefix"
+msgstr ""
-#: share/completions/hg.fish:18
-msgid "add all new files, delete all missing files"
+#: share/completions/history.fish:2
+msgid "Match history items that contain the given string"
msgstr ""
-#: share/completions/hg.fish:19
-#, fuzzy
-msgid "show changeset information by line for each file"
-msgstr "Display change information for the package"
+#: share/completions/ifconfig.fish:1
+msgid "Stop interface"
+msgstr "Stop interface"
+
+#: share/completions/ifconfig.fish:2
+msgid "Start interface"
+msgstr "Start interface"
+
+#: share/completions/ifconfig.fish:25 share/completions/ifdown.fish:1
+#: share/completions/ifup.fish:1
+msgid "Network interface"
+msgstr "Network interface"
-#: share/completions/hg.fish:20
+#: share/completions/kitchen.fish:3
#, fuzzy
-msgid "create an unversioned archive of a repository revision"
-msgstr "Commit an unversioned file or tree into the repository"
+msgid "Test if kitchen has yet to be given the main command"
+msgstr "Test if apt has yet to be given the subcommand"
-#: share/completions/hg.fish:21
-msgid "reverse effect of earlier changeset"
-msgstr ""
+#: share/completions/less.fish:3
+msgid "Buffer space"
+msgstr "Buffer space"
-#: share/completions/hg.fish:22
-msgid "subdivision search of changesets"
+#: share/completions/lsusb.fish:2
+msgid "Show only devices with specified device and/or bus numbers (in decimal)"
msgstr ""
-#: share/completions/hg.fish:23
-msgid "track a line of development with movable markers"
-msgstr ""
+#: share/completions/make.fish:12
+msgid "Target"
+msgstr "Target"
-#: share/completions/hg.fish:24
-msgid "set or show the current branch name"
-msgstr ""
+#: share/completions/make.fish:13
+msgid "Use file as makefile"
+msgstr "Use file as makefile"
-#: share/completions/hg.fish:25
-#, fuzzy
-msgid "list repository named branches"
-msgstr "Disable repository"
+#: share/completions/make.fish:18
+msgid "Search directory for makefile"
+msgstr "Search directory for makefile"
-#: share/completions/hg.fish:26
-#, fuzzy
-msgid "create a changegroup file"
-msgstr "Read package from file"
+#: share/completions/make.fish:19
+msgid "Number of concurrent jobs"
+msgstr "Number of concurrent jobs"
-#: share/completions/hg.fish:27
-#, fuzzy
-msgid "output the current or given revision of files"
-msgstr "Show the log messages for a set of revision(s) and/or file(s)"
+#: share/completions/make.fish:23
+msgid "Ignore specified file"
+msgstr "Ignore specified file"
-#: share/completions/hg.fish:28
-#, fuzzy
-msgid "make a copy of an existing repository"
-msgstr "Create a local copy of another repository"
+#: share/completions/make.fish:32
+msgid "Pretend file is modified"
+msgstr "Pretend file is modified"
-#: share/completions/hg.fish:29
-#, fuzzy
-msgid "commit the specified files or all outstanding changes"
-msgstr "Decrypt specified file or stdin"
+#: share/completions/makedepend.fish:1
+msgid "Define"
+msgstr "Define"
-#: share/completions/hg.fish:30
-msgid "mark files as copied for the next commit"
-msgstr ""
+#: share/completions/makedepend.fish:2
+msgid "Include directory"
+msgstr "Include directory"
-#: share/completions/hg.fish:31
-msgid "diff repository (or selected files)"
-msgstr ""
+#: share/completions/makedepend.fish:3
+msgid "Replace include directories"
+msgstr "Replace include directories"
-#: share/completions/hg.fish:32
-msgid "dump the header and diffs for one or more changesets"
-msgstr ""
+#: share/completions/makedepend.fish:5
+msgid "Specify makefile"
+msgstr "Specify makefile"
-#: share/completions/hg.fish:33
-#, fuzzy
-msgid "forget the specified files on the next commit"
-msgstr "Move file specified on commandline"
+#: share/completions/makedepend.fish:6
+msgid "Prepend file to input"
+msgstr "Prepend file to input"
-#: share/completions/hg.fish:34
-#, fuzzy
-msgid "copy changes from other branches onto the current branch"
-msgstr "Bring changes from the repository into the working copy"
+#: share/completions/makedepend.fish:7
+msgid "Object file suffix"
+msgstr "Object file suffix"
-#: share/completions/hg.fish:35
-msgid "search for a pattern in specified files and revisions"
-msgstr ""
+#: share/completions/makedepend.fish:8
+msgid "Object file prefix"
+msgstr "Object file prefix"
-#: share/completions/hg.fish:36
-msgid "show current repository heads or show branch heads"
-msgstr ""
+#: share/completions/makedepend.fish:9
+msgid "Starting string delimiter"
+msgstr "Starting string delimiter"
+
+#: share/completions/makedepend.fish:10
+msgid "Line width"
+msgstr "Line width"
-#: share/completions/hg.fish:37
-msgid "show help for a given topic or a help overview"
+#: share/completions/mosh.fish:20
+msgid "Controls use of speculative local echo"
msgstr ""
-#: share/completions/hg.fish:38
-#, fuzzy
-msgid "identify the working copy or specified revision"
-msgstr "Update the working copy to a different URL"
+#: share/completions/mount.fish:19
+msgid "Mount partition with specified label"
+msgstr "Mount partition with specified label"
-#: share/completions/hg.fish:39
+#: share/completions/mount.fish:20
+msgid "Mount partition with specified UID"
+msgstr "Mount partition with specified UID"
+
+#: share/completions/mount.fish:21
#, fuzzy
-msgid "import an ordered set of patches"
-msgstr "Print byte offset of matches"
+msgid "Exclude file systems"
+msgstr "Exclude filesystems"
-#: share/completions/hg.fish:40
-msgid "show new changesets found in source"
-msgstr ""
+#: share/completions/mount.fish:22
+msgid "Remount a subtree to a second position"
+msgstr "Remount a subtree to a second position"
-#: share/completions/hg.fish:41
-#, fuzzy
-msgid "create a new repository in the given directory"
-msgstr "Create a CVS repository if it doesnt exist"
+#: share/completions/mount.fish:23
+msgid "Move a subtree to a new position"
+msgstr "Move a subtree to a new position"
-#: share/completions/hg.fish:42
+#: share/completions/mount.fish:24
#, fuzzy
-msgid "locate files matching specific patterns"
-msgstr "Exclude files that match pattern"
+msgid "File system"
+msgstr "Filesystem"
-#: share/completions/hg.fish:43
-msgid "show revision history of entire repository or files"
-msgstr ""
+#: share/completions/mount.fish:26
+msgid "Mount option"
+msgstr "Mount option"
+
+#: share/completions/mplayer.fish:28
+msgid "A/V sync speed"
+msgstr "A/V sync speed"
+
+#: share/completions/mplayer.fish:32
+msgid "Loop playback"
+msgstr "Loop playback"
+
+#: share/completions/mplayer.fish:58 share/completions/mplayer.fish:76
+msgid "Video output"
+msgstr "Video output"
-#: share/completions/hg.fish:44
+#: share/completions/mplayer.fish:64 share/completions/mplayer.fish:70
+msgid "Audio output"
+msgstr "Audio output"
+
+#: share/completions/msgfmt.fish:5
#, fuzzy
-msgid "output the current or given revision of the project manifest"
-msgstr "Show the log messages for a set of revision(s) and/or file(s)"
+msgid "Generate a Java ResourceBundle class"
+msgstr "Generate source index file"
-#: share/completions/hg.fish:45
-msgid "merge working directory with another revision"
+#: share/completions/msgfmt.fish:6
+msgid "Like --java, and assume Java2 (JDK 1.2 or higher)"
msgstr ""
-#: share/completions/hg.fish:46
+#: share/completions/msgfmt.fish:7
#, fuzzy
-msgid "show changesets not found in the destination"
-msgstr "Query packages with the specified group"
+msgid "Generate a .NET .dll file"
+msgstr "Generate master file"
-#: share/completions/hg.fish:47
+#: share/completions/msgfmt.fish:8
#, fuzzy
-msgid "show the parents of the working directory or revision"
-msgstr "Change working directory"
+msgid "Generate a .NET .resources file"
+msgstr "Generate source index file"
-#: share/completions/hg.fish:48
+#: share/completions/msgfmt.fish:9
#, fuzzy
-msgid "show aliases for remote repositories"
-msgstr "Removes entry in .cvspass for remote repository"
-
-#: share/completions/hg.fish:49
-msgid "set or show the current phase name"
-msgstr ""
+msgid "Generate a tcl/msgcat .msg file"
+msgstr "Generate master file"
-#: share/completions/hg.fish:50
+#: share/completions/msgfmt.fish:10
#, fuzzy
-msgid "pull changes from the specified source"
-msgstr "Query packages with the specified group"
+msgid "Generate a Qt .qm file"
+msgstr "Generate master file"
-#: share/completions/hg.fish:51
+#: share/completions/msgfmt.fish:17
#, fuzzy
-msgid "push changes to the specified destination"
-msgstr "Query packages with the specified group"
+msgid "Resource name"
+msgstr "Set volume name"
-#: share/completions/hg.fish:52
-msgid "roll back an interrupted transaction"
+#: share/completions/msgfmt.fish:18
+msgid "Locale name, either language or language_COUNTRY"
msgstr ""
-#: share/completions/hg.fish:53
+#: share/completions/msgfmt.fish:19
#, fuzzy
-msgid "remove the specified files on the next commit"
-msgstr "Move file specified on commandline"
-
-#: share/completions/hg.fish:54
-msgid "rename files; equivalent of copy + remove"
-msgstr ""
+msgid "Base directory for output"
+msgstr "File descriptor for input"
-#: share/completions/hg.fish:55
-msgid "redo merges or set/view the merge status of files"
+#: share/completions/mutt.fish:18
+msgid "An expanded version of the given alias is passed to stdout"
msgstr ""
-#: share/completions/hg.fish:56
-msgid "restore files to their checkout state"
+#: share/completions/mutt.fish:19
+msgid "Attach a file to your message using MIME"
msgstr ""
-#: share/completions/hg.fish:57
-msgid "roll back the last transaction (dangerous)"
+#: share/completions/mutt.fish:20
+msgid "Specify a blind-carbon-copy (BCC) recipient"
msgstr ""
-#: share/completions/hg.fish:58
-#, fuzzy
-msgid "print the root (top) of the current working directory"
-msgstr "Change working directory"
-
-#: share/completions/hg.fish:59
-msgid "start stand-alone webserver"
+#: share/completions/mutt.fish:21
+msgid "Specify a carbon-copy (CC) recipient"
msgstr ""
-#: share/completions/hg.fish:60
-msgid "show combined config settings from all hgrc files"
+#: share/completions/mutt.fish:22
+msgid "Run command after processing of initialization files"
msgstr ""
-#: share/completions/hg.fish:61
-#, fuzzy
-msgid "show changed files in the working directory"
-msgstr "Change working directory"
-
-#: share/completions/hg.fish:62
+#: share/completions/mutt.fish:23
#, fuzzy
-msgid "summarize working directory state"
-msgstr "Print working directory"
+msgid "Specify which mailbox to load"
+msgstr "Specify sendmail command"
-#: share/completions/hg.fish:63
-msgid "add one or more tags for the current or given revision"
+#: share/completions/mutt.fish:24
+msgid "Specify an initialization file to read instead of ~/.muttrc"
msgstr ""
-#: share/completions/hg.fish:64
-#, fuzzy
-msgid "list repository tags"
-msgstr "Disable repository"
+#: share/completions/mutt.fish:25
+msgid "Specify a draft file containing header and body for the message"
+msgstr ""
-#: share/completions/hg.fish:65
-#, fuzzy
-msgid "show the tip revision"
-msgstr "Show the time"
+#: share/completions/mutt.fish:26
+msgid "Specify a file to include into the body of a message"
+msgstr ""
-#: share/completions/hg.fish:66
+#: share/completions/mutt.fish:27
#, fuzzy
-msgid "apply one or more changegroup files"
-msgstr "Read package from file"
+msgid "Specify a default mailbox type"
+msgstr "Specify destination email"
-#: share/completions/hg.fish:67
+#: share/completions/mutt.fish:28
#, fuzzy
-msgid "update working directory (or switch revisions)"
-msgstr "Change working directory"
+msgid "Query a configuration variables value"
+msgstr "Specify a configuration file"
-#: share/completions/hg.fish:68
+#: share/completions/mutt.fish:29
#, fuzzy
-msgid "verify the integrity of the repository"
-msgstr "Remove an entry from the repository"
+msgid "Specify the subject of the message"
+msgstr "Specify commit message"
-#: share/completions/hg.fish:69
-#, fuzzy
-msgid "output version and copyright information"
-msgstr "Ignore version magic information"
+#: share/completions/mv.fish:4
+msgid "Answer for overwrite questions"
+msgstr "Answer for overwrite questions"
-#: share/completions/hg.fish:70
+#: share/completions/node.fish:9
#, fuzzy
-msgid "Configuration Files"
-msgstr "Configuration file"
+msgid "Print node's version"
+msgstr "Print PKG versions"
-#: share/completions/hg.fish:71
+#: share/completions/node.fish:10
#, fuzzy
-msgid "Date Formats"
-msgstr "Set format"
+msgid "Evaluate script"
+msgstr "Extract script"
-#: share/completions/hg.fish:72
+#: share/completions/node.fish:11
#, fuzzy
-msgid "Diff Formats"
-msgstr "List format"
+msgid "Print result of --eval"
+msgstr "Print flat profile"
-#: share/completions/hg.fish:73
+#: share/completions/obnam.fish:9
#, fuzzy
-msgid "Environment Variables"
-msgstr "Handle environment variables"
+msgid "Adds an encryption key to the repository"
+msgstr "Add a new file/directory to the repository"
-#: share/completions/hg.fish:74
-msgid "Using Additional Features"
+#: share/completions/obnam.fish:11
+msgid "Lists the keys associated with each client"
msgstr ""
-#: share/completions/hg.fish:75
+#: share/completions/obnam.fish:12
#, fuzzy
-msgid "Specifying File Sets"
-msgstr "Specify config file"
-
-#: share/completions/hg.fish:76
-msgid "Glossary"
-msgstr ""
-
-#: share/completions/hg.fish:77
-msgid "Syntax for Mercurial Ignore Files"
-msgstr ""
+msgid "Lists the clients in the repository"
+msgstr "Update the repository"
-#: share/completions/hg.fish:78
+#: share/completions/obnam.fish:13
#, fuzzy
-msgid "Configuring hgweb"
-msgstr "Configuration file"
+msgid "Compares two generations"
+msgstr "Tolerate sloppy mount options"
-#: share/completions/hg.fish:79
+#: share/completions/obnam.fish:14
#, fuzzy
-msgid "Merge Tools"
-msgstr "Merge sorted files"
+msgid "Dumps the repository"
+msgstr "Update the repository"
-#: share/completions/hg.fish:80
+#: share/completions/obnam.fish:15
#, fuzzy
-msgid "Specifying Multiple Revisions"
-msgstr "Specify revision"
-
-#: share/completions/hg.fish:81
-msgid "File Name Patterns"
-msgstr ""
-
-#: share/completions/hg.fish:82
-msgid "Working with Phases"
-msgstr ""
+msgid "Removes a lock file for a client"
+msgstr "Remove all gz files from cache"
-#: share/completions/hg.fish:83
+#: share/completions/obnam.fish:16
#, fuzzy
-msgid "Specifying Single Revisions"
-msgstr "Specify revision"
+msgid "Removes backup generations"
+msgstr "Remove completion"
-#: share/completions/hg.fish:84
+#: share/completions/obnam.fish:17
#, fuzzy
-msgid "Specifying Revision Sets"
-msgstr "Specify revision states"
+msgid "Checks the consistency of the repository"
+msgstr "Check the entire repository"
-#: share/completions/hg.fish:85
-msgid "Subrepositories"
+#: share/completions/obnam.fish:18
+msgid "Lists every backup generation"
msgstr ""
-#: share/completions/hg.fish:86
-msgid "Template Usage"
+#: share/completions/obnam.fish:19
+msgid "Lists the identifier for every generation"
msgstr ""
-#: share/completions/hg.fish:87
-msgid "URL Paths"
-msgstr ""
-
-#: share/completions/hg.fish:94 share/completions/hg.fish:433
-#: share/completions/hg.fish:458 share/completions/hg.fish:569
-#: share/completions/hg.fish:579 share/completions/hg.fish:594
-#: share/completions/hg.fish:606 share/completions/hg.fish:671
+#: share/completions/obnam.fish:20
#, fuzzy
-msgid "[+] include names matching the given patterns"
-msgstr "Insert modules matching the given wildcard"
+msgid "Lists the keys"
+msgstr "List trusted keys"
-#: share/completions/hg.fish:95 share/completions/hg.fish:434
-#: share/completions/hg.fish:459 share/completions/hg.fish:570
-#: share/completions/hg.fish:580 share/completions/hg.fish:595
-#: share/completions/hg.fish:607 share/completions/hg.fish:672
+#: share/completions/obnam.fish:21
#, fuzzy
-msgid "[+] exclude names matching the given patterns"
-msgstr "List all modules matching the given wildcard"
-
-#: share/completions/hg.fish:104 share/completions/hg.fish:391
-msgid "Guess renamed files by similarity (0<=s<=100)"
-msgstr ""
+msgid "Lists the toplevel keys"
+msgstr "List trusted keys"
-#: share/completions/hg.fish:105
+#: share/completions/obnam.fish:22
#, fuzzy
-msgid "[+] include names matching the given patterns"
-msgstr "Insert modules matching the given wildcard"
+msgid "Lists the contents of a given generation"
+msgstr "List contents of directory"
-#: share/completions/hg.fish:106
+#: share/completions/obnam.fish:23
#, fuzzy
-msgid "[+] exclude names matching the given patterns"
-msgstr "List all modules matching the given wildcard"
+msgid "Makes the repository available via FUSE"
+msgstr "Update the repository"
-#: share/completions/hg.fish:114
-#, fuzzy
-msgid "Annotate the specified revision"
-msgstr "Help for the specified builtin"
+#: share/completions/obnam.fish:24
+msgid "Check if a backup age exceeds a threshold"
+msgstr ""
-#: share/completions/hg.fish:387
+#: share/completions/obnam.fish:25
#, fuzzy
-msgid "Use text as commit message"
-msgstr "Read commit message from file"
-
-#: share/completions/hg.fish:388
-msgid "Read commit message from file"
-msgstr "Read commit message from file"
+msgid "Removes a client from the repository"
+msgstr "Specify the repository URL"
-#: share/completions/hg.fish:389 share/completions/hg.fish:693
+#: share/completions/obnam.fish:26
#, fuzzy
-msgid "Record the specified date as commit date"
-msgstr "Help for the specified command"
+msgid "Removes a key from the repository"
+msgstr "Create a local copy of another repository"
-#: share/completions/hg.fish:390 share/completions/hg.fish:694
+#: share/completions/obnam.fish:27
#, fuzzy
-msgid "Record the specified user as committer"
-msgstr "Use specified string as comment string"
+msgid "Restore files from the repository"
+msgstr "Check files into the repository"
-#: share/completions/hg.fish:400
+#: share/completions/obnam.fish:28
#, fuzzy
-msgid "File to store the bundles into"
-msgstr "Edit the patch bundle description"
+msgid "Verifies files in the repository"
+msgstr "Check files into the repository"
-#: share/completions/hg.fish:401 share/completions/hg.fish:446
-#: share/completions/hg.fish:448 share/completions/hg.fish:450
-#: share/completions/hg.fish:485 share/completions/hg.fish:534
-#: share/completions/hg.fish:536 share/completions/hg.fish:548
-#: share/completions/hg.fish:550 share/completions/hg.fish:669
-msgid "[+]"
+#: share/completions/obnam.fish:30
+msgid "Restore setuid/setgid bits in restored files"
msgstr ""
-#: share/completions/hg.fish:403
-msgid "[+] a specific branch you would like to pull"
+#: share/completions/obnam.fish:31
+msgid "Do not restore setuid/setgid bits in restored files"
msgstr ""
-#: share/completions/hg.fish:406 share/completions/hg.fish:453
-#: share/completions/hg.fish:491
+#: share/completions/obnam.fish:32
#, fuzzy
-msgid "Limit number of changes displayed"
-msgstr "Only print number of matches"
-
-#: share/completions/hg.fish:409 share/completions/hg.fish:456
-#: share/completions/hg.fish:494 share/completions/hg.fish:507
-#: share/completions/hg.fish:709
-msgid "Display using template map file"
-msgstr ""
+msgid "Name of client"
+msgstr "Negate expression"
-#: share/completions/hg.fish:410 share/completions/hg.fish:457
-#: share/completions/hg.fish:495 share/completions/hg.fish:508
-#: share/completions/hg.fish:710
+#: share/completions/obnam.fish:33
#, fuzzy
-msgid "Display with template"
-msgstr "Display all matches"
+msgid "Compress repository with"
+msgstr "Compress to stdout"
-#: share/completions/hg.fish:411 share/completions/hg.fish:421
-#: share/completions/hg.fish:496 share/completions/hg.fish:537
-#: share/completions/hg.fish:552
-#, fuzzy
-msgid "Specify ssh command to use"
-msgstr "Pass command to shell"
+#: share/completions/obnam.fish:34
+msgid "For --nagios-last-backup-age: maximum age"
+msgstr ""
+
+#: share/completions/obnam.fish:35
+msgid "Dump metadata about files"
+msgstr ""
-#: share/completions/hg.fish:412 share/completions/hg.fish:422
-#: share/completions/hg.fish:497 share/completions/hg.fish:538
-#: share/completions/hg.fish:553
+#: share/completions/obnam.fish:36
#, fuzzy
-msgid "Specify hg command to run on the remote side"
-msgstr "Specify root directory for rpm operations"
+msgid "Do not dump metadata about files"
+msgstr "Do not del built files"
-#: share/completions/hg.fish:430
+#: share/completions/obnam.fish:37
#, fuzzy
-msgid "Search the repository as it is in REV"
-msgstr "Specify the repository URL"
+msgid "Generate man page"
+msgstr "Generate a new key pair"
-#: share/completions/hg.fish:441
-msgid "A filename will only show ancestors or"
+#: share/completions/obnam.fish:38
+msgid "Which generation to restore"
msgstr ""
-#: share/completions/hg.fish:443
+#: share/completions/obnam.fish:39
#, fuzzy
-msgid "Show revisions matching date spec"
-msgstr "Show only matching part"
+msgid "Show this help message and exit"
+msgstr "Load the media and exit"
-#: share/completions/hg.fish:445
-msgid "[+] do case-insensitive search for a given text"
+#: share/completions/obnam.fish:40
+msgid "Policy for what generations to keep when forgetting."
msgstr ""
-#: share/completions/hg.fish:449
-msgid "[+] show changesets within the given named branch"
+#: share/completions/obnam.fish:41
+msgid "Wait TIMEOUT seconds for an existing lock"
msgstr ""
-#: share/completions/hg.fish:466
+#: share/completions/obnam.fish:43
#, fuzzy
-msgid "Revision to display"
-msgstr "Select display"
-
-#: share/completions/hg.fish:475
-msgid "Revision to merge"
-msgstr ""
+msgid "Do not actually change anything"
+msgstr "Do not write anything"
-#: share/completions/hg.fish:477 share/completions/hg.fish:593
+#: share/completions/obnam.fish:44
#, fuzzy
-msgid "Specify merge tool"
-msgstr "Specify trust model"
+msgid "Actually commit changes"
+msgstr "Summarize changes"
-#: share/completions/hg.fish:488
-msgid "[+] a specific branch you would like to push"
+#: share/completions/obnam.fish:45
+msgid "Show only errors, no progress updates"
msgstr ""
-#: share/completions/hg.fish:506
-#, fuzzy
-msgid "Show parents of the specified revision"
-msgstr "Query packages with the specified group"
+#: share/completions/obnam.fish:46
+msgid "Show errors and progress updates"
+msgstr ""
-#: share/completions/hg.fish:525
+#: share/completions/obnam.fish:49
#, fuzzy
-msgid "[+] target revision"
-msgstr "Merge revisions"
+msgid "Simulate failures for files that match REGEXP"
+msgstr "Select patch matching REGEXP"
-#: share/completions/hg.fish:535
-msgid "[+] bookmark to pull"
+#: share/completions/obnam.fish:52
+msgid "Be more verbose"
msgstr ""
-#: share/completions/hg.fish:546
-msgid "You want to allow push to create a new named branch"
-msgstr ""
+#: share/completions/obnam.fish:53
+#, fuzzy
+msgid "Do not be verbose"
+msgstr "Do not overwrite"
-#: share/completions/hg.fish:549
-msgid "[+] bookmark to push"
+#: share/completions/obnam.fish:54
+msgid "Verify N files randomly from the backup"
msgstr ""
-#: share/completions/hg.fish:603 share/completions/hg.fish:726
+#: share/completions/obnam.fish:55
#, fuzzy
-msgid "Tipmost revision matching date"
-msgstr "Show only matching part"
-
-#: share/completions/hg.fish:604
-#, fuzzy
-msgid "Revert to the specified revision"
-msgstr "Help for the specified builtin"
+msgid "Show version number and exit"
+msgstr "Display version and exit"
-#: share/completions/hg.fish:615
-msgid "Not perform actions, just print output"
+#: share/completions/obnam.fish:57
+msgid "Make a checkpoint after a given SIZE"
msgstr ""
-#: share/completions/hg.fish:629
-msgid "Name of access log file to write to"
-msgstr ""
+#: share/completions/obnam.fish:58
+#, fuzzy
+msgid "Deduplicate mode"
+msgstr "Read/Write mode"
-#: share/completions/hg.fish:631
-msgid "Used internally by daemon mode"
-msgstr ""
+#: share/completions/obnam.fish:60
+#, fuzzy
+msgid "Exclude directories tagged as cache"
+msgstr "Search directories for source"
-#: share/completions/hg.fish:632
-msgid "Name of error log file to write to"
-msgstr ""
+#: share/completions/obnam.fish:61
+#, fuzzy
+msgid "Include directories tagged as cache"
+msgstr "Include directory"
-#: share/completions/hg.fish:633
-msgid "Port to listen on (default: 8000)"
+#: share/completions/obnam.fish:63
+msgid "Leave checkpoint generations at the end of backup"
msgstr ""
-#: share/completions/hg.fish:634
-msgid "Address to listen on (default: all interfaces)"
+#: share/completions/obnam.fish:64
+msgid "Omit checkpoint generations at the end of backup"
msgstr ""
-#: share/completions/hg.fish:635
-msgid "Prefix path to serve from (default: server root)"
-msgstr ""
+#: share/completions/obnam.fish:65
+#, fuzzy
+msgid "Do not follow mount points"
+msgstr "Do not fold long lines"
-#: share/completions/hg.fish:636
-msgid "Name to show in web pages (default: working"
-msgstr ""
+#: share/completions/obnam.fish:66
+#, fuzzy
+msgid "Follow mount points"
+msgstr "Mount point"
-#: share/completions/hg.fish:637
-msgid "Name of the hgweb config file (see \"hg help hgweb\")"
+#: share/completions/obnam.fish:67
+msgid "Put small files directly into the B-tree"
msgstr ""
-#: share/completions/hg.fish:638
-msgid "Name of file to write process ID to"
+#: share/completions/obnam.fish:68
+msgid "No not put small files into the B-tree"
msgstr ""
-#: share/completions/hg.fish:640
+#: share/completions/obnam.fish:70
#, fuzzy
-msgid "For remote clients"
-msgstr "List or remove functions"
-
-#: share/completions/hg.fish:641
-msgid "Web templates to use"
-msgstr ""
+msgid "Write out the current configuration"
+msgstr "Reload service configuration"
-#: share/completions/hg.fish:642
-msgid "Template style to use"
-msgstr ""
+#: share/completions/obnam.fish:71
+#, fuzzy
+msgid "Write out setting names"
+msgstr "Write out the prompt"
-#: share/completions/hg.fish:644
+#: share/completions/obnam.fish:72
#, fuzzy
-msgid "SSL certificate file"
-msgstr "Set certificate policy"
+msgid "Show all options"
+msgstr "Display help and debug options"
-#: share/completions/hg.fish:651
+#: share/completions/obnam.fish:73
#, fuzzy
-msgid "Untrusted configuration options"
-msgstr "Set config options"
+msgid "List config files"
+msgstr "Use config file"
-#: share/completions/hg.fish:670
+#: share/completions/obnam.fish:74
#, fuzzy
-msgid "List the changed files of a revision"
-msgstr "List all properties on files, dirs, or revisions"
+msgid "Clear list of configuration files to read"
+msgstr "List of rpm configuration files"
-#: share/completions/hg.fish:680
-msgid "For push and pull"
+#: share/completions/obnam.fish:75
+msgid "PGP key with which to encrypt"
msgstr ""
-#: share/completions/hg.fish:689
-msgid "Revision to tag"
-msgstr ""
+#: share/completions/obnam.fish:76
+#, fuzzy
+msgid "Show additional user IDs"
+msgstr "Show history for all users"
-#: share/completions/hg.fish:692
-msgid "Use <text> as commit message"
+#: share/completions/obnam.fish:77
+#, fuzzy
+msgid "Do not show additional user IDs"
+msgstr "Do not store directory names"
+
+#: share/completions/obnam.fish:78
+msgid "PGP key id"
msgstr ""
-#: share/completions/hg.fish:717
-msgid "To new branch head if changesets were unbundled"
+#: share/completions/obnam.fish:79
+msgid "Size of symmetric key"
msgstr ""
-#: share/completions/hg.fish:727
+#: share/completions/obnam.fish:80
#, fuzzy
-msgid "Revision"
-msgstr "Merge revisions"
-
-#: share/completions/hg.fish:844
-msgid "Or select an existing template-style (--style)"
-msgstr ""
+msgid "Use /dev/urandom instead of /dev/random"
+msgstr "Use purge instead of remove"
-#: share/completions/hg.fish:845
-msgid "Is set"
+#: share/completions/obnam.fish:81
+msgid "Use default /dev/random"
msgstr ""
-#: share/completions/history.fish:1
-msgid "Match history items that start with the given prefix"
+#: share/completions/obnam.fish:83
+msgid "fsck should try to fix problems"
msgstr ""
-#: share/completions/history.fish:2
-msgid "Match history items that contain the given string"
+#: share/completions/obnam.fish:84
+msgid "fsck should not try to fix problems"
msgstr ""
-#: share/completions/ifconfig.fish:1
-msgid "Stop interface"
-msgstr "Stop interface"
-
-#: share/completions/ifconfig.fish:2
-msgid "Start interface"
-msgstr "Start interface"
-
-#: share/completions/ifconfig.fish:25 share/completions/ifdown.fish:1
-#: share/completions/ifup.fish:1
-msgid "Network interface"
-msgstr "Network interface"
-
-#: share/completions/less.fish:3
-msgid "Buffer space"
-msgstr "Buffer space"
+#: share/completions/obnam.fish:85
+#, fuzzy
+msgid "Ignore chunks when checking integrity"
+msgstr "Ignore case when comparing file names"
-#: share/completions/lsusb.fish:2
-msgid "Show only devices with specified device and/or bus numbers (in decimal)"
+#: share/completions/obnam.fish:86
+msgid "Check chunks when checking integrity"
msgstr ""
-#: share/completions/make.fish:12
-msgid "Target"
-msgstr "Target"
-
-#: share/completions/make.fish:13
-msgid "Use file as makefile"
-msgstr "Use file as makefile"
-
-#: share/completions/make.fish:18
-msgid "Search directory for makefile"
-msgstr "Search directory for makefile"
-
-#: share/completions/make.fish:19
-msgid "Number of concurrent jobs"
-msgstr "Number of concurrent jobs"
-
-#: share/completions/make.fish:23
-msgid "Ignore specified file"
-msgstr "Ignore specified file"
-
-#: share/completions/make.fish:32
-msgid "Pretend file is modified"
-msgstr "Pretend file is modified"
-
-#: share/completions/makedepend.fish:1
-msgid "Define"
-msgstr "Define"
-
-#: share/completions/makedepend.fish:2
-msgid "Include directory"
-msgstr "Include directory"
-
-#: share/completions/makedepend.fish:3
-msgid "Replace include directories"
-msgstr "Replace include directories"
-
-#: share/completions/makedepend.fish:5
-msgid "Specify makefile"
-msgstr "Specify makefile"
-
-#: share/completions/makedepend.fish:6
-msgid "Prepend file to input"
-msgstr "Prepend file to input"
-
-#: share/completions/makedepend.fish:7
-msgid "Object file suffix"
-msgstr "Object file suffix"
-
-#: share/completions/makedepend.fish:8
-msgid "Object file prefix"
-msgstr "Object file prefix"
-
-#: share/completions/makedepend.fish:9
-msgid "Starting string delimiter"
-msgstr "Starting string delimiter"
-
-#: share/completions/makedepend.fish:10
-msgid "Line width"
-msgstr "Line width"
-
-#: share/completions/mosh.fish:20
-msgid "Controls use of speculative local echo"
+#: share/completions/obnam.fish:87
+msgid "Do not check data for cient NAME."
msgstr ""
-#: share/completions/mount.fish:19
-msgid "Mount partition with specified label"
-msgstr "Mount partition with specified label"
-
-#: share/completions/mount.fish:20
-msgid "Mount partition with specified UID"
-msgstr "Mount partition with specified UID"
-
-#: share/completions/mount.fish:21
+#: share/completions/obnam.fish:88
#, fuzzy
-msgid "Exclude file systems"
-msgstr "Exclude filesystems"
-
-#: share/completions/mount.fish:22
-msgid "Remount a subtree to a second position"
-msgstr "Remount a subtree to a second position"
+msgid "Check only the last generation"
+msgstr "Resumes the last merge operation"
-#: share/completions/mount.fish:23
-msgid "Move a subtree to a new position"
-msgstr "Move a subtree to a new position"
-
-#: share/completions/mount.fish:24
+#: share/completions/obnam.fish:89 share/completions/obnam.fish:95
#, fuzzy
-msgid "File system"
-msgstr "Filesystem"
+msgid "Check all generations"
+msgstr "Query installed packages"
-#: share/completions/mount.fish:26
-msgid "Mount option"
-msgstr "Mount option"
+#: share/completions/obnam.fish:90
+#, fuzzy
+msgid "Do not check directories"
+msgstr "Do not store directory names"
-#: share/completions/mplayer.fish:28
-msgid "A/V sync speed"
-msgstr "A/V sync speed"
+#: share/completions/obnam.fish:91
+#, fuzzy
+msgid "Check directories"
+msgstr "Recurse directories"
-#: share/completions/mplayer.fish:32
-msgid "Loop playback"
-msgstr "Loop playback"
+#: share/completions/obnam.fish:92
+#, fuzzy
+msgid "Do not check files"
+msgstr "Do not change any files"
-#: share/completions/mplayer.fish:58 share/completions/mplayer.fish:76
-msgid "Video output"
-msgstr "Video output"
+#: share/completions/obnam.fish:93
+#, fuzzy
+msgid "Check files"
+msgstr "Query installed packages"
-#: share/completions/mplayer.fish:64 share/completions/mplayer.fish:70
-msgid "Audio output"
-msgstr "Audio output"
+#: share/completions/obnam.fish:94
+#, fuzzy
+msgid "Do not check any generations"
+msgstr "Do not change any files"
-#: share/completions/msgfmt.fish:5
+#: share/completions/obnam.fish:96
#, fuzzy
-msgid "Generate a Java ResourceBundle class"
-msgstr "Generate source index file"
+msgid "Do not check per-client B-trees"
+msgstr "Do not print tags"
-#: share/completions/msgfmt.fish:6
-msgid "Like --java, and assume Java2 (JDK 1.2 or higher)"
+#: share/completions/obnam.fish:97
+msgid "Check per-client B-trees"
msgstr ""
-#: share/completions/msgfmt.fish:7
+#: share/completions/obnam.fish:98
#, fuzzy
-msgid "Generate a .NET .dll file"
-msgstr "Generate master file"
+msgid "Do not check shared B-trees"
+msgstr "Do not change any files"
-#: share/completions/msgfmt.fish:8
+#: share/completions/obnam.fish:99
#, fuzzy
-msgid "Generate a .NET .resources file"
-msgstr "Generate source index file"
+msgid "Check shared B-trees"
+msgstr "Query installed packages"
-#: share/completions/msgfmt.fish:9
-#, fuzzy
-msgid "Generate a tcl/msgcat .msg file"
-msgstr "Generate master file"
+#: share/completions/obnam.fish:102
+msgid "Keep last N logs (10)"
+msgstr ""
-#: share/completions/msgfmt.fish:10
-#, fuzzy
-msgid "Generate a Qt .qm file"
-msgstr "Generate master file"
+#: share/completions/obnam.fish:103
+msgid "Log at LEVEL"
+msgstr ""
-#: share/completions/msgfmt.fish:17
-#, fuzzy
-msgid "Resource name"
-msgstr "Set volume name"
+#: share/completions/obnam.fish:104
+msgid "Rotate logs larger than SIZE"
+msgstr ""
-#: share/completions/msgfmt.fish:18
-msgid "Locale name, either language or language_COUNTRY"
+#: share/completions/obnam.fish:105
+msgid "Set permissions of logfiles to MODE"
msgstr ""
-#: share/completions/msgfmt.fish:19
-#, fuzzy
-msgid "Base directory for output"
-msgstr "File descriptor for input"
+#: share/completions/obnam.fish:106
+msgid "Options to pass to FUSE"
+msgstr ""
-#: share/completions/mutt.fish:18
-msgid "An expanded version of the given alias is passed to stdout"
+#: share/completions/obnam.fish:107
+msgid "Make memory profiling dumps using METHOD"
msgstr ""
-#: share/completions/mutt.fish:19
-msgid "Attach a file to your message using MIME"
+#: share/completions/obnam.fish:108
+msgid "Make memory profiling dumps at SECONDS"
msgstr ""
-#: share/completions/mutt.fish:20
-msgid "Specify a blind-carbon-copy (BCC) recipient"
+#: share/completions/obnam.fish:109
+msgid "Size of chunks of file data"
msgstr ""
-#: share/completions/mutt.fish:21
-msgid "Specify a carbon-copy (CC) recipient"
+#: share/completions/obnam.fish:110
+msgid "Encode NUM chunk ids per group"
msgstr ""
-#: share/completions/mutt.fish:22
-msgid "Run command after processing of initialization files"
+#: share/completions/obnam.fish:111
+msgid "Chunk id level size"
msgstr ""
-#: share/completions/mutt.fish:23
+#: share/completions/obnam.fish:112
#, fuzzy
-msgid "Specify which mailbox to load"
-msgstr "Specify sendmail command"
-
-#: share/completions/mutt.fish:24
-msgid "Specify an initialization file to read instead of ~/.muttrc"
-msgstr ""
+msgid "Depth of chunk id mapping"
+msgstr "Depth of call chain"
-#: share/completions/mutt.fish:25
-msgid "Specify a draft file containing header and body for the message"
+#: share/completions/obnam.fish:113
+msgid "Chunk id mapping lowest bits skip"
msgstr ""
-#: share/completions/mutt.fish:26
-msgid "Specify a file to include into the body of a message"
+#: share/completions/obnam.fish:114
+msgid "Size of LRU cache for B-tree nodes"
msgstr ""
-#: share/completions/mutt.fish:27
+#: share/completions/obnam.fish:115
#, fuzzy
-msgid "Specify a default mailbox type"
-msgstr "Specify destination email"
+msgid "Size of B-tree nodes on disk"
+msgstr "Show changes in reverse order"
-#: share/completions/mutt.fish:28
-#, fuzzy
-msgid "Query a configuration variables value"
-msgstr "Specify a configuration file"
+#: share/completions/obnam.fish:116
+msgid "Length of upload queue for B-tree nodes"
+msgstr ""
-#: share/completions/mutt.fish:29
+#: share/completions/obnam.fish:117
+msgid "Use only paramiko, no openssh"
+msgstr ""
+
+#: share/completions/obnam.fish:118
#, fuzzy
-msgid "Specify the subject of the message"
-msgstr "Specify commit message"
+msgid "Use openssh if available"
+msgstr "Build index if unavailable"
-#: share/completions/mv.fish:4
-msgid "Answer for overwrite questions"
-msgstr "Answer for overwrite questions"
+#: share/completions/obnam.fish:120
+msgid "ssh host key check"
+msgstr ""
#: share/completions/perl.fish:6
msgid "Specify record separator"
@@ -6326,15 +6192,15 @@ msgstr "Change background color"
msgid "Locale"
msgstr "Locale"
-#: share/completions/sort.fish:12
+#: share/completions/sort.fish:16
msgid "Write to file"
msgstr "Write to file"
-#: share/completions/sort.fish:14
+#: share/completions/sort.fish:18
msgid "Set memory buffer size"
msgstr "Set memory buffer size"
-#: share/completions/sort.fish:16
+#: share/completions/sort.fish:20
msgid "Set temporary directory"
msgstr "Set temporary directory"
@@ -6596,7 +6462,7 @@ msgstr ""
msgid "Test if vagrant has yet to be given the main command"
msgstr "Test if apt has yet to be given the subcommand"
-#: share/completions/vagrant.fish:34
+#: share/completions/vagrant.fish:23
#, fuzzy
msgid "Lists all available Vagrant boxes"
msgstr "List names of available signals"
@@ -7847,6 +7713,11 @@ msgstr "Display each file's MAC label"
msgid "Include the file flags in a long (-l) output"
msgstr "Include the file flags in a long (-l) output"
+#: share/functions/__fish_complete_path.fish:1
+#, fuzzy
+msgid "Complete using path"
+msgstr "Tolerate sloppy mount options"
+
#: share/functions/__fish_complete_ppp_peer.fish:1
msgid "Complete isp name for pon/poff"
msgstr ""
@@ -8444,55 +8315,46 @@ msgstr ""
msgid "Complete md5sum sha1 etc"
msgstr ""
-#: share/functions/__fish_config_interactive.fish:65
-#, sh-format
-msgid ""
-"\\nWARNING\\n\\nThe location for fish configuration files has changed to %s."
-"\\nYour old files have been moved to this location.\\nYou can change to a "
-"different location by changing the value of the variable $XDG_CONFIG_HOME.\\n"
-"\\n"
-msgstr ""
-
-#: share/functions/__fish_config_interactive.fish:82
+#: share/functions/__fish_config_interactive.fish:34
#, fuzzy
msgid "Welcome to fish, the friendly interactive shell"
msgstr "Welcome to fish, the friendly interactive shell"
-#: share/functions/__fish_config_interactive.fish:83
+#: share/functions/__fish_config_interactive.fish:35
#, fuzzy
msgid "Type %shelp%s for instructions on how to use fish"
msgstr "Type %shelp%s for instructions on how to use fish"
-#: share/functions/__fish_config_interactive.fish:173
+#: share/functions/__fish_config_interactive.fish:130
msgid "Event handler, repaints the prompt when fish_color_cwd changes"
msgstr "Event handler, repaints the prompt when fish_color_cwd changes"
-#: share/functions/__fish_config_interactive.fish:180
+#: share/functions/__fish_config_interactive.fish:137
#, fuzzy
msgid "Event handler, repaints the prompt when fish_color_cwd_root changes"
msgstr "Event handler, repaints the prompt when fish_color_cwd changes"
-#: share/functions/__fish_config_interactive.fish:192
+#: share/functions/__fish_config_interactive.fish:149
msgid "Start service"
msgstr "Start service"
-#: share/functions/__fish_config_interactive.fish:193
+#: share/functions/__fish_config_interactive.fish:150
msgid "Stop service"
msgstr "Stop service"
-#: share/functions/__fish_config_interactive.fish:194
+#: share/functions/__fish_config_interactive.fish:151
msgid "Print service status"
msgstr "Print service status"
-#: share/functions/__fish_config_interactive.fish:195
+#: share/functions/__fish_config_interactive.fish:152
msgid "Stop and then start service"
msgstr "Stop and then start service"
-#: share/functions/__fish_config_interactive.fish:196
+#: share/functions/__fish_config_interactive.fish:153
msgid "Reload service configuration"
msgstr "Reload service configuration"
-#: share/functions/__fish_config_interactive.fish:228
+#: share/functions/__fish_config_interactive.fish:193
#, sh-format
msgid "Notify VTE of change to $PWD"
msgstr ""
@@ -8501,10 +8363,6 @@ msgstr ""
msgid "Helper function for __fish_git_prompt"
msgstr ""
-#: share/functions/__fish_git_prompt.fish:244
-msgid "svn_upstream"
-msgstr ""
-
#: share/functions/__fish_git_prompt.fish:348
#, fuzzy
msgid "Prompt function for Git"
@@ -8549,6 +8407,11 @@ msgstr "Event handler, repaints the prompt when fish_color_cwd changes"
msgid "Event handler, repaints prompt when any char changes"
msgstr "Event handler, repaints the prompt when fish_color_cwd changes"
+#: share/functions/__fish_hg_prompt.fish:23
+#, fuzzy
+msgid "Write out the hg prompt"
+msgstr "Write out the prompt"
+
#: share/functions/__fish_is_token_n.fish:1
msgid "Test if current token is on Nth place"
msgstr ""
@@ -8586,7 +8449,7 @@ msgstr "Print a list of all accepted color names"
msgid "Prints services installed"
msgstr "Print service status"
-#: share/functions/__fish_print_help.fish:2
+#: share/functions/__fish_print_help.fish:1
#, fuzzy
msgid "Print help message for the specified fish function or builtin"
msgstr "Print all completions for the specified commandline"
@@ -8616,6 +8479,10 @@ msgstr "Print available list"
msgid "Print mounted devices"
msgstr "Print important dependencies"
+#: share/functions/__fish_print_packages.fish:13
+msgid "Package"
+msgstr "Package"
+
#: share/functions/__fish_print_svn_rev.fish:1
#, fuzzy
msgid "Print svn revisions"
@@ -8669,16 +8536,63 @@ msgstr "Rename stdin"
msgid "Write out the git prompt"
msgstr "Write out the prompt"
+#: share/functions/abbr.fish:1
+#, fuzzy
+msgid "Manage abbreviations"
+msgstr "Manual sections"
+
+#: share/functions/abbr.fish:40
+#, fuzzy
+msgid "%s: invalid option -- %s\\n"
+msgstr "%ls: Invalid option -- %lc\n"
+
+#: share/functions/abbr.fish:47
+#, fuzzy
+msgid "%s: %s cannot be specified along with %s\\n"
+msgstr "%ls: Values cannot be specfied with erase\n"
+
+#: share/functions/abbr.fish:56
+#, fuzzy
+msgid "%s: option requires an argument -- %s\\n"
+msgstr "%ls: Option requires an argument -- %lc\n"
+
+#: share/functions/abbr.fish:62
+#, fuzzy
+msgid "%s: Unexpected argument -- %s\\n"
+msgstr "%ls: Expected argument\n"
+
+#: share/functions/abbr.fish:75
+msgid "%s: abbreviation must have a non-empty key\\n"
+msgstr ""
+
+#: share/functions/abbr.fish:79
+msgid "%s: abbreviation must have a value\\n"
+msgstr ""
+
+#: share/functions/abbr.fish:101
+#, fuzzy
+msgid "%s: no such abbreviation '%s'\\n"
+msgstr "%s: Unknown option “%s”\\n"
+
#: share/functions/alias.fish:2
msgid ""
"Legacy function for creating shellscript functions using an alias-like syntax"
msgstr ""
-#: share/functions/alias.fish:34
+#: share/functions/alias.fish:36
#, fuzzy
msgid "%s: Expected one or two arguments, got %d\\n"
msgstr "%s: Expected 1, 2 or 3 arguments, got %d\\n"
+#: share/functions/alias.fish:42
+#, fuzzy
+msgid "%s: Name cannot be empty\\n"
+msgstr "%ls: Variable name can not be the empty string\n"
+
+#: share/functions/alias.fish:45
+msgid "%s: Body cannot be empty\\n"
+msgstr ""
+
#: share/functions/contains_seq.fish:1
msgid "Return true if array contains a sequence"
msgstr ""
@@ -8691,6 +8605,10 @@ msgstr "Print the current directory history (the back- and fwd- lists)"
msgid "Print directory stack"
msgstr "Print directory stack"
+#: share/functions/export.fish:1
+msgid "Set global variable. Alias for set -g, made for bash compatibility"
+msgstr ""
+
#: share/functions/fish_config.fish:1
msgid "Launch fish's web based configuration"
msgstr ""
@@ -8708,6 +8626,20 @@ msgstr "Write out the prompt"
msgid "Update man-page based completions"
msgstr "Edit command specific completions"
+#: share/functions/fish_vi_key_bindings.fish:1
+#, fuzzy
+msgid "vi-like key bindings for fish"
+msgstr "Specify key bindings file"
+
+#: share/functions/fish_vi_prompt.fish:1
+#, fuzzy
+msgid "Displays the current mode"
+msgstr "Display version and exit"
+
+#: share/functions/fish_vi_prompt.fish:17
+msgid "Simple vi prompt"
+msgstr ""
+
#: share/functions/funced.fish:1
#, fuzzy
msgid "Edit function definition"
@@ -8723,6 +8655,19 @@ msgstr "%s: Unknown option %s\\n"
msgid "funced: You must specify one function name\n"
msgstr "%ls: Expected exactly one function name\n"
+#: share/functions/funced.fish:96
+msgid "Editing failed or was cancelled"
+msgstr ""
+
+#: share/functions/funced.fish:103
+msgid "Edit the file again\\? [Y/n]"
+msgstr ""
+
+#: share/functions/funced.fish:110
+#, fuzzy
+msgid "Cancelled function editing"
+msgstr "function definition block"
+
#: share/functions/funcsave.fish:2
msgid "Save the current definition of all specified functions to file"
msgstr ""
@@ -8737,7 +8682,7 @@ msgstr "%ls: Expected function name\n"
msgid "%s: Could not create configuration directory\\n"
msgstr "%ls: Could not find home directory\n"
-#: share/functions/funcsave.fish:37
+#: share/functions/funcsave.fish:36
#, fuzzy
msgid "%s: Unknown function '%s'\\n"
msgstr "%s: Unknown option “%s”\\n"
@@ -8785,7 +8730,7 @@ msgstr ""
msgid "List contents of directory using long format"
msgstr "List contents of directory using long format"
-#: share/functions/ls.fish:7 share/functions/ls.fish:24
+#: share/functions/ls.fish:7 share/functions/ls.fish:32
msgid "List contents of directory"
msgstr "List contents of directory"
@@ -8832,7 +8777,6 @@ msgstr "Move back in the directory history"
msgid "The number of positions to skip must be a non-negative integer\\n"
msgstr "The number of positions to skip must be a non-negative integer\\n"
-#: share/functions/prompt_pwd.fish:3 share/functions/prompt_pwd.fish:7
#: share/functions/prompt_pwd.fish:11
#, fuzzy
msgid "Print the current working directory, shortened to fit the prompt"
@@ -8875,35 +8819,35 @@ msgstr ""
msgid "Print the type of a command"
msgstr "Print the type of a command"
-#: share/functions/type.fish:84
+#: share/functions/type.fish:90
#, fuzzy
msgid "%s is a function with definition\\n"
msgstr "%ls: Missing function definition information."
-#: share/functions/type.fish:88
+#: share/functions/type.fish:94
#, fuzzy
msgid "function"
msgstr "function\\n"
-#: share/functions/type.fish:105
+#: share/functions/type.fish:107
msgid "%s is a builtin\\n"
msgstr "%s is a builtin\\n"
-#: share/functions/type.fish:108
+#: share/functions/type.fish:110
#, fuzzy
msgid "builtin"
msgstr "builtin\\n"
-#: share/functions/type.fish:132
+#: share/functions/type.fish:130
msgid "%s is %s\\n"
msgstr "%s is %s\\n"
-#: share/functions/type.fish:135
+#: share/functions/type.fish:133
#, fuzzy
msgid "file"
msgstr "file\\n"
-#: share/functions/type.fish:147
+#: share/functions/type.fish:144
msgid "%s: Could not find '%s'\\n"
msgstr "%s: Could not find “%s”\\n"
@@ -8924,15 +8868,16 @@ msgstr "%s: Too many arguments\\n"
msgid "Edit variable value"
msgstr "Edit variable value"
-#: share/functions/vared.fish:41
+#: share/functions/vared.fish:40
+#, fuzzy
msgid ""
-"%s: %s is an array variable. Use %svared%s %s[n] to edit the n:th element of "
-"%s\\n"
+"%s: %s is an array variable. Use %svared%s %s[n]%s to edit the n:th element "
+"of %s\\n"
msgstr ""
"%s: %s is an array variable. Use %svared%s %s[n] to edit the n:th element of "
"%s\\n"
-#: share/functions/vared.fish:45
+#: share/functions/vared.fish:44
msgid ""
"%s: Expected exactly one argument, got %s.\\n\\nSynopsis:\\n\\t%svared%s "
"VARIABLE\\n"
@@ -8940,6 +8885,403 @@ msgstr ""
"%s: Expected exactly one argument, got %s.\\n\\nSynopsis:\\n\\t%svared%s "
"VARIABLE\\n"
+#, fuzzy
+#~ msgid "%ls: Expected zero or two parameters, got %d\n"
+#~ msgstr "%ls:应有至多一个参数,提供了 %d 个\n"
+
+#~ msgid "Current functions are: "
+#~ msgstr "当前的函数是: "
+
+#~ msgid "%ls: Not inside of block\n"
+#~ msgstr "%ls:不在区块之内\n"
+
+#~ msgid "%ls: Not inside of 'if' block\n"
+#~ msgstr "%ls:不在 “if” 区块之内\n"
+
+#~ msgid "%ls: Expected exactly one argument, got %d\n"
+#~ msgstr "%ls:应恰好有一个参数,提供了 %d 个\n"
+
+#~ msgid "%ls: 'case' command while not in switch block\n"
+#~ msgstr "%ls:“case” 命令不在 switch 块内\n"
+
+#~ msgid "%ls: Unknown error"
+#~ msgstr "%ls:未知错误"
+
+#~ msgid "%ls: Can not specify scope when erasing array slice\n"
+#~ msgstr "%ls: Can not specify scope when erasing array slice\n"
+
+#~ msgid "Could not get user information"
+#~ msgstr "Could not get user information"
+
+#~ msgid "Could not convert message '%s' to wide character string"
+#~ msgstr "Could not convert message “%s” to wide character string"
+
+#~ msgid "%ls: Argument '%s' is not a valid file descriptor\n"
+#~ msgstr "%ls: Argument “%s” is not a valid file descriptor\n"
+
+#~ msgid "Could not set up input file descriptors for pager"
+#~ msgstr "Could not set up input file descriptors for pager"
+
+#~ msgid "Could not open tty for pager"
+#~ msgstr "Could not open tty for pager"
+
+#~ msgid "Unspecified file descriptors"
+#~ msgstr "Unspecified file descriptors"
+
+#~ msgid "Could not read completions"
+#~ msgstr "Could not read completions"
+
+#~ msgid "Could not expand string '%ls'"
+#~ msgstr "Could not expand string “%ls”"
+
+#~ msgid "An additional command is required"
+#~ msgstr "An additional command is required"
+
+#~ msgid ""
+#~ "Could not locate end of block. The 'end' command is missing, misspelled "
+#~ "or a ';' is missing."
+#~ msgstr ""
+#~ "Could not locate end of block. The “end” command is missing, misspelled "
+#~ "or a “;” is missing."
+
+#~ msgid "Expected a command name, got token of type '%ls'"
+#~ msgstr "Expected a command name, got token of type “%ls”"
+
+#~ msgid "'case' builtin not inside of switch block"
+#~ msgstr "“case” builtin not inside of switch block"
+
+#~ msgid "Loop control command while not inside of loop"
+#~ msgstr "Loop control command while not inside of loop"
+
+#, fuzzy
+#~ msgid "'%ls' builtin not inside of if block"
+#~ msgstr "“else” builtin not inside of if block"
+
+#~ msgid "'end' command outside of block"
+#~ msgstr "“end” command outside of block"
+
+#~ msgid "Expected redirection specification, got token of type '%ls'"
+#~ msgstr "Expected redirection specification, got token of type “%ls”"
+
+#~ msgid ""
+#~ "Encountered redirection when expecting a command name. Fish does not "
+#~ "allow a redirection operation before a command."
+#~ msgstr ""
+#~ "Encountered redirection when expecting a command name. Fish does not "
+#~ "allow a redirection operation before a command."
+
+#~ msgid "Invalid IO redirection"
+#~ msgstr "Invalid IO redirection"
+
+#~ msgid "Requested redirection to something that is not a file descriptor %ls"
+#~ msgstr ""
+#~ "Requested redirection to something that is not a file descriptor %ls"
+
+#~ msgid "Don't preserve the specified attributes"
+#~ msgstr "Don't preserve the specified attributes"
+
+#~ msgid "Control creation of sparse files"
+#~ msgstr "Control creation of sparse files"
+
+#, fuzzy
+#~ msgid "All base system packages"
+#~ msgstr "Erase built packages"
+
+#, fuzzy
+#~ msgid "All packages in world"
+#~ msgstr "Sync packages installed"
+
+#, fuzzy
+#~ msgid "Installed package"
+#~ msgstr "Install new package"
+
+#, fuzzy
+#~ msgid "Help on subject config"
+#~ msgstr "Help section"
+
+#, fuzzy
+#~ msgid "Help on subject sync"
+#~ msgstr "Help section"
+
+#, fuzzy
+#~ msgid "Use colors in output"
+#~ msgstr "Use colors"
+
+#, fuzzy
+#~ msgid "Pull in build time dependencies"
+#~ msgstr "Show build dependencies"
+
+#, fuzzy
+#~ msgid "Don't pull in build time dependencies"
+#~ msgstr "Don't automatically fulfill dependencies"
+
+#, fuzzy
+#~ msgid "add the specified files on the next commit"
+#~ msgstr "Add specified file to the current list of keyrings"
+
+#, fuzzy
+#~ msgid "show changeset information by line for each file"
+#~ msgstr "Display change information for the package"
+
+#, fuzzy
+#~ msgid "create an unversioned archive of a repository revision"
+#~ msgstr "Commit an unversioned file or tree into the repository"
+
+#, fuzzy
+#~ msgid "list repository named branches"
+#~ msgstr "Disable repository"
+
+#, fuzzy
+#~ msgid "create a changegroup file"
+#~ msgstr "Read package from file"
+
+#, fuzzy
+#~ msgid "output the current or given revision of files"
+#~ msgstr "Show the log messages for a set of revision(s) and/or file(s)"
+
+#, fuzzy
+#~ msgid "make a copy of an existing repository"
+#~ msgstr "Create a local copy of another repository"
+
+#, fuzzy
+#~ msgid "commit the specified files or all outstanding changes"
+#~ msgstr "Decrypt specified file or stdin"
+
+#, fuzzy
+#~ msgid "forget the specified files on the next commit"
+#~ msgstr "Move file specified on commandline"
+
+#, fuzzy
+#~ msgid "copy changes from other branches onto the current branch"
+#~ msgstr "Bring changes from the repository into the working copy"
+
+#, fuzzy
+#~ msgid "identify the working copy or specified revision"
+#~ msgstr "Update the working copy to a different URL"
+
+#, fuzzy
+#~ msgid "import an ordered set of patches"
+#~ msgstr "Print byte offset of matches"
+
+#, fuzzy
+#~ msgid "create a new repository in the given directory"
+#~ msgstr "Create a CVS repository if it doesnt exist"
+
+#, fuzzy
+#~ msgid "locate files matching specific patterns"
+#~ msgstr "Exclude files that match pattern"
+
+#, fuzzy
+#~ msgid "output the current or given revision of the project manifest"
+#~ msgstr "Show the log messages for a set of revision(s) and/or file(s)"
+
+#, fuzzy
+#~ msgid "show changesets not found in the destination"
+#~ msgstr "Query packages with the specified group"
+
+#, fuzzy
+#~ msgid "show the parents of the working directory or revision"
+#~ msgstr "Change working directory"
+
+#, fuzzy
+#~ msgid "show aliases for remote repositories"
+#~ msgstr "Removes entry in .cvspass for remote repository"
+
+#, fuzzy
+#~ msgid "pull changes from the specified source"
+#~ msgstr "Query packages with the specified group"
+
+#, fuzzy
+#~ msgid "push changes to the specified destination"
+#~ msgstr "Query packages with the specified group"
+
+#, fuzzy
+#~ msgid "remove the specified files on the next commit"
+#~ msgstr "Move file specified on commandline"
+
+#, fuzzy
+#~ msgid "print the root (top) of the current working directory"
+#~ msgstr "Change working directory"
+
+#, fuzzy
+#~ msgid "show changed files in the working directory"
+#~ msgstr "Change working directory"
+
+#, fuzzy
+#~ msgid "summarize working directory state"
+#~ msgstr "Print working directory"
+
+#, fuzzy
+#~ msgid "list repository tags"
+#~ msgstr "Disable repository"
+
+#, fuzzy
+#~ msgid "show the tip revision"
+#~ msgstr "Show the time"
+
+#, fuzzy
+#~ msgid "apply one or more changegroup files"
+#~ msgstr "Read package from file"
+
+#, fuzzy
+#~ msgid "update working directory (or switch revisions)"
+#~ msgstr "Change working directory"
+
+#, fuzzy
+#~ msgid "verify the integrity of the repository"
+#~ msgstr "Remove an entry from the repository"
+
+#, fuzzy
+#~ msgid "output version and copyright information"
+#~ msgstr "Ignore version magic information"
+
+#, fuzzy
+#~ msgid "Configuration Files"
+#~ msgstr "Configuration file"
+
+#, fuzzy
+#~ msgid "Date Formats"
+#~ msgstr "Set format"
+
+#, fuzzy
+#~ msgid "Diff Formats"
+#~ msgstr "List format"
+
+#, fuzzy
+#~ msgid "Environment Variables"
+#~ msgstr "Handle environment variables"
+
+#, fuzzy
+#~ msgid "Specifying File Sets"
+#~ msgstr "Specify config file"
+
+#, fuzzy
+#~ msgid "Configuring hgweb"
+#~ msgstr "Configuration file"
+
+#, fuzzy
+#~ msgid "Merge Tools"
+#~ msgstr "Merge sorted files"
+
+#, fuzzy
+#~ msgid "Specifying Multiple Revisions"
+#~ msgstr "Specify revision"
+
+#, fuzzy
+#~ msgid "Specifying Single Revisions"
+#~ msgstr "Specify revision"
+
+#, fuzzy
+#~ msgid "Specifying Revision Sets"
+#~ msgstr "Specify revision states"
+
+#, fuzzy
+#~ msgid "[+] include names matching the given patterns"
+#~ msgstr "Insert modules matching the given wildcard"
+
+#, fuzzy
+#~ msgid "[+] exclude names matching the given patterns"
+#~ msgstr "List all modules matching the given wildcard"
+
+#, fuzzy
+#~ msgid "[+] include names matching the given patterns"
+#~ msgstr "Insert modules matching the given wildcard"
+
+#, fuzzy
+#~ msgid "[+] exclude names matching the given patterns"
+#~ msgstr "List all modules matching the given wildcard"
+
+#, fuzzy
+#~ msgid "Annotate the specified revision"
+#~ msgstr "Help for the specified builtin"
+
+#, fuzzy
+#~ msgid "Use text as commit message"
+#~ msgstr "Read commit message from file"
+
+#~ msgid "Read commit message from file"
+#~ msgstr "Read commit message from file"
+
+#, fuzzy
+#~ msgid "Record the specified date as commit date"
+#~ msgstr "Help for the specified command"
+
+#, fuzzy
+#~ msgid "Record the specified user as committer"
+#~ msgstr "Use specified string as comment string"
+
+#, fuzzy
+#~ msgid "File to store the bundles into"
+#~ msgstr "Edit the patch bundle description"
+
+#, fuzzy
+#~ msgid "Limit number of changes displayed"
+#~ msgstr "Only print number of matches"
+
+#, fuzzy
+#~ msgid "Display with template"
+#~ msgstr "Display all matches"
+
+#, fuzzy
+#~ msgid "Specify ssh command to use"
+#~ msgstr "Pass command to shell"
+
+#, fuzzy
+#~ msgid "Specify hg command to run on the remote side"
+#~ msgstr "Specify root directory for rpm operations"
+
+#, fuzzy
+#~ msgid "Search the repository as it is in REV"
+#~ msgstr "Specify the repository URL"
+
+#, fuzzy
+#~ msgid "Show revisions matching date spec"
+#~ msgstr "Show only matching part"
+
+#, fuzzy
+#~ msgid "Revision to display"
+#~ msgstr "Select display"
+
+#, fuzzy
+#~ msgid "Specify merge tool"
+#~ msgstr "Specify trust model"
+
+#, fuzzy
+#~ msgid "Show parents of the specified revision"
+#~ msgstr "Query packages with the specified group"
+
+#, fuzzy
+#~ msgid "[+] target revision"
+#~ msgstr "Merge revisions"
+
+#, fuzzy
+#~ msgid "Tipmost revision matching date"
+#~ msgstr "Show only matching part"
+
+#, fuzzy
+#~ msgid "Revert to the specified revision"
+#~ msgstr "Help for the specified builtin"
+
+#, fuzzy
+#~ msgid "For remote clients"
+#~ msgstr "List or remove functions"
+
+#, fuzzy
+#~ msgid "SSL certificate file"
+#~ msgstr "Set certificate policy"
+
+#, fuzzy
+#~ msgid "Untrusted configuration options"
+#~ msgstr "Set config options"
+
+#, fuzzy
+#~ msgid "List the changed files of a revision"
+#~ msgstr "List all properties on files, dirs, or revisions"
+
+#, fuzzy
+#~ msgid "Revision"
+#~ msgstr "Merge revisions"
+
#~ msgid "%ls: Missing function definition information."
#~ msgstr "%ls: Missing function definition information."
@@ -8958,9 +9300,6 @@ msgstr ""
#~ msgid "Failed to close file descriptor %d"
#~ msgstr "Failed to close file descriptor %d"
-#~ msgid "Failed to execute process '%ls'"
-#~ msgstr "Failed to execute process “%ls”"
-
#~ msgid ""
#~ "Could not send process %d, '%ls' in job %d, '%ls' from group %d to group "
#~ "%d"
@@ -9051,10 +9390,6 @@ msgstr ""
#~ msgid "Create a local copy of another repository"
#~ msgstr "Create a local copy of another repository"
-#, fuzzy
-#~ msgid "Makes a copy of the repository"
-#~ msgstr "Create a local copy of another repository"
-
#~ msgid "Optimize the repository"
#~ msgstr "Optimize the repository"
@@ -9064,10 +9399,6 @@ msgstr ""
#~ msgid "Specify hash of creator patch (see docs)"
#~ msgstr "Specify hash of creator patch (see docs)"
-#, fuzzy
-#~ msgid "Name of version"
-#~ msgstr "Negate expression"
-
#~ msgid "Send to context stored in FILENAME"
#~ msgstr "Send to context stored in FILENAME"
@@ -9105,14 +9436,6 @@ msgstr ""
#~ msgid "Use pattern from file"
#~ msgstr "Use pattern from file"
-#, fuzzy
-#~ msgid "print information about the working copy"
-#~ msgstr "Output extra information about the work being done"
-
-#, fuzzy
-#~ msgid "export the repository via HTTP"
-#~ msgstr "Update the repository"
-
#~ msgid "Debug option"
#~ msgstr "Debug option"
@@ -9272,9 +9595,6 @@ msgstr ""
#~ msgid "Prefix to strip on patch"
#~ msgstr "Prefix to strip on patch"
-#~ msgid "Use purge instead of remove"
-#~ msgstr "Use purge instead of remove"
-
#~ msgid "Do not run update"
#~ msgstr "Do not run update"
@@ -9430,9 +9750,6 @@ msgstr ""
#~ msgid "Overwrite"
#~ msgstr "Overwrite"
-#~ msgid "Do not overwrite"
-#~ msgstr "Do not overwrite"
-
#~ msgid "Reduce memory usage"
#~ msgstr "Reduce memory usage"
@@ -9442,9 +9759,6 @@ msgstr ""
#~ msgid "Print license"
#~ msgstr "Print license"
-#~ msgid "Compress to stdout"
-#~ msgstr "Compress to stdout"
-
#~ msgid "Compress file"
#~ msgstr "Compress file"
@@ -9863,9 +10177,6 @@ msgstr ""
#~ msgid "Option list is not complete"
#~ msgstr "Option list is not complete"
-#~ msgid "Remove completion"
-#~ msgstr "Remove completion"
-
#~ msgid ""
#~ "The completion should only be used if the specified command has a zero "
#~ "exit status"
@@ -9998,9 +10309,6 @@ msgstr ""
#~ msgid "Bring work tree in sync with repository"
#~ msgstr "Bring work tree in sync with repository"
-#~ msgid "Set watches"
-#~ msgstr "Set watches"
-
#~ msgid "See who is watching a file"
#~ msgstr "See who is watching a file"
@@ -10013,9 +10321,6 @@ msgstr ""
#~ msgid "Do not use the ~/.cvsrc file"
#~ msgstr "Do not use the ~/.cvsrc file"
-#~ msgid "Do not change any files"
-#~ msgstr "Do not change any files"
-
#~ msgid "Cause CVS to be really quiet"
#~ msgstr "Cause CVS to be really quiet"
@@ -10058,9 +10363,6 @@ msgstr ""
#~ msgid "Process directories recursively"
#~ msgstr "Process directories recursively"
-#~ msgid "Use a specified tag"
-#~ msgstr "Use a specified tag"
-
#~ msgid "Specify filenames to be filtered"
#~ msgstr "Specify filenames to be filtered"
@@ -10214,9 +10516,6 @@ msgstr ""
#~ msgid "Report on all tags"
#~ msgstr "Report on all tags"
-#~ msgid "Show history for all users"
-#~ msgstr "Show history for all users"
-
#~ msgid "Show only records for this directory"
#~ msgstr "Show only records for this directory"
@@ -10235,9 +10534,6 @@ msgstr ""
#~ msgid "Print only file info"
#~ msgstr "Print only file info"
-#~ msgid "Do not print tags"
-#~ msgstr "Do not print tags"
-
#~ msgid "Print only rcs filename"
#~ msgstr "Print only rcs filename"
@@ -10336,9 +10632,6 @@ msgstr ""
#~ "Don't look for any files or directories that could be added, and don't "
#~ "add them automatically"
-#~ msgid "Summarize changes"
-#~ msgstr "Summarize changes"
-
#~ msgid "Suppress informational output"
#~ msgstr "Suppress informational output"
@@ -10372,9 +10665,6 @@ msgstr ""
#~ msgid "Forward unsigned messages without extra header"
#~ msgstr "Forward unsigned messages without extra header"
-#~ msgid "Check the entire repository"
-#~ msgstr "Check the entire repository"
-
#~ msgid "Check patches since latest checkpoint"
#~ msgstr "Check patches since latest checkpoint"
@@ -10706,9 +10996,6 @@ msgstr ""
#~ msgid "Reduced output from portage's displays"
#~ msgstr "Reduced output from portage's displays"
-#~ msgid "Resumes the last merge operation"
-#~ msgstr "Resumes the last merge operation"
-
#~ msgid ""
#~ "Matches the search string against the description field as well the "
#~ "package's name"
@@ -10778,9 +11065,6 @@ msgstr ""
#~ msgid "Erase function"
#~ msgstr "Erase function"
-#~ msgid "Show hidden functions"
-#~ msgstr "Show hidden functions"
-
#~ msgid "Test if function is defined"
#~ msgstr "Test if function is defined"
@@ -10995,9 +11279,6 @@ msgstr ""
#~ msgid "List all keys with their fingerprints"
#~ msgstr "List all keys with their fingerprints"
-#~ msgid "Generate a new key pair"
-#~ msgstr "Generate a new key pair"
-
#~ msgid "Present a menu which enables you to do all key related tasks"
#~ msgstr "Present a menu which enables you to do all key related tasks"
@@ -11506,9 +11787,6 @@ msgstr ""
#~ msgid "No annotated source"
#~ msgstr "No annotated source"
-#~ msgid "Print flat profile"
-#~ msgstr "Print flat profile"
-
#~ msgid "No flat profile"
#~ msgstr "No flat profile"
@@ -11575,9 +11853,6 @@ msgstr ""
#~ msgid "Save/restore filename"
#~ msgstr "Save/restore filename"
-#~ msgid "Recurse directories"
-#~ msgstr "Recurse directories"
-
#~ msgid "Display compression ratios"
#~ msgstr "Display compression ratios"
@@ -11659,9 +11934,6 @@ msgstr ""
#~ msgid "Display status column"
#~ msgstr "Display status column"
-#~ msgid "Specify key bindings file"
-#~ msgstr "Specify key bindings file"
-
#~ msgid "Verbose prompt"
#~ msgstr "Verbose prompt"
@@ -11698,9 +11970,6 @@ msgstr ""
#~ msgid "Multiple blank lines sqeezed"
#~ msgstr "Multiple blank lines sqeezed"
-#~ msgid "Do not fold long lines"
-#~ msgstr "Do not fold long lines"
-
#~ msgid "Edit tag"
#~ msgstr "Edit tag"
@@ -11824,9 +12093,6 @@ msgstr ""
#~ msgid "Pager"
#~ msgstr "Pager"
-#~ msgid "Manual sections"
-#~ msgstr "Manual sections"
-
#~ msgid "Always reformat"
#~ msgstr "Always reformat"
@@ -11932,9 +12198,6 @@ msgstr ""
#~ msgid "Do not write mtab"
#~ msgstr "Do not write mtab"
-#~ msgid "Read/Write mode"
-#~ msgstr "Read/Write mode"
-
#~ msgid "Dynamically change postprocessing"
#~ msgstr "Dynamically change postprocessing"
@@ -11974,9 +12237,6 @@ msgstr ""
#~ msgid "Override framerate"
#~ msgstr "Override framerate"
-#~ msgid "Build index if unavailable"
-#~ msgstr "Build index if unavailable"
-
#~ msgid "Load index from file"
#~ msgstr "Load index from file"
@@ -12159,9 +12419,6 @@ msgstr ""
#~ msgid "Invoke CPP"
#~ msgstr "Invoke CPP"
-#~ msgid "Extract script"
-#~ msgstr "Extract script"
-
#~ msgid "Open folder"
#~ msgstr "Open folder"
@@ -12256,9 +12513,6 @@ msgstr ""
#~ "Bypass the normal routing tables and send directly to a host on an "
#~ "attached interface"
-#~ msgid "Specifies the number of data bytes to be sent"
-#~ msgstr "Specifies the number of data bytes to be sent"
-
#~ msgid "Set socket buffer size"
#~ msgstr "Set socket buffer size"
@@ -12417,9 +12671,6 @@ msgstr ""
#~ msgid "Explain what is done"
#~ msgstr "Explain what is done"
-#~ msgid "List of rpm configuration files"
-#~ msgstr "List of rpm configuration files"
-
#~ msgid "Pipe output through specified command"
#~ msgstr "Pipe output through specified command"
@@ -13557,9 +13808,6 @@ msgstr ""
#~ msgid "Move into zipfile (delete files)"
#~ msgstr "Move into zipfile (delete files)"
-#~ msgid "Do not store directory names"
-#~ msgstr "Do not store directory names"
-
#~ msgid "Do not compress at all"
#~ msgstr "Do not compress at all"