# tagger | 打标签者
# topic branch | 主题分支
# track | 跟踪
+# trailer | 尾部署名
# tree | 树（工作区或树对象）
# tree object | 树对象
# tree-ish (also treeish) | 树对象（或可以解析为一树对象）
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-08-02 08:00+0800\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-24 09:43+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
-#: apply.c:126
+#: apply.c:125
msgid "--reject and --3way cannot be used together."
msgstr "--reject 和 --3say 不能同时使用。"
-#: apply.c:128
+#: apply.c:127
msgid "--cached and --3way cannot be used together."
msgstr "--cached 和 --3way 不能同时使用。"
-#: apply.c:131
+#: apply.c:130
msgid "--3way outside a repository"
msgstr "--3way 在一个仓库之外"
-#: apply.c:142
+#: apply.c:141
msgid "--index outside a repository"
msgstr "--index 在一个仓库之外"
-#: apply.c:145
+#: apply.c:144
msgid "--cached outside a repository"
msgstr "--cached 在一个仓库之外"
-#: apply.c:836
+#: apply.c:845
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "无法准备时间戳正则表达式 %s"
-#: apply.c:845
+#: apply.c:854
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d，输入为：%s"
-#: apply.c:929
+#: apply.c:928
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在补丁的第 %d 行找到文件名"
-#: apply.c:967
+#: apply.c:966
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
-#: apply.c:973
+#: apply.c:972
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
-#: apply.c:974
+#: apply.c:973
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
-#: apply.c:979
+#: apply.c:978
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
-#: apply.c:1008
+#: apply.c:1007
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "第 %d 行包含无效文件模式：%s"
-#: apply.c:1326
+#: apply.c:1325
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "不一致的文件头，%d 行和 %d 行"
-#: apply.c:1498
+#: apply.c:1497
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount：意外的行：%.*s"
-#: apply.c:1567
+#: apply.c:1566
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补丁片段没有头信息：%.*s"
-#: apply.c:1587
+#: apply.c:1586
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
-#: apply.c:1600
+#: apply.c:1599
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"
-#: apply.c:1770
+#: apply.c:1787
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"
-#: apply.c:1772
+#: apply.c:1789
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"
-#: apply.c:1806
+#: apply.c:1823
#, c-format
msgid "corrupt patch at line %d"
msgstr "补丁在第 %d 行损坏"
-#: apply.c:1843
+#: apply.c:1860
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"
-#: apply.c:1845
+#: apply.c:1862
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"
-#: apply.c:1848
+#: apply.c:1865
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告：文件 %s 成为空文件但并未删除"
-#: apply.c:1995
+#: apply.c:2012
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏：%.*s"
-#: apply.c:2032
+#: apply.c:2049
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
-#: apply.c:2193
+#: apply.c:2209
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
-#: apply.c:2276
+#: apply.c:2295
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
-#: apply.c:2280
+#: apply.c:2299
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
-#: apply.c:2933
+#: apply.c:2958
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符：'%c'"
-#: apply.c:3052
+#: apply.c:3077
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"
-#: apply.c:3064
+#: apply.c:3089
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
-#: apply.c:3070
+#: apply.c:3095
#, c-format
msgid ""
"while searching for:\n"
"当查询：\n"
"%.*s"
-#: apply.c:3092
+#: apply.c:3117
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
-#: apply.c:3100
+#: apply.c:3125
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
-#: apply.c:3146
+#: apply.c:3171
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
-#: apply.c:3156
+#: apply.c:3181
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
-#: apply.c:3164
+#: apply.c:3189
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "补丁应用到空文件 '%s'，但其并非空文件"
-#: apply.c:3182
+#: apply.c:3207
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
-#: apply.c:3195
+#: apply.c:3220
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
-#: apply.c:3201
+#: apply.c:3226
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
-#: apply.c:3222
+#: apply.c:3247
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败：%s:%ld"
-#: apply.c:3344
+#: apply.c:3369
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
-#: apply.c:3400
+#: apply.c:3426
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读取位于符号链接中的 '%s'"
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在于索引中"
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不匹配"
-#: apply.c:3556
+#: apply.c:3582
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: apply.c:3559
+#: apply.c:3585
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "回落到三方合并...\n"
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "无法读取 '%s' 的当前内容"
-#: apply.c:3591
+#: apply.c:3617
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "无法回落到三方合并...\n"
-#: apply.c:3605
+#: apply.c:3631
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "应用补丁到 '%s' 存在冲突。\n"
-#: apply.c:3610
+#: apply.c:3636
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功应用补丁到 '%s'。\n"
-#: apply.c:3636
+#: apply.c:3662
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
-#: apply.c:3708
+#: apply.c:3734
#, c-format
msgid "%s: wrong type"
msgstr "%s：错误类型"
-#: apply.c:3710
+#: apply.c:3736
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o，应为 %o"
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
-#: apply.c:3918
+#: apply.c:3944
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已经存在于索引中"
-#: apply.c:3921
+#: apply.c:3947
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已经存在于工作区中"
-#: apply.c:3941
+#: apply.c:3967
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
-#: apply.c:3946
+#: apply.c:3972
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
-#: apply.c:3966
+#: apply.c:3992
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
-#: apply.c:3970
+#: apply.c:3996
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：补丁未应用"
-#: apply.c:3985
+#: apply.c:4011
#, c-format
msgid "Checking patch %s..."
msgstr "检查补丁 %s..."
-#: apply.c:4076
+#: apply.c:4102
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模组 %s 的 sha1 信息缺失或无效"
-#: apply.c:4083
+#: apply.c:4109
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式被改变，但它不在当前 HEAD 中"
-#: apply.c:4086
+#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效（%s）。"
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
-#: apply.c:4095
+#: apply.c:4121
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在临时索引中添加 %s"
-#: apply.c:4105
+#: apply.c:4131
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把临时索引写入到 %s"
-#: apply.c:4243
+#: apply.c:4269
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-#: apply.c:4278
+#: apply.c:4304
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
-#: apply.c:4284
+#: apply.c:4310
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"
-#: apply.c:4292
+#: apply.c:4318
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
-#: apply.c:4339
+#: apply.c:4365
#, c-format
msgid "failed to write to '%s'"
msgstr "无法写入 '%s'"
-#: apply.c:4343
+#: apply.c:4369
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: apply.c:4413
+#: apply.c:4439
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
-#: apply.c:4511
+#: apply.c:4537
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
-#: apply.c:4519
+#: apply.c:4545
msgid "internal error"
msgstr "内部错误"
-#: apply.c:4522
+#: apply.c:4548
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
-#: apply.c:4533
+#: apply.c:4559
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
-#: apply.c:4555
+#: apply.c:4581
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
-#: apply.c:4559
+#: apply.c:4585
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
-#: apply.c:4669
+#: apply.c:4695
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"
-#: apply.c:4677
+#: apply.c:4703
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: apply.c:4696
+#: apply.c:4722
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: apply.c:4833
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s'：%s"
-#: apply.c:4860
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字符误用。"
msgstr[1] "%d 行新增了空白字符误用。"
-#: apply.c:4874
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修复空白错误后，应用了 %d 行。"
msgstr[1] "修复空白错误后，应用了 %d 行。"
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259
+#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187
+#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212
#: git-add--interactive.perl:197
msgid "path"
msgstr "路径"
-#: apply.c:4922
+#: apply.c:4948
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: apply.c:4925
+#: apply.c:4951
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
msgid "num"
msgstr "数字"
-#: apply.c:4928
+#: apply.c:4954
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: apply.c:4931
+#: apply.c:4957
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: apply.c:4933
+#: apply.c:4959
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
-#: apply.c:4937
+#: apply.c:4963
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
-#: apply.c:4939
+#: apply.c:4965
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁，而是显示输入的概要"
-#: apply.c:4941
+#: apply.c:4967
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁，而是查看补丁是否可应用"
-#: apply.c:4943
+#: apply.c:4969
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: apply.c:4945
+#: apply.c:4971
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: apply.c:4947
+#: apply.c:4973
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
-#: apply.c:4949
+#: apply.c:4975
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
-#: apply.c:4951
+#: apply.c:4977
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三方合并"
-#: apply.c:4953
+#: apply.c:4979
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: apply.c:4958
+#: apply.c:4984
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
msgid "action"
msgstr "动作"
-#: apply.c:4960
+#: apply.c:4986
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: apply.c:4963 apply.c:4966
+#: apply.c:4989 apply.c:4992
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: apply.c:4969
+#: apply.c:4995
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: apply.c:4971
+#: apply.c:4997
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: apply.c:4973
+#: apply.c:4999
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: apply.c:4975
+#: apply.c:5001
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21
+#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "冗长输出"
-#: apply.c:4978
+#: apply.c:5004
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
-#: apply.c:4981
+#: apply.c:5007
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:5009 builtin/am.c:2253
msgid "root"
msgstr "根目录"
-#: apply.c:4984
+#: apply.c:5010
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹配任何文件"
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr "格式"
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr "归档格式"
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
msgid "prefix"
msgstr "前缀"
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859
+#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr "文件"
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "归档写入此文件"
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr "只存储"
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr "压缩速度更快"
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr "压缩效果更好"
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001
msgid "repo"
msgstr "仓库"
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库（<仓库>）提取归档文件"
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "命令"
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr "未知参数 --remote"
-#: archive.c:452
+#: archive.c:470
msgid "Option --exec can only be used together with --remote"
msgstr "选项 --exec 只能和 --remote 同时使用"
-#: archive.c:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr "未知参数 --output"
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知归档格式 '%s'"
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "参数不支持此格式 '%s'：-%d"
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一个有效的属性名"
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中：合并基线必须是经过测试的\n"
-#: bisect.c:849
+#: bisect.c:850
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
-#: bisect.c:917
+#: bisect.c:918
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
-#: bisect.c:947
+#: bisect.c:948
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"
-#: bisect.c:967
+#: bisect.c:968
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"
-#: bisect.c:975
+#: bisect.c:976
#, c-format
msgid ""
"No testable commit found.\n"
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数？\n"
-#: bisect.c:994
+#: bisect.c:995
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1001
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
+#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
+#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
+#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
#: branch.c:94
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
#: branch.c:98
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
#: branch.c:99
#, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "分支 %s 设置为跟踪本地分支 %s。"
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
#: branch.c:105
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "分支 %s 设置为跟踪远程引用 %s。"
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
#: branch.c:110
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "分支 %s 设置为跟踪本地引用 %s。"
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgid "A branch named '%s' already exists."
msgstr "一个分支名 '%s' 已经存在。"
-#: branch.c:198
+#: branch.c:197
msgid "Cannot force update the current branch."
msgstr "无法强制更新当前分支。"
-#: branch.c:218
+#: branch.c:217
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"
-#: branch.c:220
+#: branch.c:219
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "请求的上游分支 '%s' 不存在"
-#: branch.c:222
+#: branch.c:221
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
-#: branch.c:265
+#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "不是一个有效的对象名：'%s'。"
-#: branch.c:285
+#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "歧义的对象名：'%s'。"
-#: branch.c:290
+#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "无效的分支点：'%s'。"
-#: branch.c:344
+#: branch.c:343
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已经检出到 '%s'"
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500
+#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807
+#: sequencer.c:2949 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的提交："
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "这个包中含有这个引用："
msgstr[1] "这个包中含有 %d 个引用："
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr "这个包记录一个完整历史。"
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "这个包需要这个引用："
msgstr[1] "这个包需要 %d 个引用："
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr "pack-objects 终止"
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr "rev-list 终止"
-#: bundle.c:356
+#: bundle.c:363
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr "不能创建空包。"
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr "不能创建 '%s'"
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr "index-pack 终止"
msgid "invalid color value: %.*s"
msgstr "无效的颜色值：%.*s"
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交!"
-#: commit.c:1511
+#: commit.c:1517
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "memory exhausted"
msgstr "内存耗尽"
-#: config.c:186
+#: config.c:187
msgid "relative config include conditionals must come from files"
msgstr "包含相对路径的条件引用必须来自于文件"
-#: config.c:720
+#: config.c:721
#, c-format
msgid "bad config line %d in blob %s"
msgstr "数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:724
+#: config.c:725
#, c-format
msgid "bad config line %d in file %s"
msgstr "文件 %2$s 中错误的配置行 %1$d"
-#: config.c:728
+#: config.c:729
#, c-format
msgid "bad config line %d in standard input"
msgstr "标准输入中错误的配置行 %d"
-#: config.c:732
+#: config.c:733
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:736
+#: config.c:737
#, c-format
msgid "bad config line %d in command line %s"
msgstr "命令行 %2$s 中错误的配置行 %1$d"
-#: config.c:740
+#: config.c:741
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中错误的配置行 %1$d"
-#: config.c:868
+#: config.c:869
msgid "out of range"
msgstr "超出范围"
-#: config.c:868
+#: config.c:869
msgid "invalid unit"
msgstr "无效的单位"
-#: config.c:874
+#: config.c:875
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
-#: config.c:879
+#: config.c:880
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:882
+#: config.c:883
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:885
+#: config.c:886
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
-#: config.c:888
+#: config.c:889
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:891
+#: config.c:892
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:894
+#: config.c:895
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:989
+#: config.c:990
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展 '%s' 中的用户目录"
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
-#: config.c:1212
+#: config.c:1213
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式：%s"
-#: config.c:1368
+#: config.c:1372
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
-#: config.c:1564
+#: config.c:1568
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
-#: config.c:1894
+#: config.c:1900
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
-#: config.c:2064
+#: config.c:2087
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s：'%s'"
-#: config.c:2085
+#: config.c:2130
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"
-#: config.c:2111
+#: config.c:2156
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
-#: config.c:2122
+#: config.c:2167
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
-#: config.c:2124
+#: config.c:2169
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:2183
+#: config.c:2228
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
-#: config.c:2635
+#: config.c:2678
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
"\n"
"请确认您有正确的访问权限并且仓库存在。"
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "检查连接中"
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr "无法写入 rev-list"
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr "无法关闭 rev-list 的标准输入"
msgid "Performing inexact rename detection"
msgstr "正在进行非精确的重命名探测"
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr "选项 '%s' 需要一个值"
# 译者：注意保持前导空格
-#: diff.c:125
+#: diff.c:152
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
# 译者：注意保持前导空格
-#: diff.c:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 参数 '%s'\n"
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr "代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'"
+
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
-#: diff.c:342
+#: diff.c:398
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:3101
+#: diff.c:3861
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出，停止在 %s"
-#: diff.c:3427
+#: diff.c:4189
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: diff.c:3517
+#: diff.c:4279
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
-#: diff.c:3680
+#: diff.c:4445
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: diff.c:3694
+#: diff.c:4459
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数：'%s'"
-#: diff.c:4716
+#: diff.c:5505
msgid "inexact rename detection was skipped due to too many files."
msgstr "因为文件太多，略过不严格的重命名检查。"
-#: diff.c:4719
+#: diff.c:5508
msgid "only found copies from modified paths due to too many files."
msgstr "因为文件太多，只在修改的路径中查找拷贝。"
-#: diff.c:4722
+#: diff.c:5511
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
-#: dir.c:1948
+#: dir.c:1983
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"
-#: dir.c:2067
+#: dir.c:2102
msgid "Untracked cache is disabled on this system or location."
msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
-#: dir.c:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
#, c-format
msgid "could not create directories for %s"
msgstr "不能为 %s 创建目录"
-#: dir.c:2876
+#: dir.c:2915
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr "过滤内容"
+
+#: entry.c:433
#, c-format
msgid "could not stat file '%s'"
msgstr "不能对文件 '%s' 调用 stat"
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack：应为 shallow 列表"
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "远程错误：%s"
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-#: fetch-pack.c:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息：%s"
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息：%s"
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr "对象未找到：%s"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr "对象中出错：%s"
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow：%s"
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow，却得到 %s"
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr "放弃"
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
msgid "done"
msgstr "完成"
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
-#: fetch-pack.c:775
+#: fetch-pack.c:776
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s（%s）"
-#: fetch-pack.c:813
+#: fetch-pack.c:814
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：无法派生 sideband 多路输出"
-#: fetch-pack.c:821
+#: fetch-pack.c:822
msgid "protocol error: bad pack header"
msgstr "协议错误：坏的包头"
-#: fetch-pack.c:877
+#: fetch-pack.c:878
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：无法派生进程 %s"
-#: fetch-pack.c:893
+#: fetch-pack.c:894
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: fetch-pack.c:895
+#: fetch-pack.c:896
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
-#: fetch-pack.c:922
+#: fetch-pack.c:923
msgid "Server does not support shallow clients"
msgstr "服务器不支持 shalllow 客户端"
-#: fetch-pack.c:926
+#: fetch-pack.c:927
msgid "Server supports multi_ack_detailed"
msgstr "服务器支持 multi_ack_detailed"
-#: fetch-pack.c:929
+#: fetch-pack.c:930
msgid "Server supports no-done"
msgstr "服务器支持 no-done"
-#: fetch-pack.c:935
+#: fetch-pack.c:936
msgid "Server supports multi_ack"
msgstr "服务器支持 multi_ack"
-#: fetch-pack.c:939
+#: fetch-pack.c:940
msgid "Server supports side-band-64k"
msgstr "服务器支持 side-band-64k"
-#: fetch-pack.c:943
+#: fetch-pack.c:944
msgid "Server supports side-band"
msgstr "服务器支持 side-band"
-#: fetch-pack.c:947
+#: fetch-pack.c:948
msgid "Server supports allow-tip-sha1-in-want"
msgstr "服务器支持 allow-tip-sha1-in-want"
-#: fetch-pack.c:951
+#: fetch-pack.c:952
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "服务器支持 allow-reachable-sha1-in-want"
-#: fetch-pack.c:961
+#: fetch-pack.c:962
msgid "Server supports ofs-delta"
msgstr "服务器支持 ofs-delta"
-#: fetch-pack.c:968
+#: fetch-pack.c:969
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
-#: fetch-pack.c:974
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
-#: fetch-pack.c:978
+#: fetch-pack.c:979
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
-#: fetch-pack.c:980
+#: fetch-pack.c:981
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
-#: fetch-pack.c:991
+#: fetch-pack.c:992
msgid "no common commits"
msgstr "没有共同的提交"
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：获取失败。"
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"
msgid "could not create temporary file"
msgstr "不能创建临时文件"
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "无法将分离式签名写入 '%s'"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
-#: grep.c:1981
+#: grep.c:1970
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：无法读取 %s"
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "对 '%s' 调用 stat 失败"
-#: grep.c:2009
+#: grep.c:1998
#, c-format
msgid "'%s': short read"
msgstr "'%s'：读取不完整"
msgid_plural ""
"\n"
"The most similar commands are"
-msgstr[0] "\n最相似的命令是"
-msgstr[1] "\n最相似的命令是"
+msgstr[0] ""
+"\n"
+"最相似的命令是"
+msgstr[1] ""
+"\n"
+"最相似的命令是"
#: help.c:395
msgid "git version [<options>]"
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中仅包含禁用字符：%s"
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格式：%s"
-#: lockfile.c:152
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
"可能之前有一个 git 进程在这个仓库中异常退出：\n"
"手动删除这个文件再继续。"
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "不能创建 '%s.lock'：%s"
msgid "failed to read the cache"
msgstr "无法读取缓存"
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr "（坏提交）\n"
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "为路径 '%s' addinfo_cache 失败"
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr "无法创建树"
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
msgstr "无法创建路径 '%s'%s"
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr "：可能是一个目录/文件冲突？"
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据对象"
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
msgstr "无法打开 '%s'：%s"
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "无法创建符号链接 '%s'：%s"
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本被保留。"
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本被保留。"
-#: merge-recursive.c:1105
+#: merge-recursive.c:1129
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本保留在 %8$s 中。"
-#: merge-recursive.c:1110
+#: merge-recursive.c:1134
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本保留在 %9$s 中。"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr "重命名"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr "重命名"
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr "（留下未解决）"
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
"%5$s"
-#: merge-recursive.c:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr "添加合并后的 %s"
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr "内容"
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr "添加/添加"
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s（已经做过相同合并）"
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
msgid "submodule"
msgstr "子模组"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突（%s）：合并冲突于 %s"
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
-#: merge-recursive.c:1893
+#: merge-recursive.c:1917
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
msgstr "已经是最新的！"
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
msgid "Merging:"
msgstr "合并："
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先："
msgstr[1] "发现 %u 个共同祖先："
-#: merge-recursive.c:2074
+#: merge-recursive.c:2112
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
msgid "Unable to write index."
msgstr "不能写入索引。"
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
"在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "
"notes merge --abort' 来提交/终止前一次合并。"
-#: notes-merge.c:280
+#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "您尚未结束注释合并（存在 %s）。"
msgid "Bad %s value: '%s'"
msgstr "坏的 %s 值：'%s'"
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr "不能解析对象：%s"
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
+
#: parse-options.c:573
msgid "..."
msgstr "..."
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr "用法：%s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr " 或：%s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr "-数字"
msgid "malformed object name '%s'"
msgstr "非法的对象名 '%s'"
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr "不能设置 %s 为组可写"
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
-#: pathspec.c:575
+#: pathspec.c:571
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
"在下一个版本中，使用空字符串作为路径规格将被视作非法。如果要匹配所有路径，\n"
"请代之以 ."
-#: pathspec.c:599
+#: pathspec.c:595
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路径规格 '%s' 位于符号链接中"
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
#, c-format
msgid "could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: read-cache.c:2396
+#: read-cache.c:2407
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能打开 git 目录：%s"
-#: read-cache.c:2408
+#: read-cache.c:2419
#, c-format
msgid "unable to unlink: %s"
msgstr "无法删除：%s"
-#: refs.c:622
+#: refs.c:638
#, c-format
msgid "Could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: refs.c:1769
+#: refs.c:1792
msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔离环境中禁止更新引用"
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "无法删除引用 %s"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s：%s"
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用：%s"
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "无法删除引用 %s"
-
#: ref-filter.c:35 wt-status.c:1811
msgid "gone"
msgstr "丢失"
msgid "unrecognized color: %%(color:%s)"
msgstr "未能识别的颜色：%%(color:%s)"
-#: ref-filter.c:121
+#: ref-filter.c:127
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "期望整数值 refname:lstrip=%s"
-#: ref-filter.c:125
+#: ref-filter.c:131
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "期望整数值 refname:rstrip=%s"
-#: ref-filter.c:127
+#: ref-filter.c:133
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "未能识别的 %%(%s) 参数：%s"
-#: ref-filter.c:167
+#: ref-filter.c:173
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不带参数"
-#: ref-filter.c:174
+#: ref-filter.c:180
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) 不带参数"
-#: ref-filter.c:181
+#: ref-filter.c:198
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) 不带参数"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "未知的 %%(trailers) 参数：%s"
-#: ref-filter.c:200
+#: ref-filter.c:221
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "期望一个正数 contents:lines=%s"
-#: ref-filter.c:202
+#: ref-filter.c:223
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "未能识别的 %%(contents) 参数：%s"
-#: ref-filter.c:215
+#: ref-filter.c:236
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "期望一个正数 objectname:short=%s"
-#: ref-filter.c:219
+#: ref-filter.c:240
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "未能识别的 %%(objectname) 参数：%s"
-#: ref-filter.c:246
+#: ref-filter.c:267
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "期望的格式：%%(align:<width>,<position>)"
-#: ref-filter.c:258
+#: ref-filter.c:279
#, c-format
msgid "unrecognized position:%s"
msgstr "未能识别的位置：%s"
-#: ref-filter.c:262
+#: ref-filter.c:283
#, c-format
msgid "unrecognized width:%s"
msgstr "未能识别的宽度：%s"
-#: ref-filter.c:268
+#: ref-filter.c:289
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "未能识别的 %%(align) 参数：%s"
-#: ref-filter.c:272
+#: ref-filter.c:293
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一个正数的宽度"
-#: ref-filter.c:287
+#: ref-filter.c:308
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "未能识别的 %%(if) 参数：%s"
-#: ref-filter.c:378
+#: ref-filter.c:398
#, c-format
msgid "malformed field name: %.*s"
msgstr "非法的字段名：%.*s"
-#: ref-filter.c:404
+#: ref-filter.c:424
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的字段名：%.*s"
-#: ref-filter.c:508
+#: ref-filter.c:536
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"
-#: ref-filter.c:568
+#: ref-filter.c:596
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
-#: ref-filter.c:570
+#: ref-filter.c:598
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "格式：%%(then) 元素用了多次"
-#: ref-filter.c:572
+#: ref-filter.c:600
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
-#: ref-filter.c:598
+#: ref-filter.c:626
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
-#: ref-filter.c:600
+#: ref-filter.c:628
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"
-#: ref-filter.c:602
+#: ref-filter.c:630
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "格式：%%(else) 元素用了多次"
-#: ref-filter.c:615
+#: ref-filter.c:643
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
-#: ref-filter.c:670
+#: ref-filter.c:698
#, c-format
msgid "malformed format string %s"
msgstr "非法的格式化字符串 %s"
-#: ref-filter.c:1254
+#: ref-filter.c:1283
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "（非分支，正变基 %s）"
-#: ref-filter.c:1257
+#: ref-filter.c:1286
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "（非分支，二分查找开始于 %s）"
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1294
#, c-format
msgid "(HEAD detached at %s)"
msgstr "（头指针分离于 %s）"
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1301
#, c-format
msgid "(HEAD detached from %s)"
msgstr "（头指针分离自 %s）"
-#: ref-filter.c:1276
+#: ref-filter.c:1305
msgid "(no branch)"
msgstr "（非分支）"
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
#, c-format
msgid "missing object %s for %s"
msgstr "缺失 %2$s 的对象 %1$s"
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-#: ref-filter.c:1760
+#: ref-filter.c:1788
#, c-format
msgid "malformed object at '%s'"
msgstr "非法的对象于 '%s'"
-#: ref-filter.c:1827
+#: ref-filter.c:1855
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略带有错误名称 %s 的引用"
-#: ref-filter.c:1832
+#: ref-filter.c:1860
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略损坏的引用 %s"
-#: ref-filter.c:2095
+#: ref-filter.c:2122
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式：缺少 %%(end) 元素"
-#: ref-filter.c:2176
+#: ref-filter.c:2216
#, c-format
msgid "malformed object name %s"
msgstr "非法的对象名 %s"
-#: remote.c:747
+#: remote.c:750
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同时获取 %s 和 %s 至 %s"
-#: remote.c:751
+#: remote.c:754
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常跟踪 %s，而非 %s"
-#: remote.c:755
+#: remote.c:758
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同时跟踪 %s 和 %s"
-#: remote.c:763
+#: remote.c:766
msgid "Internal error"
msgstr "内部错误"
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支：'%s'"
-#: remote.c:1692
+#: remote.c:1693
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
-#: remote.c:1698
+#: remote.c:1699
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: remote.c:1713
+#: remote.c:1714
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
-#: remote.c:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置要推送的远程服务器"
-#: remote.c:1736
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用规格未包含 '%s'"
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送无目标（push.default 是 'nothing'）"
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr "无法解析 'simple' 推送至一个单独的目标"
#: remote.c:2083
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
#: remote.c:2087
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " （使用 \"git pull\" 来合并远程分支）\n"
-#: revision.c:2187
+#: revision.c:2256
msgid "your current branch appears to be broken"
msgstr "您的当前分支好像被损坏"
-#: revision.c:2190
+#: revision.c:2259
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当前分支 '%s' 尚无任何提交"
-#: revision.c:2384
+#: revision.c:2453
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent 与 --bisect 不兼容"
msgid "the receiving end does not support push options"
msgstr "接收端不支持推送选项"
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr "还原"
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr "拣选"
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr "未知动作：%d"
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"命令标记修正后的文件"
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"对修正后的文件做标记，然后用 'git commit' 提交"
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
#, c-format
msgid "failed to finalize '%s'."
msgstr "无法完成 '%s'。"
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本地修改将被%s覆盖。"
-#: sequencer.c:360
+#: sequencer.c:362
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或贮藏后再继续。"
-#: sequencer.c:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr "%s：快进"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:474
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s：无法写入新索引文件"
-#: sequencer.c:491
+#: sequencer.c:493
msgid "could not resolve HEAD commit\n"
msgstr "不能解析 HEAD 提交\n"
-#: sequencer.c:511
+#: sequencer.c:513
msgid "unable to update cache tree\n"
msgstr "不能更新缓存树\n"
-#: sequencer.c:595
+#: sequencer.c:597
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:697
+#: sequencer.c:699
#, c-format
msgid "could not parse commit %s\n"
msgstr "不能解析提交 %s\n"
-#: sequencer.c:702
+#: sequencer.c:704
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "不能解析父提交 %s\n"
-#: sequencer.c:824
+#: sequencer.c:826
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
"\n"
"\t%.*s"
-#: sequencer.c:830
+#: sequencer.c:832
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
"\n"
"\t%.*s"
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
-#: sequencer.c:847
+#: sequencer.c:849
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:849
+#: sequencer.c:851
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
-#: sequencer.c:855
+#: sequencer.c:857
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明："
-#: sequencer.c:872
+#: sequencer.c:874
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
-#: sequencer.c:879
+#: sequencer.c:881
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d："
-#: sequencer.c:884
+#: sequencer.c:886
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过："
-#: sequencer.c:889
+#: sequencer.c:891
#, c-format
msgid "unknown command: %d"
msgstr "未知命令：%d"
-#: sequencer.c:955
+#: sequencer.c:957
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
-#: sequencer.c:973
+#: sequencer.c:975
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: sequencer.c:981
+#: sequencer.c:983
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
-#: sequencer.c:985
+#: sequencer.c:987
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "指定了主线，但是提交 %s 不是一个合并提交。"
-#: sequencer.c:991
+#: sequencer.c:993
#, c-format
msgid "cannot get commit message for %s"
msgstr "不能得到 %s 的提交说明"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1012
+#: sequencer.c:1014
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
-#: sequencer.c:1126
+#: sequencer.c:1128
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
-#: sequencer.c:1127
+#: sequencer.c:1129
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
-#: sequencer.c:1169
+#: sequencer.c:1171
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:1179
+#: sequencer.c:1181
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：无法读取索引"
-#: sequencer.c:1186
+#: sequencer.c:1188
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：无法刷新索引"
-#: sequencer.c:1306
+#: sequencer.c:1308
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d：%.*s"
-#: sequencer.c:1314
+#: sequencer.c:1316
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
#, c-format
msgid "could not read '%s'."
msgstr "不能读取 '%s'。"
-#: sequencer.c:1359
+#: sequencer.c:1361
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: sequencer.c:1361
+#: sequencer.c:1363
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单：'%s'"
-#: sequencer.c:1366
+#: sequencer.c:1368
msgid "no commits parsed."
msgstr "没有解析提交。"
-#: sequencer.c:1377
+#: sequencer.c:1379
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
-#: sequencer.c:1379
+#: sequencer.c:1381
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
-#: sequencer.c:1442
+#: sequencer.c:1448
#, c-format
msgid "invalid key: %s"
msgstr "无效键名：%s"
-#: sequencer.c:1445
+#: sequencer.c:1451
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效：%s"
-#: sequencer.c:1502
+#: sequencer.c:1517
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "非法的选项清单：'%s'"
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "a cherry-pick or revert is already in progress"
msgstr "一个拣选或还原操作已在进行"
-#: sequencer.c:1541
+#: sequencer.c:1556
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1544
+#: sequencer.c:1559
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
-#: sequencer.c:1558
+#: sequencer.c:1574
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:1616
+#: sequencer.c:1634
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: sequencer.c:1640
+#: sequencer.c:1659
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s'：%s"
-#: sequencer.c:1641
+#: sequencer.c:1660
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:1647
+#: sequencer.c:1666
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:1658
+#: sequencer.c:1677
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
-#: sequencer.c:1851
+#: sequencer.c:1874
msgid "could not read index"
msgstr "不能读取索引"
# 译者：注意保持前导空格
-#: sequencer.c:1856
+#: sequencer.c:1879
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:1862
+#: sequencer.c:1885
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
-#: sequencer.c:1868
+#: sequencer.c:1891
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:1925
+#: sequencer.c:1948
#, c-format
msgid "Applied autostash.\n"
msgstr "已应用 autostash。\n"
-#: sequencer.c:1937
+#: sequencer.c:1960
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"您的修改安全地保存在贮藏区中。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:2022
+#: sequencer.c:2045
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:2064
+#: sequencer.c:2087
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
-#: sequencer.c:2094
+#: sequencer.c:2117
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
-#: sequencer.c:2106
+#: sequencer.c:2129
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:2113
+#: sequencer.c:2136
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
-#: sequencer.c:2197
+#: sequencer.c:2220
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
-#: sequencer.c:2202
+#: sequencer.c:2225
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: sequencer.c:2211
+#: sequencer.c:2234
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
-#: sequencer.c:2213
+#: sequencer.c:2236
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件：'%s'"
-#: sequencer.c:2215
+#: sequencer.c:2238
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容：'%s'"
-#: sequencer.c:2218
+#: sequencer.c:2241
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: sequencer.c:2228
+#: sequencer.c:2251
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: sequencer.c:2308
+#: sequencer.c:2331
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能拣选一个%s"
-#: sequencer.c:2312
+#: sequencer.c:2335
#, c-format
msgid "%s: bad revision"
msgstr "%s：错误的版本"
-#: sequencer.c:2345
+#: sequencer.c:2368
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script：有未能处理的选项"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script：准备版本时错误"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "不可用的待办列表：'%s'"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "无法以写入方式打开 '%s'"
+
+#: sequencer.c:2561
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
+
+#: sequencer.c:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"警告：一些提交可能被意外丢弃。\n"
+"丢弃的提交（从新到旧）：\n"
+
+#: sequencer.c:2648
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"
+"\n"
+"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
+"可选值有：ignore、warn、error。\n"
+"\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"
+"或者您可以用 'git rebase --abort' 终止变基。\n"
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "不能解析提交 '%s'"
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "无法打开 '%s' 进行写入"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "无法截断 '%s'"
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "脚本已经重新编排。"
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "无法结束 '%s'"
+
#: setup.c:171
#, c-format
msgid ""
"使用 '--' 来分隔版本和路径，例如：\n"
"'git <command> [<revision>...] -- [<file>...]'"
-#: setup.c:504
+#: setup.c:499
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 仓库版本 <= %d，却得到 %d"
-#: setup.c:512
+#: setup.c:507
msgid "unknown repository extensions found:"
msgstr "发现未知的仓库扩展："
-#: setup.c:810
+#: setup.c:806
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "不是一个 git 仓库（或者任何父目录）：%s"
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: setup.c:1050
+#: setup.c:1046
msgid "Unable to read current working directory"
msgstr "不能读取当前工作目录"
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
#, c-format
msgid "Cannot change to '%s'"
msgstr "不能切换到 '%s'"
-#: setup.c:1081
+#: setup.c:1077
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
"不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"
"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
-#: setup.c:1173
+#: setup.c:1159
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
"参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"
"文件属主必须始终拥有读写权限。"
-#: sha1_file.c:560
+#: sha1_file.c:528
#, c-format
msgid "path '%s' does not exist"
msgstr "路径 '%s' 不存在"
-#: sha1_file.c:586
+#: sha1_file.c:554
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
-#: sha1_file.c:592
+#: sha1_file.c:560
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "参考仓库 '%s' 不是一个本地仓库。"
-#: sha1_file.c:598
+#: sha1_file.c:566
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "参考仓库 '%s' 是一个浅克隆"
-#: sha1_file.c:606
+#: sha1_file.c:574
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "参考仓库 '%s' 已被嫁接"
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
-
-#: sha1_name.c:419
+#: sha1_name.c:420
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "短 SHA1 %s 存在歧义"
-#: sha1_name.c:430
+#: sha1_name.c:431
msgid "The candidates are:"
msgstr "候选者有："
-#: sha1_name.c:589
+#: sha1_name.c:590
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
"命令关闭本消息通知。"
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
-#: submodule.c:82
+#: submodule.c:105
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "不能更新 .gitmodules 条目 %s"
-#: submodule.c:115
+#: submodule.c:138
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "无法移除 %s 的 .gitmodules 条目"
-#: submodule.c:126
+#: submodule.c:149
msgid "staging updated .gitmodules failed"
msgstr "将更新后 .gitmodules 添加暂存区失败"
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "submodule.fetchJobs 不允许为负值"
-
-#: submodule.c:376
+#: submodule.c:309
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "位于未检出的子模组 '%s'"
-#: submodule.c:407
+#: submodule.c:340
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
-#: submodule.c:1337
+#: submodule.c:799
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
+
+#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "无法将 HEAD 解析为有效引用。"
+
+#: submodule.c:1304
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "无法将 '%s' 识别为一个 git 仓库"
-#: submodule.c:1475
+#: submodule.c:1442
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中启动 'git status'"
-#: submodule.c:1488
+#: submodule.c:1455
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中执行 'git status'"
-#: submodule.c:1581
+#: submodule.c:1548
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "子模组 '%s' 中有脏索引"
-#: submodule.c:1845
+#: submodule.c:1809
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查询子模组 '%s' 的名称"
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: submodule.c:1864
+#: submodule.c:1828
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' 迁移至\n"
"'%s'\n"
-#: submodule.c:1948
+#: submodule.c:1912
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "无法递归进子模组路径 '%s'"
-#: submodule.c:1992
+#: submodule.c:1956
msgid "could not start ls-files in .."
msgstr "无法在 .. 中启动 ls-files"
-#: submodule.c:2012
+#: submodule.c:1976
msgid "BUG: returned path string doesn't match cwd?"
msgstr "BUG：返回的路径和当前路径不匹配？"
-#: submodule.c:2031
+#: submodule.c:1995
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "submodule.fetchjobs 不允许为负值"
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr "%s 的值无效"
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "执行 trailer 命令 '%s' 失败"
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "键 '%2$s' 的未知取值 '%1$s'"
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "多于一个 %s"
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "签名 '%.*s' 的键为空"
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr "不能读取输入文件 '%s'"
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr "不能自标准输入读取"
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr "不能对 %s 调用 stat"
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr "文件 %s 不是一个正规文件"
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr "文件 %s 用户不可写"
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr "不能打开临时文件"
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr "不能重命名临时文件为 %s"
-#: transport.c:63
+#: transport.c:62
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
-#: transport.c:152
+#: transport.c:151
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "传输：无效的深度选项 '%s'"
-#: transport.c:890
+#: transport.c:888
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
-#: transport.c:894
+#: transport.c:892
#, c-format
msgid ""
"\n"
"以推送至远程。\n"
"\n"
-#: transport.c:902
+#: transport.c:900
msgid "Aborting."
msgstr "正在终止。"
msgid "empty filename in tree entry"
msgstr "树对象条目中空的文件名"
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr "太短的树文件"
-#: unpack-trees.c:105
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"您对下列文件的本地修改将被检出操作覆盖：\n"
"%%s请在切换分支前提交或贮藏您的修改。"
-#: unpack-trees.c:107
+#: unpack-trees.c:108
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"您对下列文件的本地修改将被检出操作覆盖：\n"
"%%s"
-#: unpack-trees.c:110
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s请在合并前提交或贮藏您的修改。"
-#: unpack-trees.c:112
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s请在 %s 之前提交或贮藏您的修改。"
-#: unpack-trees.c:117
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:123
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"更新如下目录将会丢失其中未跟踪的文件：\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s请在切换分支之前移动或删除。"
-#: unpack-trees.c:128
+#: unpack-trees.c:129
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:133
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:138
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s请在切换分支前移动或删除。"
-#: unpack-trees.c:145
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:148
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:150
+#: unpack-trees.c:151
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:153
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:155
+#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:163
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
-#: unpack-trees.c:165
+#: unpack-trees.c:166
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
"无法更新稀疏检出：如下条目不是最新：\n"
"%s"
-#: unpack-trees.c:167
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"工作区中下列文件将被稀疏检出更新所覆盖：\n"
"%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"工作区中下列文件将被稀疏检出更新所删除：\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:172
#, c-format
msgid ""
"Cannot update submodule:\n"
"无法更新子模组：\n"
"%s"
-#: unpack-trees.c:248
+#: unpack-trees.c:249
#, c-format
msgid "Aborting\n"
msgstr "终止中\n"
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "子模组 %s 不支持子模组更新策略"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
msgid "Checking out files"
msgstr "正在检出文件"
msgid "could not open '%s' for reading and writing"
msgstr "无法打开 '%s' 进行读写"
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "无法打开 '%s' 进行写入"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
msgid "could not close %s"
msgstr "不能关闭 %s"
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "未合并的路径："
# 译者：注意保持前导空格
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"
# 译者：注意保持前导空格
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"
# 译者：注意保持前导空格
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " （使用 \"git add <文件>...\" 标记解决方案）"
# 译者：注意保持前导空格
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
# 译者：注意保持前导空格
-#: wt-status.c:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
msgid "Changes to be committed:"
msgstr "要提交的变更："
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备提交的变更："
# 译者：注意保持前导空格
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:225
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
# 译者：注意保持前导空格
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr "双方删除："
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr "由我们添加："
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "由他们删除："
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr "由他们添加："
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "由我们删除："
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr "双方添加："
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr "双方修改："
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr "新文件："
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr "拷贝："
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr "删除："
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr "修改："
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr "重命名："
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr "类型变更："
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr "未知："
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr "未合并："
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr "新提交, "
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr "修改的内容, "
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr "未跟踪的内容, "
-#: wt-status.c:821
+#: wt-status.c:819
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "您的贮藏区当前有 %d 条记录"
msgstr[1] "您的贮藏区当前有 %d 条记录"
-#: wt-status.c:853
+#: wt-status.c:851
msgid "Submodules changed but not updated:"
msgstr "子模组已修改但尚未更新："
-#: wt-status.c:855
+#: wt-status.c:853
msgid "Submodule changes to be committed:"
msgstr "要提交的子模组变更："
-#: wt-status.c:937
+#: wt-status.c:935
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-"不要改动上面的一行。\n"
-"下面的所有内容均将被删除。"
+"不要改动或删除上面的一行。\n"
+"其下所有内容都将被忽略。"
-#: wt-status.c:1049
+#: wt-status.c:1048
msgid "You have unmerged paths."
msgstr "您有尚未合并的路径。"
# 译者：注意保持前导空格
-#: wt-status.c:1052
+#: wt-status.c:1051
msgid " (fix conflicts and run \"git commit\")"
msgstr " （解决冲突并运行 \"git commit\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1054
+#: wt-status.c:1053
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " （使用 \"git merge --abort\" 终止合并）"
-#: wt-status.c:1059
+#: wt-status.c:1058
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲突已解决但您仍处于合并中。"
# 译者：注意保持前导空格
-#: wt-status.c:1062
+#: wt-status.c:1061
msgid " (use \"git commit\" to conclude merge)"
msgstr " （使用 \"git commit\" 结束合并）"
-#: wt-status.c:1072
+#: wt-status.c:1071
msgid "You are in the middle of an am session."
msgstr "您正处于 am 操作过程中。"
-#: wt-status.c:1075
+#: wt-status.c:1074
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
# 译者：注意保持前导空格
-#: wt-status.c:1079
+#: wt-status.c:1078
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " （解决冲突，然后运行 \"git am --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1081
+#: wt-status.c:1080
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " （使用 \"git am --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1083
+#: wt-status.c:1082
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " （使用 \"git am --abort\" 恢复原有分支）"
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s：您的索引中包含未提交的变更。"
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
msgstr "无法删除 '%s'"
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
msgid "updating files failed"
msgstr "更新文件失败"
msgid "remove '%s'\n"
msgstr "删除 '%s'\n"
-#: builtin/add.c:151
+#: builtin/add.c:153
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更："
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr "不能读取索引"
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not open '%s' for writing."
msgstr "无法打开 '%s' 进行写入。"
-#: builtin/add.c:226
+#: builtin/add.c:228
msgid "Could not write patch"
msgstr "不能生成补丁"
-#: builtin/add.c:229
+#: builtin/add.c:231
msgid "editing patch failed"
msgstr "编辑补丁失败"
-#: builtin/add.c:232
+#: builtin/add.c:234
#, c-format
msgid "Could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/add.c:234
+#: builtin/add.c:236
msgid "Empty patch. Aborted."
msgstr "空补丁。异常终止。"
-#: builtin/add.c:239
+#: builtin/add.c:241
#, c-format
msgid "Could not apply '%s'"
msgstr "不能应用 '%s'"
-#: builtin/add.c:249
+#: builtin/add.c:251
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124
#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "演习"
-#: builtin/add.c:272
+#: builtin/add.c:274
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
-#: builtin/add.c:274
+#: builtin/add.c:276
msgid "edit current diff and apply"
msgstr "编辑当前差异并应用"
-#: builtin/add.c:275
+#: builtin/add.c:277
msgid "allow adding otherwise ignored files"
msgstr "允许添加忽略的文件"
-#: builtin/add.c:276
+#: builtin/add.c:278
msgid "update tracked files"
msgstr "更新已跟踪的文件"
-#: builtin/add.c:277
+#: builtin/add.c:279
msgid "record only the fact that the path will be added later"
msgstr "只记录，该路径稍后再添加"
-#: builtin/add.c:278
+#: builtin/add.c:280
msgid "add changes from all tracked and untracked files"
msgstr "添加所有改变的已跟踪文件和未跟踪文件"
-#: builtin/add.c:281
+#: builtin/add.c:283
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
-#: builtin/add.c:283
+#: builtin/add.c:285
msgid "don't add, only refresh the index"
msgstr "不添加，只刷新索引"
-#: builtin/add.c:284
+#: builtin/add.c:286
msgid "just skip files which cannot be added because of errors"
msgstr "跳过因出错不能添加的文件"
-#: builtin/add.c:285
+#: builtin/add.c:287
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
msgid "override the executable bit of the listed files"
msgstr "覆盖列表里文件的可执行位"
-#: builtin/add.c:288
+#: builtin/add.c:290
msgid "warn when adding an embedded repository"
msgstr "创建一个嵌入式仓库时给予警告"
-#: builtin/add.c:303
+#: builtin/add.c:305
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"\n"
"See \"git help submodule\" for more information."
msgstr ""
-"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容，并且不知道该如何获取它。\n"
+"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容，并"
+"且不知道该如何获取它。\n"
"如果您要添加一个子模组，使用：\n"
"\n"
"\tgit submodule add <url> %s\n"
"\n"
"参见 \"git help submodule\" 获取更多信息。"
-#: builtin/add.c:331
+#: builtin/add.c:333
#, c-format
msgid "adding embedded git repository: %s"
msgstr "正在添加嵌入式 git 仓库：%s"
-#: builtin/add.c:349
+#: builtin/add.c:351
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "使用 -f 参数如果您确实要添加它们。\n"
-#: builtin/add.c:357
+#: builtin/add.c:359
msgid "adding files failed"
msgstr "添加文件失败"
-#: builtin/add.c:394
+#: builtin/add.c:396
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 选项互斥"
-#: builtin/add.c:401
+#: builtin/add.c:403
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
-#: builtin/add.c:405
+#: builtin/add.c:407
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
-#: builtin/add.c:420
+#: builtin/add.c:422
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件，也没有文件被添加。\n"
-#: builtin/add.c:421
+#: builtin/add.c:423
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想要执行 'git add .'？\n"
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282
+#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350
+#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271
+#: builtin/submodule--helper.c:243
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "不能解析作者脚本"
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行：'%s'。"
-#: builtin/am.c:567
+#: builtin/am.c:576
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:777
+#: builtin/am.c:786
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
-#: builtin/am.c:842
+#: builtin/am.c:851
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: builtin/am.c:889
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:897
+#: builtin/am.c:911
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
-#: builtin/am.c:986
+#: builtin/am.c:1004
msgid "Patch format detection failed."
msgstr "补丁格式探测失败。"
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: builtin/am.c:995
+#: builtin/am.c:1013
msgid "Failed to split patches."
msgstr "无法拆分补丁。"
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1171
+#: builtin/am.c:1193
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题，执行 \"%s --continue\"。"
-#: builtin/am.c:1172
+#: builtin/am.c:1194
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
-#: builtin/am.c:1173
+#: builtin/am.c:1195
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
-#: builtin/am.c:1304
+#: builtin/am.c:1302
msgid "Patch is empty."
msgstr "补丁为空。"
-#: builtin/am.c:1370
+#: builtin/am.c:1368
#, c-format
msgid "invalid ident line: %.*s"
msgstr "无效的身份标识：%.*s"
-#: builtin/am.c:1392
+#: builtin/am.c:1390
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: builtin/am.c:1586
+#: builtin/am.c:1584
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/am.c:1588
+#: builtin/am.c:1586
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个（三方合并的）基础目录树..."
-#: builtin/am.c:1607
+#: builtin/am.c:1605
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"您是否曾手动编辑过您的补丁？\n"
"无法应用补丁到索引中的数据对象上。"
-#: builtin/am.c:1613
+#: builtin/am.c:1611
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/am.c:1638
+#: builtin/am.c:1636
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入一树对象"
-#: builtin/am.c:1669
+#: builtin/am.c:1667
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
msgid "failed to write commit object"
msgstr "无法写提交对象"
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续：%s 不存在。"
-#: builtin/am.c:1735
+#: builtin/am.c:1733
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "标准输入没有和终端关联，不能进行交互式操作。"
-#: builtin/am.c:1740
+#: builtin/am.c:1738
msgid "Commit Body is:"
msgstr "提交内容为："
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
-#: builtin/am.c:1800
+#: builtin/am.c:1798
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引：不能应用补丁（脏文件：%s）"
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
#, c-format
msgid "Applying: %.*s"
msgstr "应用：%.*s"
-#: builtin/am.c:1856
+#: builtin/am.c:1854
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:1864
+#: builtin/am.c:1862
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:1870
+#: builtin/am.c:1868
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "失败的补丁文件副本位于：%s"
-#: builtin/am.c:1915
+#: builtin/am.c:1913
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
-#: builtin/am.c:1922
+#: builtin/am.c:1920
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:2083
+#: builtin/am.c:2081
msgid "failed to clean index"
msgstr "无法清空索引"
-#: builtin/am.c:2117
+#: builtin/am.c:2116
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
-#: builtin/am.c:2180
+#: builtin/am.c:2179
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值：%s"
-#: builtin/am.c:2213
+#: builtin/am.c:2212
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2213
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2219
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:2224
+#: builtin/am.c:2223
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允许使用三方合并。"
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:2227
+#: builtin/am.c:2226
msgid "add a Signed-off-by line to the commit message"
msgstr "在提交说明中添加一个 Signed-off-by 签名"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集（默认）"
-#: builtin/am.c:2232
+#: builtin/am.c:2231
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:2238
+#: builtin/am.c:2237
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:2241
+#: builtin/am.c:2240
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254
+#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266
+#: builtin/am.c:2272
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667
+#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "格式"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:2276
+#: builtin/am.c:2275
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:2278
+#: builtin/am.c:2277
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:2281
+#: builtin/am.c:2280
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:2284
+#: builtin/am.c:2283
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:2287
+#: builtin/am.c:2286
msgid "restore the original branch and abort the patching operation."
msgstr "恢复原始分支并终止打补丁操作。"
-#: builtin/am.c:2291
+#: builtin/am.c:2290
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:2293
+#: builtin/am.c:2292
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:2299
+#: builtin/am.c:2298
msgid "(internal use for git-rebase)"
msgstr "（内部使用，用于 git-rebase）"
-#: builtin/am.c:2317
+#: builtin/am.c:2316
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
"请不要再使用它了。"
-#: builtin/am.c:2324
+#: builtin/am.c:2323
msgid "failed to read the index"
msgstr "无法读取索引"
-#: builtin/am.c:2339
+#: builtin/am.c:2338
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
-#: builtin/am.c:2363
+#: builtin/am.c:2362
#, c-format
msgid ""
"Stray %s directory found.\n"
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2369
+#: builtin/am.c:2368
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<选项>] [-r | -a] [--points-at]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<选项>] [-r | -a] [--format]"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s'，但未合并到 HEAD。"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
" 然而却尚未被合并到分支 '%s' 。"
-#: builtin/branch.c:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"分支 '%s' 没有完全合并。\n"
"如果您确认要删除它，执行 'git branch -D %s'。"
-#: builtin/branch.c:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
-msgstr "æ\97 æ³\95æ\9b´æ\96° config æ\96\87件"
+msgstr "æ\9b´æ\96°é\85\8dç½®æ\96\87件失败"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 同时使用"
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
-#: builtin/branch.c:246
+#: builtin/branch.c:247
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到远程跟踪分支 '%s'。"
-#: builtin/branch.c:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未发现。"
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "无法删除远程跟踪分支 '%s'"
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
msgstr "无法删除分支 '%s'"
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "不能解析格式化字符串"
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被变基到 %s"
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分查找于 %s"
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr "无法拷贝当前分支因为不处于任何分支上。"
+
+#: builtin/branch.c:472
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
-#: builtin/branch.c:474
+#: builtin/branch.c:483
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名：'%s'"
-#: builtin/branch.c:491
+#: builtin/branch.c:504
msgid "Branch rename failed"
msgstr "分支重命名失败"
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "分支拷贝失败"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "已将错误命名的分支 '%s' 复制"
+
+#: builtin/branch.c:513
#, c-format
msgid "Renamed a misnamed branch '%s' away"
-msgstr "重命名掉一个错误命名的旧分支 '%s'"
+msgstr "已将错误命名的分支 '%s' 重命名"
-#: builtin/branch.c:497
+#: builtin/branch.c:519
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s，但 HEAD 没有更新！"
-#: builtin/branch.c:506
+#: builtin/branch.c:528
msgid "Branch is renamed, but update of config-file failed"
-msgstr "分支被重命名，但更新 config 文件失败"
+msgstr "分支被重命名，但更新配置文件失败"
+
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr "分支已拷贝，但更新配置文件失败"
-#: builtin/branch.c:522
+#: builtin/branch.c:546
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"以 '%c' 开头的行将被过滤。\n"
-#: builtin/branch.c:555
+#: builtin/branch.c:579
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:557
+#: builtin/branch.c:581
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
-#: builtin/branch.c:558
+#: builtin/branch.c:582
msgid "suppress informational messages"
msgstr "不显示信息"
-#: builtin/branch.c:559
+#: builtin/branch.c:583
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模式（参见 git-pull(1)）"
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "改变上游信息"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "不要使用"
-#: builtin/branch.c:563
+#: builtin/branch.c:587
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:563
+#: builtin/branch.c:587
msgid "change the upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:564
+#: builtin/branch.c:588
msgid "Unset the upstream info"
msgstr "取消上游信息的设置"
-#: builtin/branch.c:565
+#: builtin/branch.c:589
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:566
+#: builtin/branch.c:590
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
msgid "print only branches that don't contain the commit"
msgstr "只打印不包含该提交的分支"
-#: builtin/branch.c:574
+#: builtin/branch.c:598
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作："
-#: builtin/branch.c:575
+#: builtin/branch.c:599
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
-#: builtin/branch.c:577
+#: builtin/branch.c:601
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
-#: builtin/branch.c:578
+#: builtin/branch.c:602
msgid "delete branch (even if not merged)"
msgstr "删除分支（即使没有合并）"
-#: builtin/branch.c:579
+#: builtin/branch.c:603
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支，以及它的引用日志"
-#: builtin/branch.c:580
+#: builtin/branch.c:604
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支，即使目标已存在"
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "拷贝一个分支和它的引用日志"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "拷贝一个分支，即使目标已存在"
+
+#: builtin/branch.c:607
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:582
+#: builtin/branch.c:608
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:584
+#: builtin/branch.c:610
msgid "edit the description for the branch"
msgstr "标记分支的描述"
-#: builtin/branch.c:585
+#: builtin/branch.c:611
msgid "force creation, move/rename, deletion"
msgstr "强制创建、移动/重命名、删除"
-#: builtin/branch.c:586
+#: builtin/branch.c:612
msgid "print only branches that are merged"
msgstr "只打印已经合并的分支"
-#: builtin/branch.c:587
+#: builtin/branch.c:613
msgid "print only branches that are not merged"
msgstr "只打印尚未合并的分支"
-#: builtin/branch.c:588
+#: builtin/branch.c:614
msgid "list branches in columns"
msgstr "以列的方式显示分支"
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr "key"
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr "排序的字段名"
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr "对象"
-#: builtin/branch.c:593
+#: builtin/branch.c:619
msgid "print only branches of the object"
msgstr "只打印指向该对象的分支"
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr "排序和过滤属于大小写不敏感"
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "输出格式"
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "无法将 HEAD 解析为有效引用。"
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
-#: builtin/branch.c:642
+#: builtin/branch.c:668
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
msgid "branch name required"
msgstr "必须提供分支名"
-#: builtin/branch.c:681
+#: builtin/branch.c:708
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
-#: builtin/branch.c:686
+#: builtin/branch.c:713
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
-#: builtin/branch.c:693
+#: builtin/branch.c:720
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
-#: builtin/branch.c:696
+#: builtin/branch.c:723
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "为重命名操作提供了太多的分支名"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "为拷贝操作提供了太多的分支名"
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "为设置新上游提供了太多的分支名"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "为重命名操作提供了太多的参数"
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "为设置新上游提供了太多的参数"
+
+#: builtin/branch.c:756
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:727
+#: builtin/branch.c:763
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "为å\8f\96æ¶\88ä¸\8a游设置æ\93\8dä½\9cæ\8f\90ä¾\9bäº\86太å¤\9aç\9a\84å\88\86æ\94¯å\90\8d"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "为å\8f\96æ¶\88ä¸\8a游设置æ\93\8dä½\9cæ\8f\90ä¾\9bäº\86太å¤\9aç\9a\84å\8f\82æ\95°"
-#: builtin/branch.c:743
+#: builtin/branch.c:779
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/branch.c:749
+#: builtin/branch.c:785
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
-#: builtin/branch.c:763
+#: builtin/branch.c:797
msgid "it does not make sense to create 'HEAD' manually"
msgstr "手工创建 'HEAD' 没有意义"
-#: builtin/branch.c:769
+#: builtin/branch.c:803
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:806
msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"如果你想用 '%s' 跟踪 '%s', 这么做：\n"
-"\n"
+"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
#: builtin/bundle.c:45
#, c-format
msgid "Need a repository to unbundle."
msgstr "需要一个仓库来解包。"
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr "显示对象类型"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr "显示对象大小"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
msgid "exit with zero when there's no error"
msgstr "当没有错误时退出并返回零"
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr "美观地打印对象的内容"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
msgid "for blob objects, run textconv on object's content"
msgstr "对于数据对象，对其内容做文本转换"
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
msgid "for blob objects, run filters on object's content"
msgstr "对于数据对象，对其内容做过滤"
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
msgid "blob"
msgstr "数据对象"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr "对于 --textconv/--filters 使用一个特定的路径"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "允许 -s 和 -t 对损坏的对象生效"
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr "缓冲 --batch 的输出"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
msgid "show info and content of objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息和内容"
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
msgid "show info about objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息"
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr "不显示进度报告"
msgstr "将内容写入临时文件"
#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
msgid "string"
msgstr "字符串"
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
#, c-format
msgid "only one reference expected, %d given."
msgstr "应只有一个引用，却给出了 %d 个"
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346
+#: builtin/worktree.c:348
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
msgid "force checkout (throw away local modifications)"
msgstr "强制检出（丢弃本地修改）"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方合并"
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr "更新忽略的文件（默认）"
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格（merge 或 diff3）"
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "二次猜测'git checkout <无此分支>'"
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
msgid "do not check if another worktree is holding the given ref"
msgstr "不检查指定的引用是否被其他工作区所占用"
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136
+#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "强制显示进度报告"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b、-B 和 --orphan 是互斥的"
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
msgid "Missing branch name; try -b"
msgstr "缺少分支名；尝试 -b"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1285
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "failed to remove %s"
msgstr "无法删除 %s"
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
"foo - 通过唯一前缀选择一个选项\n"
" - （空）什么也不选择\n"
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
"* - 选择所有选项\n"
" - （空）结束选择\n"
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "嗯（%s）？\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:663
#, c-format
msgid "Input ignore patterns>> "
msgstr "输入模版以排除条目>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:700
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告：无法找到和 %s 匹配的条目"
-#: builtin/clean.c:718
+#: builtin/clean.c:721
msgid "Select items to delete"
msgstr "选择要删除的条目"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
#, c-format
msgid "Remove %s [y/N]? "
msgstr "删除 %s [y/N]？"
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:795
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - 显示本帮助\n"
"? - 显示如何在提示符下选择的帮助"
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
msgid "What now"
msgstr "请选择"
-#: builtin/clean.c:828
+#: builtin/clean.c:831
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "将删除如下条目："
msgstr[1] "将删除如下条目："
-#: builtin/clean.c:844
+#: builtin/clean.c:847
msgid "No more files to clean, exiting."
msgstr "没有要清理的文件，退出。"
-#: builtin/clean.c:906
+#: builtin/clean.c:909
msgid "do not print names of files removed"
msgstr "不打印删除文件的名称"
-#: builtin/clean.c:908
+#: builtin/clean.c:911
msgid "force"
msgstr "强制"
-#: builtin/clean.c:909
+#: builtin/clean.c:912
msgid "interactive cleaning"
msgstr "交互式清除"
-#: builtin/clean.c:911
+#: builtin/clean.c:914
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465
+#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397
#: builtin/name-rev.c:399 builtin/show-ref.c:176
msgid "pattern"
msgstr "模式"
-#: builtin/clean.c:913
+#: builtin/clean.c:916
msgid "add <pattern> to ignore rules"
msgstr "添加 <模式> 到忽略规则"
-#: builtin/clean.c:914
+#: builtin/clean.c:917
msgid "remove ignored files, too"
msgstr "也删除忽略的文件"
-#: builtin/clean.c:916
+#: builtin/clean.c:919
msgid "remove only ignored files"
msgstr "只删除忽略的文件"
-#: builtin/clean.c:934
+#: builtin/clean.c:937
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同时使用"
-#: builtin/clean.c:938
+#: builtin/clean.c:941
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
-#: builtin/clean.c:941
+#: builtin/clean.c:944
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr "不创建一个检出"
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "创建一个纯仓库"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr "创建一个镜像仓库（也是纯仓库）"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr "从本地仓库克隆"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr "不使用本地硬链接，始终复制"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr "设置为共享仓库"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr "路径规格"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr "在克隆时初始化子模组"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr "并发克隆的子模组的数量"
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr "模板目录"
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
msgid "reference repository"
msgstr "参考仓库"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "名称"
-#: builtin/clone.c:112
+#: builtin/clone.c:113
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
-#: builtin/clone.c:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "检出 <分支> 而不是远程 HEAD"
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
#: builtin/pull.c:205
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
#: parse-options.h:142
msgid "time"
msgstr "时间"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "create a shallow clone since a specific time"
msgstr "从一个特定时间创建一个浅克隆"
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
msgid "revision"
msgstr "版本"
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化浅克隆的历史，除了特定版本"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr "子模组将以浅下载模式克隆"
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr "在新仓库中设置配置信息"
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"无法猜到目录名。\n"
"请在命令行指定一个目录"
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
-#: builtin/clone.c:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr "对 %s 调用 stat 失败\n"
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
msgstr "无法创建链接 '%s'"
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
msgstr "无法拷贝文件至 '%s'"
-#: builtin/clone.c:470
+#: builtin/clone.c:471
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:482
+#: builtin/clone.c:483
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
"'git checkout -f HEAD' 重试\n"
-#: builtin/clone.c:559
+#: builtin/clone.c:560
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:654
+#: builtin/clone.c:655
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必须的对象"
-#: builtin/clone.c:670
+#: builtin/clone.c:671
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:719
+#: builtin/clone.c:720
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/clone.c:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
msgstr "无法将参数写入配置文件"
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:967
+#: builtin/clone.c:971
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆，忽略 --local"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
#, c-format
msgid "Don't know how to clone %s"
msgstr "不知道如何克隆 %s"
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:1149
+#: builtin/clone.c:1153
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
"操作。\n"
-#: builtin/commit.c:319
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "无法解包 HEAD 树对象"
-#: builtin/commit.c:360
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "不能创建临时索引"
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "交互式添加失败"
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "无法更新临时索引"
-#: builtin/commit.c:381
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "不能更新树的主缓存"
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
-#: builtin/commit.c:459
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a merge."
msgstr "在合并过程中不能做部分提交。"
-#: builtin/commit.c:461
+#: builtin/commit.c:463
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中不能做部分提交。"
-#: builtin/commit.c:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr "无法读取索引"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
-#: builtin/commit.c:583
+#: builtin/commit.c:587
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者信息"
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有非法的作者信息"
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr "非法的 --author 参数"
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "无法选择一个未被当前提交说明使用的注释字符"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正从标准输入中读取日志信息）\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:711
msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息"
-#: builtin/commit.c:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr "不能写提交模版"
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
"说明将会终止提交。\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"也可以删除它们。一个空的提交说明将会终止提交。\n"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者： %.*s <%.*s>"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr "%s日期： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者：%.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "无法读取索引"
-#: builtin/commit.c:951
+#: builtin/commit.c:958
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
-#: builtin/commit.c:1068
+#: builtin/commit.c:1075
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
msgid "--long and -z are incompatible"
msgstr "--long 和 -z 选项不兼容"
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
-#: builtin/commit.c:1160
+#: builtin/commit.c:1167
msgid "You have nothing to amend."
msgstr "您没有可修补的提交。"
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
-#: builtin/commit.c:1165
+#: builtin/commit.c:1172
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
-#: builtin/commit.c:1168
+#: builtin/commit.c:1175
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能同时使用"
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
-#: builtin/commit.c:1180
+#: builtin/commit.c:1187
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
-#: builtin/commit.c:1188
+#: builtin/commit.c:1195
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
-#: builtin/commit.c:1205
+#: builtin/commit.c:1212
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
-#: builtin/commit.c:1207
+#: builtin/commit.c:1214
msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。"
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "路径和 -a 选项同时使用没有意义。"
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
msgid "show branch information"
msgstr "显示分支信息"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1353
msgid "show stash information"
msgstr "显示贮藏区信息"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
msgid "machine-readable output"
msgstr "机器可读的输出"
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
msgid "show status in long format (default)"
msgstr "以长格式显示状态（默认）"
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
msgid "terminate entries with NUL"
msgstr "条目以 NUL 字符结尾"
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
-#: builtin/commit.c:1360
+#: builtin/commit.c:1367
msgid "show ignored files"
msgstr "显示忽略的文件"
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
msgid "list untracked files in columns"
msgstr "以列的方式显示未跟踪的文件"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
msgid "detached HEAD"
msgstr "分离头指针"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
msgid " (root-commit)"
msgstr "（根提交）"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
msgid "suppress summary after successful commit"
msgstr "提交成功后不显示概述信息"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
msgid "show diff in commit message template"
msgstr "在提交说明模板里显示差异"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
msgid "read message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
msgid "override date for commit"
msgstr "提交时覆盖日期"
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr "说明"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
msgid "commit message"
msgstr "提交说明"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
msgid "reuse and edit message from specified commit"
msgstr "重用并编辑指定提交的提交说明"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交说明"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1608
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: 签名"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
msgid "use specified template file"
msgstr "使用指定的模板文件"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
msgid "force edit of commit"
msgstr "强制编辑提交"
# 译者：可选值，不能翻译（或是原文中笔误，应为 mode）
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
msgid "default"
msgstr "default"
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除提交说明里的空格和#注释"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "GPG 提交签名"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
msgid "Commit contents options"
msgstr "提交内容选项"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
msgid "commit all changed files"
msgstr "提交所有改动的文件"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待提交"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
msgid "interactively add files"
msgstr "交互式添加文件"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
msgid "interactively add changes"
msgstr "交互式添加变更"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
msgid "commit only specified files"
msgstr "只提交指定的文件"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
msgid "bypass pre-commit and commit-msg hooks"
msgstr "绕过 pre-commit 和 commit-msg 钩子"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
msgid "show what would be committed"
msgstr "显示将要提交的内容"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite 钩子"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
msgid "ok to record an empty change"
msgstr "允许一个空提交"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
msgid "ok to record a change with an empty message"
msgstr "允许空的提交说明"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "损坏的 MERGE_HEAD 文件（%s）"
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr "不能读取 MERGE_MODE"
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr "不能读取提交说明：%s"
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "终止提交；您未更改来自模版的提交说明。\n"
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1756
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"
-#: builtin/commit.c:1800
+#: builtin/commit.c:1761
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "终止提交；您未更改来自模版的提交说明。\n"
+
+#: builtin/commit.c:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "--local can only be used inside a git repository"
msgstr "--local 只能在一个仓库内使用"
-#: builtin/config.c:621
+#: builtin/config.c:624
#, c-format
msgid "cannot create configuration file %s"
msgstr "不能创建配置文件 %s"
-#: builtin/config.c:633
+#: builtin/config.c:637
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
"无法用一个值覆盖多个值\n"
" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr "以用户可读的格式显示大小"
msgid "annotated"
msgstr "附注的"
-#: builtin/describe.c:253
+#: builtin/describe.c:264
#, c-format
msgid "annotated tag %s not available"
msgstr "附注标签 %s 无效"
-#: builtin/describe.c:257
+#: builtin/describe.c:268
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "附注标签 %s 没有嵌入名称"
-#: builtin/describe.c:259
+#: builtin/describe.c:270
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "标签 '%s' 的确是在 '%s'"
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
#, c-format
msgid "Not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
-#: builtin/describe.c:289
+#: builtin/describe.c:300
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一个有效的 '%s' 对象"
-#: builtin/describe.c:306
+#: builtin/describe.c:317
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "没有标签准确匹配 '%s'"
-#: builtin/describe.c:308
+#: builtin/describe.c:319
#, c-format
msgid "searching to describe %s\n"
msgstr "搜索描述 %s\n"
-#: builtin/describe.c:355
+#: builtin/describe.c:366
#, c-format
msgid "finished search at %s\n"
msgstr "完成搜索 %s\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:393
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"没有附注标签能描述 '%s'。\n"
"然而，存在未附注标签：尝试 --tags。"
-#: builtin/describe.c:386
+#: builtin/describe.c:397
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"没有标签能描述 '%s'。\n"
"尝试 --always，或者创建一些标签。"
-#: builtin/describe.c:416
+#: builtin/describe.c:427
#, c-format
msgid "traversed %lu commits\n"
msgstr "已遍历 %lu 个提交\n"
-#: builtin/describe.c:419
+#: builtin/describe.c:430
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"发现多于 %i 个标签，列出最近的 %i 个\n"
"在 %s 放弃搜索\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:452
msgid "find the tag that comes after the commit"
msgstr "寻找该提交之后的标签"
-#: builtin/describe.c:442
+#: builtin/describe.c:453
msgid "debug search strategy on stderr"
msgstr "在标准错误上调试搜索策略"
-#: builtin/describe.c:443
+#: builtin/describe.c:454
msgid "use any ref"
msgstr "使用任意引用"
-#: builtin/describe.c:444
+#: builtin/describe.c:455
msgid "use any tag, even unannotated"
msgstr "使用任意标签，即使未附带注释"
-#: builtin/describe.c:445
+#: builtin/describe.c:456
msgid "always use long format"
msgstr "始终使用长提交号格式"
-#: builtin/describe.c:446
+#: builtin/describe.c:457
msgid "only follow first parent"
msgstr "只跟随第一个父提交"
-#: builtin/describe.c:449
+#: builtin/describe.c:460
msgid "only output exact matches"
msgstr "只输出精确匹配"
-#: builtin/describe.c:451
+#: builtin/describe.c:462
msgid "consider <n> most recent tags (default: 10)"
msgstr "考虑最近 <n> 个标签（默认：10）"
-#: builtin/describe.c:453
+#: builtin/describe.c:464
msgid "only consider tags matching <pattern>"
msgstr "只考虑匹配 <模式> 的标签"
-#: builtin/describe.c:455
+#: builtin/describe.c:466
msgid "do not consider tags matching <pattern>"
msgstr "不考虑匹配 <模式> 的标签"
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的提交号作为后备"
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
msgid "mark"
msgstr "标记"
-#: builtin/describe.c:459
+#: builtin/describe.c:470
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
-#: builtin/describe.c:462
+#: builtin/describe.c:473
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
-#: builtin/describe.c:480
+#: builtin/describe.c:491
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 与 --abbrev=0 不兼容"
-#: builtin/describe.c:509
+#: builtin/describe.c:520
msgid "No names found, cannot describe anything."
msgstr "没有发现名称，无法描述任何东西。"
-#: builtin/describe.c:552
+#: builtin/describe.c:563
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty 与提交号不兼容"
-#: builtin/describe.c:554
+#: builtin/describe.c:565
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken 与提交号不兼容"
msgid "invalid option: %s"
msgstr "无效选项：%s"
-#: builtin/diff.c:359
+#: builtin/diff.c:357
msgid "Not a git repository"
msgstr "不是一个 git 仓库"
-#: builtin/diff.c:402
+#: builtin/diff.c:400
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"
-#: builtin/diff.c:411
+#: builtin/diff.c:409
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个数据对象：'%s'"
-#: builtin/diff.c:416
+#: builtin/diff.c:414
#, c-format
msgid "unhandled object '%s' given."
msgstr "无法处理的对象 '%s'。"
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr "失败：%d"
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr "无法读取符号链接 %s"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink file %s"
msgstr "无法读取符号链接文件 %s"
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
"不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--"
"cc'）。"
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "两个文件都被修改：'%s' 和 '%s'。"
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "工作区文件被留了下来。"
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "临时文件存在于 '%s'。"
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者恢复它们。"
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "执行一个全目录差异比较"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "启动差异比较工具之前不提示"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符号链接"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
msgid "<tool>"
msgstr "<工具>"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
msgid "use the specified diff tool"
msgstr "使用指定的差异比较工具"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
msgid "<command>"
msgstr "<命令>"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
msgid "specify a custom command for viewing diffs"
msgstr "指定一个用于查看差异的自定义命令"
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
msgid "no <tool> given for --tool=<tool>"
msgstr "没有为 --tool=<工具> 参数提供 <工具>"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr "在 <n> 个对象之后显示进度"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr "选择如何处理签名标签"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
msgid "select handling of tags that tag filtered objects"
msgstr "选择当标签指向被过滤对象时该标签的处理方式"
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr "把标记存储到这个文件"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr "从这个文件导入标记"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
msgid "Fake a tagger when tags lack one"
msgstr "当标签缺少标记者字段时，假装提供一个"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr "每次提交都输出整个树"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr "使用 done 功能来终止流"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr "跳过数据对象的输出"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr "引用规格"
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr "对导出的引用应用引用规格"
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr "匿名输出"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<选项>] <组>"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<选项>]"
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
msgid "fetch from all remotes"
msgstr "从所有的远程抓取"
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
msgid "force overwrite of local branch"
msgstr "强制覆盖本地分支"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
msgid "fetch from multiple remotes"
msgstr "从多个远程抓取"
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
msgid "fetch all tags and associated objects"
msgstr "抓取所有的标签和关联对象"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何标签(--no-tags)"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
msgid "number of submodules fetched in parallel"
msgstr "子模组获取的并发数"
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已经不存在的分支的跟踪分支"
# 译者：可选值，不能翻译
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
msgid "control recursive fetching of submodules"
msgstr "控制子模组的递归抓取"
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
msgid "keep downloaded pack"
msgstr "保持下载包"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
msgid "allow updating of HEAD ref"
msgstr "允许更新 HEAD 引用"
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历史"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
msgid "deepen history of shallow repository based on time"
msgstr "基于时间来深化浅克隆的历史"
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
msgid "dir"
msgstr "目录"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
msgid "prepend this to submodule path output"
msgstr "在子模组路径输出的前面加上此目录"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
msgid "specify fetch refmap"
msgstr "指定获取操作的引用映射"
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "配置变量 fetch.output 包含无效值 %s"
-#: builtin/fetch.c:605
+#: builtin/fetch.c:627
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
msgid "[rejected]"
msgstr "[已拒绝]"
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
msgid "can't fetch in current branch"
msgstr "当前分支下不能执行获取操作"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
msgid "[tag update]"
msgstr "[标签更新]"
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
msgid "unable to update local ref"
msgstr "不能更新本地引用"
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
msgid "[new tag]"
msgstr "[新标签]"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
msgid "non-fast-forward"
msgstr "非快进"
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必须的对象\n"
-#: builtin/fetch.c:767
+#: builtin/fetch.c:789
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆不允许被更新"
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者：注意保持前导空格
-#: builtin/fetch.c:921
+#: builtin/fetch.c:943
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 将成为摇摆状态）"
# 译者：注意保持前导空格
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成为摇摆状态）"
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
msgid "(none)"
msgstr "（无）"
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非纯仓库的当前分支 %s"
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1019
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1022
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "不知道如何从 %s 获取"
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1301
msgid "You need to specify a tag name."
msgstr "您需要指定一个标签名称。"
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 不支持负数深度"
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1366
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组：%s"
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
msgid "populate log with at most <n> entries from shortlog"
msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:668
msgid "alias for --log (deprecated)"
msgstr "参数 --log 的别名（已弃用）"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
msgid "text"
msgstr "文本"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
msgid "use <text> as start of message"
msgstr "使用 <文本> 作为提交说明的开始"
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
msgid "file to read from"
msgstr "从文件中读取"
msgid "show only <n> matched refs"
msgstr "只显示 <n> 个匹配的引用"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "遵照格式中的颜色输出"
+
+#: builtin/for-each-ref.c:43
msgid "print only refs which points at the given object"
msgstr "只打印指向给定对象的引用"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr "只打印已经合并的引用"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs that are not merged"
msgstr "只打印没有合并的引用"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr "只打印包含该提交的引用"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr "只打印不包含该提交的引用"
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr "检查对象目录中"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<选项>] [<对象>...]"
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr "显示不可达的对象"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr "显示摇摆的对象"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr "报告标签"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr "报告根节点"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr "将索引亦作为检查的头节点"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr "将引用日志作为检查的头节点（默认）"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr "也考虑包和备用对象"
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr "仅检查连通性"
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr "启用更严格的检查"
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr "将摇摆对象写入 .git/lost-found 中"
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr "显示进度"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr "显示可达对象的详细名称"
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr "检查对象中"
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr "git gc [<选项>]"
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "对 %s 调用 fstat 失败：%s"
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr "不能对 %s 调用 stat"
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr "更彻底（增加运行时间）"
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
-#: builtin/gc.c:363
+#: builtin/gc.c:364
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
-#: builtin/gc.c:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "无法解析 gc.logexpiry 的值 %s"
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
-#: builtin/gc.c:410
+#: builtin/gc.c:411
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/gc.c:411
+#: builtin/gc.c:412
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护参见 \"git help gc\"。\n"
-#: builtin/gc.c:436
+#: builtin/gc.c:437
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
-#: builtin/gc.c:480
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep：无法创建线程：%s"
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支持，忽略 %s"
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树（%s）"
-#: builtin/grep.c:848
+#: builtin/grep.c:628
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:912
+#: builtin/grep.c:694
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:999
+#: builtin/grep.c:781
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
-#: builtin/grep.c:1001
+#: builtin/grep.c:783
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
msgid "recursively search in each submodule"
msgstr "在每一个子模组中递归搜索"
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "基本名"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "在输出中以父项目的基本名为前缀"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
msgid "show non-matching lines"
msgstr "显示未匹配的行"
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式（默认）"
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:1050
+#: builtin/grep.c:829
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数，而不显示匹配的行"
-#: builtin/grep.c:1058
+#: builtin/grep.c:837
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:1065
+#: builtin/grep.c:844
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:1068
+#: builtin/grep.c:847
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:1078
+#: builtin/grep.c:857
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
msgid "indicate hit with exit status without output"
msgstr "不输出，而用退出码标识命中状态"
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:1101
+#: builtin/grep.c:880
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达式的解析树"
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)（本次构建忽略）"
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
msgid "no pattern given."
msgstr "未提供模式匹配。"
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同时使用"
-#: builtin/grep.c:1211
+#: builtin/grep.c:989
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本：%s"
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效（%d）"
-#: builtin/grep.c:1250
+#: builtin/grep.c:1028
msgid "no threads support, ignoring --threads"
msgstr "没有线程支持，忽略 --threads"
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:1304
+#: builtin/grep.c:1075
msgid "option not supported with --recurse-submodules."
msgstr "选项不支持和 --recurse-submodules 共用。"
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
-#: builtin/grep.c:1316
+#: builtin/grep.c:1087
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
-#: builtin/grep.c:1324
+#: builtin/grep.c:1095
msgid "both --cached and trees are given."
msgstr "同时给出了 --cached 和树对象。"
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老（< 22）。"
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
msgstr "无法执行 '%s'"
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s'：不支持的 man 手册查看器的路径。\n"
"请使用 'man.<工具>.cmd'。"
-#: builtin/help.c:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s': 支持的 man 手册查看器命令。\n"
"请使用 'man.<工具>.path'。"
-#: builtin/help.c:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s'：未知的 man 查看器。"
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr "没有 man 查看器处理此请求"
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr "没有 info 查看器处理此请求"
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr "定义路径的属性"
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr "每一天 Git 常用的约 20 条命令"
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr "Git 词汇表"
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未跟踪文件"
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr "定义子模组属性"
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr "指定 Git 的版本和版本范围"
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr "Git 推荐的工作流概览"
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr "最常用的 Git 向导有：\n"
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "`git %s' 是 `%s' 的别名"
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' 是 '%s' 的别名"
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr "用法：%s%s"
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr "不能打开 %s"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr "%s 的对象类型不匹配"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr "未能获取预期的对象 %s"
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "对象 %s：应为类型 %s，却是 %s"
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "无法填充 %d 字节"
msgstr[1] "无法填充 %d 字节"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr "过早的文件结束符（EOF）"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr "输入上的读错误"
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr "用掉了超过可用的字节"
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
msgid "pack too large for current definition of off_t"
msgstr "包太大超过了当前 off_t 的定义"
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "包超过了最大允许值"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
msgstr "不能创建 '%s'"
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
msgstr "无法打开包文件 '%s'"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr "包签名不匹配"
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "不支持包版本 %<PRIu32>"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s"
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr "解压缩返回 %d"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
msgid "offset value overflow for delta base object"
msgstr "偏移值覆盖了 delta 基准对象"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
msgid "delta base offset is out of bound"
msgstr "delta 基准偏移越界"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr "未知对象类型 %d"
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr "无法读取包文件"
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "包文件过早结束，缺少 %<PRIuMAX> 字节"
msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节"
-#: builtin/index-pack.c:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr "解压缩严重的不一致"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "发现 %s 出现 SHA1 冲突！"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
#, c-format
msgid "unable to read %s"
msgstr "不能读 %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr "不能读取现存对象信息 %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr "不能读取现存对象 %s"
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr "无效的数据对象 %s"
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr "无效的 %s"
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr "对象中出错"
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子对象并非都可达"
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr "无法应用 delta"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr "接收对象中"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr "索引对象中"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲突（SHA1 不匹配）"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr "不能对包文件调用 fstat"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数据"
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr "处理 delta 中"
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr "不能创建线程：%s"
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "完成 %d 个本地对象"
msgstr[1] "完成 %d 个本地对象"
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "包有 %d 个未解决的 delta"
msgstr[1] "包有 %d 个未解决的 delta"
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能压缩附加对象（%d）"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
msgstr "无法写保留文件 '%s'"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "无法关闭保留文件 '%s'"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr "无法存储包文件"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr "无法存储索引文件"
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "坏的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta：%d 个对象"
msgstr[1] "非 delta：%d 个对象"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1610
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "链长 = %d: %lu 对象"
msgstr[1] "链长 = %d: %lu 对象"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同时使用"
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
msgid "--stdin requires a git repository"
msgstr "--stdin 需要一个 git 仓库"
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包文件名参数"
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
">])...] [<文件>...]"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr "在原位编辑文件"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
-msgstr "删除空签名"
+msgstr "删除空的尾部署名"
+
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "在哪里放置新的尾部署名"
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "当尾部署名已经存在时所采取的动作"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "当尾部署名缺失时所采取的动作"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "只输出尾部署名"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "不要应用配置规则"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "连接空白折行的值"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "设置解析选项"
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
-msgstr "签名"
+msgstr "尾部署名"
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
-msgstr "要添加的签名"
+msgstr "要添加的尾部署名"
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer 和 --only-input 同时使用没有意义"
+
+#: builtin/interpret-trailers.c:127
msgid "no input file given for in-place editing"
msgstr "没有给出要原位编辑的文件"
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr "git show [<选项>] <对象>..."
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr "无效的 --decorate 选项：%s"
-#: builtin/log.c:147
+#: builtin/log.c:148
msgid "suppress diff output"
msgstr "不显示差异输出"
-#: builtin/log.c:148
+#: builtin/log.c:149
msgid "show source"
msgstr "显示源"
-#: builtin/log.c:149
+#: builtin/log.c:150
msgid "Use mail map file"
msgstr "使用邮件映射文件"
-#: builtin/log.c:150
+#: builtin/log.c:151
msgid "decorate options"
msgstr "修饰选项"
-#: builtin/log.c:153
+#: builtin/log.c:154
msgid "Process line range n,m in file, counting from 1"
msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
-#: builtin/log.c:249
+#: builtin/log.c:250
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出：%d %s\n"
-#: builtin/log.c:497
+#: builtin/log.c:501
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 损坏的文件"
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
#, c-format
msgid "Could not read object %s"
msgstr "不能读取对象 %s"
-#: builtin/log.c:630
+#: builtin/log.c:634
#, c-format
msgid "Unknown type: %d"
msgstr "未知类型：%d"
-#: builtin/log.c:751
+#: builtin/log.c:755
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:852
+#: builtin/log.c:856
msgid "name of output directory is too long"
msgstr "输出目录名太长"
-#: builtin/log.c:868
+#: builtin/log.c:872
#, c-format
msgid "Cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:885
+#: builtin/log.c:889
msgid "Need exactly one range."
msgstr "只需要一个范围。"
-#: builtin/log.c:895
+#: builtin/log.c:899
msgid "Not a range."
msgstr "不是一个范围。"
-#: builtin/log.c:1001
+#: builtin/log.c:1005
msgid "Cover letter needs email format"
msgstr "信封需要邮件地址格式"
-#: builtin/log.c:1081
+#: builtin/log.c:1085
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:1108
+#: builtin/log.c:1112
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1158
+#: builtin/log.c:1162
msgid "Two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
#, c-format
msgid "Unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
-#: builtin/log.c:1280
+#: builtin/log.c:1284
msgid "Could not find exact merge base."
msgstr "不能找到准确的合并基线。"
-#: builtin/log.c:1284
+#: builtin/log.c:1288
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
"参数 --base=<base-commit-id> 手动指定一个基线提交。"
-#: builtin/log.c:1304
+#: builtin/log.c:1308
msgid "Failed to find exact merge base"
msgstr "无法找到准确的合并基线"
-#: builtin/log.c:1315
+#: builtin/log.c:1319
msgid "base commit should be the ancestor of revision list"
msgstr "基线提交应该是版本列表的祖先"
-#: builtin/log.c:1319
+#: builtin/log.c:1323
msgid "base commit shouldn't be in revision list"
msgstr "基线提交不应该出现在版本列表中"
-#: builtin/log.c:1368
+#: builtin/log.c:1372
msgid "cannot get patch id"
msgstr "无法得到补丁 id"
-#: builtin/log.c:1425
+#: builtin/log.c:1431
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一个补丁"
-#: builtin/log.c:1428
+#: builtin/log.c:1434
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多个补丁"
-#: builtin/log.c:1432
+#: builtin/log.c:1438
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1434
+#: builtin/log.c:1440
msgid "generate a cover letter"
msgstr "生成一封附信"
-#: builtin/log.c:1436
+#: builtin/log.c:1442
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1437
+#: builtin/log.c:1443
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1438
+#: builtin/log.c:1444
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1440
+#: builtin/log.c:1446
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号，而不是1"
-#: builtin/log.c:1442
+#: builtin/log.c:1448
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1444
+#: builtin/log.c:1450
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1447
+#: builtin/log.c:1453
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1450
+#: builtin/log.c:1456
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1453
+#: builtin/log.c:1459
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1456
+#: builtin/log.c:1462
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1458
+#: builtin/log.c:1464
msgid "output all-zero hash in From header"
msgstr "在 From 头信息中输出全为零的哈希值"
-#: builtin/log.c:1460
+#: builtin/log.c:1466
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1462
+#: builtin/log.c:1468
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的（补丁+状态）"
-#: builtin/log.c:1464
+#: builtin/log.c:1470
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1465
+#: builtin/log.c:1471
msgid "header"
msgstr "header"
-#: builtin/log.c:1466
+#: builtin/log.c:1472
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1467
+#: builtin/log.c:1473
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1469
+#: builtin/log.c:1475
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1471
+#: builtin/log.c:1477
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1472
+#: builtin/log.c:1478
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
-#: builtin/log.c:1474
+#: builtin/log.c:1480
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1475
+#: builtin/log.c:1481
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1477
+#: builtin/log.c:1483
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1480
+#: builtin/log.c:1486
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1484
+#: builtin/log.c:1490
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索，风格：浅，深"
-#: builtin/log.c:1486
+#: builtin/log.c:1492
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1487
+#: builtin/log.c:1493
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1488
+#: builtin/log.c:1494
msgid "base-commit"
msgstr "基线提交"
-#: builtin/log.c:1489
+#: builtin/log.c:1495
msgid "add prerequisite tree info to the patch series"
msgstr "为补丁列表添加前置树信息"
-#: builtin/log.c:1491
+#: builtin/log.c:1497
msgid "add a signature from a file"
msgstr "从文件添加一个签名"
-#: builtin/log.c:1492
+#: builtin/log.c:1498
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr "在生成补丁时显示进度"
+
+#: builtin/log.c:1575
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识：%s"
-#: builtin/log.c:1582
+#: builtin/log.c:1590
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
-#: builtin/log.c:1584
+#: builtin/log.c:1592
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc 和 -k 互斥。"
-#: builtin/log.c:1592
+#: builtin/log.c:1600
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1594
+#: builtin/log.c:1602
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1596
+#: builtin/log.c:1604
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1626
+#: builtin/log.c:1634
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录，哪一个？"
-#: builtin/log.c:1628
+#: builtin/log.c:1636
#, c-format
msgid "Could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/log.c:1722
+#: builtin/log.c:1729
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读取签名文件 '%s'"
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "生成补丁"
+
+#: builtin/log.c:1805
msgid "Failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:1843
+#: builtin/log.c:1855
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:1897
+#: builtin/log.c:1909
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<选项>] [<文件>...]"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
msgid "identify the file status with tags"
msgstr "用标签标识文件的状态"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小写字母表示 '假设未改变的' 文件"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件（默认）"
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
msgid "show modified files in the output"
msgstr "显示已修改的文件"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
msgid "show other files in the output"
msgstr "显示其它文件"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:534
msgid "show 'other' directories' names only"
msgstr "只显示“其他”目录的名称"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
msgid "show line endings of files"
msgstr "显示文件换行符格式"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
msgid "don't show empty directories"
msgstr "不显示空目录"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
msgid "skip files matching pattern"
msgstr "匹配排除文件的模式"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
msgid "exclude patterns are read from <file>"
msgstr "从 <文件> 中读取排除模式"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:559
msgid "recurse through submodules"
msgstr "在子模组中递归"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区，视为错误"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
msgid "tree-ish"
msgstr "树或提交"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
msgid "show debugging data"
msgstr "显示调试数据"
msgid "empty mbox: '%s'"
msgstr "空的 mbox：'%s'"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<选项>] [<提交>...]"
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合并策略 '%s'。\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有："
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有："
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "在合并的最后不显示差异统计"
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "在合并的最后显示差异统计"
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "（和 --stat 同义）"
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
msgid "create a single commit instead of doing a merge"
msgstr "创建一个单独的提交而不是做一次合并"
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合并成功，执行一次提交（默认）"
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
msgid "edit message before committing"
msgstr "在提交前编辑提交说明"
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr "允许快进（默认）"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "abort if fast-forward is not possible"
msgstr "如果不能快进就放弃合并"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
msgid "verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
#: builtin/revert.c:109
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
msgid "merge strategy to use"
msgstr "要使用的合并策略"
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
msgid "option for selected merge strategy"
msgstr "所选的合并策略的选项"
-#: builtin/merge.c:223
+#: builtin/merge.c:226
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合并的提交说明（针对非快进式合并）"
-#: builtin/merge.c:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr "放弃当前正在进行的合并"
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr "继续当前正在进行的合并"
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
msgid "allow merging unrelated histories"
msgstr "允许合并不相关的历史"
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "校验 commit-msg 钩子"
+
+#: builtin/merge.c:265
msgid "could not run stash."
msgstr "不能运行贮藏。"
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
msgstr "贮藏失败"
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr "不是一个有效对象：%s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr "读取树失败"
# 译者：注意保持前导空格
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr " （无可压缩）"
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "压缩提交 -- 未更新 HEAD\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:456
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指向一个提交"
-#: builtin/merge.c:537
+#: builtin/merge.c:546
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
-#: builtin/merge.c:657
+#: builtin/merge.c:666
msgid "Not handling anything other than two heads merge."
msgstr "未处理两个头合并之外的任何操作。"
-#: builtin/merge.c:671
+#: builtin/merge.c:680
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive 的未知选项：-X%s"
-#: builtin/merge.c:686
+#: builtin/merge.c:695
#, c-format
msgid "unable to write %s"
msgstr "不能写 %s"
-#: builtin/merge.c:738
+#: builtin/merge.c:747
#, c-format
msgid "Could not read from '%s'"
msgstr "不能从 '%s' 读取"
-#: builtin/merge.c:747
+#: builtin/merge.c:756
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
-#: builtin/merge.c:753
+#: builtin/merge.c:762
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"\n"
"以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
-#: builtin/merge.c:777
+#: builtin/merge.c:798
msgid "Empty commit message."
msgstr "空提交信息。"
-#: builtin/merge.c:797
+#: builtin/merge.c:818
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:850
+#: builtin/merge.c:871
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:910
msgid "No current branch."
msgstr "没有当前分支。"
-#: builtin/merge.c:891
+#: builtin/merge.c:912
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程仓库。"
-#: builtin/merge.c:893
+#: builtin/merge.c:914
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/merge.c:898
+#: builtin/merge.c:919
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/merge.c:945
+#: builtin/merge.c:972
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合并：%s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1107
msgid "not something we can merge"
msgstr "不能合并"
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
msgid "--abort expects no arguments"
msgstr "--abort 不带参数"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
msgid "--continue expects no arguments"
msgstr "--continue 不带参数"
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1191
+#: builtin/merge.c:1218
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
-#: builtin/merge.c:1200
+#: builtin/merge.c:1227
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 与 --no-ff 同时使用。"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1225
+#: builtin/merge.c:1252
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
-#: builtin/merge.c:1227
+#: builtin/merge.c:1254
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
-#: builtin/merge.c:1232
+#: builtin/merge.c:1259
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
-#: builtin/merge.c:1268
+#: builtin/merge.c:1295
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
-#: builtin/merge.c:1271
+#: builtin/merge.c:1298
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-#: builtin/merge.c:1274
+#: builtin/merge.c:1301
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 没有一个 GPG 签名。"
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1366
msgid "refusing to merge unrelated histories"
msgstr "拒绝合并无关的历史"
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
msgstr "已经是最新的。"
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1406
+#: builtin/merge.c:1433
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
msgstr "已经是最新的。耶！"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进，终止。"
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1580
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n"
msgid "Directory %s is in index and no submodule?"
msgstr "目录 %s 在索引中并且不是子模组？"
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
msgid "skip move/rename errors"
msgstr "跳过移动/重命名错误"
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
msgstr "目标 '%s' 不是一个目录"
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "检查 '%s' 到 '%s' 的重命名\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr "坏的源"
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr "不能将目录移动到自身"
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr "不能将目录移动到文件"
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "源目录为空"
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "不在版本控制之下"
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "目标已存在"
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr "覆盖 '%s'"
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "不能覆盖"
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr "同一目标具有多个源"
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "目标目录不存在"
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s，源=%s，目标=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
msgid "the note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解"
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr "参数太多"
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr "未发现对象 %s 的注解。"
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr "注解内容作为一个字符串"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr "注解内容到一个文件中"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr "重用和编辑指定的注解对象"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "重用指定的注解对象"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr "允许保存空白注释"
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr "替换已存在的注解"
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr "删除对象 %s 的注解\n"
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr "从标准输入读取对象"
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr "参数太少"
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/notes.c:540
+#: builtin/notes.c:541
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "源对象 %s 缺少注解。不能拷贝。"
-#: builtin/notes.c:592
+#: builtin/notes.c:593
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
"请换用 'git notes add -f -m/-F/-c/-C'。\n"
-#: builtin/notes.c:687
+#: builtin/notes.c:688
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:689
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "无法删除引用 NOTES_MERGE_REF"
-#: builtin/notes.c:691
+#: builtin/notes.c:692
msgid "failed to remove 'git notes merge' worktree"
msgstr "无法删除 'git notes merge' 工作区"
-#: builtin/notes.c:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "无法解析 NOTES_MERGE_REF"
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr "无法完成注解合并"
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "未知的注解合并策略 %s"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr "通用选项"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr "合并选项"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr "提交未合并的注解"
-#: builtin/notes.c:781
+#: builtin/notes.c:782
msgid "finalize notes merge by committing unmerged notes"
msgstr "通过提交未合并的注解来完成注解合并"
-#: builtin/notes.c:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr "中止注解合并的方案"
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr "中止注解合并"
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "不能混用 --commit、--abort 或 -s/--strategy"
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr "必须指定一个注解引用来合并"
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "未知的 -s/--strategy：%s"
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
-#: builtin/notes.c:865
+#: builtin/notes.c:866
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "无法存储链接到当前的注解引用（%s）"
-#: builtin/notes.c:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr "对象 %s 没有注解\n"
-#: builtin/notes.c:901
+#: builtin/notes.c:902
msgid "attempt to remove non-existent note is not an error"
msgstr "尝试删除不存在的注解不是一个错误"
-#: builtin/notes.c:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr "从标准输入读取对象名称"
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
msgid "do not remove, show only"
msgstr "不删除，只显示"
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr "报告清除的注解"
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr "注解引用"
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子命令：%s"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:32
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
#, c-format
msgid "deflate error (%d)"
msgstr "压缩错误 (%d)"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:790
msgid "Writing objects"
msgstr "写入对象中"
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2440
msgid "Compressing objects"
msgstr "压缩对象中"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
msgid "do not show progress meter"
msgstr "不显示进度表"
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2890
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2891
msgid "version[,offset]"
msgstr "版本[,偏移]"
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2895
msgid "maximum size of each output pack file"
msgstr "每个输出包的最大尺寸"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
msgid "limit pack window by objects"
msgstr "限制打包窗口的对象数"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数量限制外设置打包窗口的内存限制"
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2905
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允许的 delta 链的最大长度"
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2907
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
msgid "reuse existing objects"
msgstr "重用已存在的对象"
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹配"
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2915
msgid "do not create an empty pack output"
msgstr "不创建空的包输出"
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
msgid "read revision arguments from standard input"
msgstr "从标准输入读取版本号参数"
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的对象"
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2922
msgid "include objects reachable from any reference"
msgstr "包括可以从任何引用访问到的对象"
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2928
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2935
msgid "keep unreachable objects"
msgstr "维持不可达的对象"
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
msgid "pack loose unreachable objects"
msgstr "打包松散的不可达对象"
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
msgid "create packs suitable for shallow fetches"
msgstr "创建适合浅克隆仓库获取的包"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 文件的包"
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
msgid "do not hide commits by grafts"
msgstr "显示被嫁接隐藏的提交"
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2954
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同时创建 bitmap 索引"
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3081
msgid "Counting objects"
msgstr "对象计数中"
msgid "prune loose refs (default)"
msgstr "清除松散的引用（默认）"
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr "正在删除重复对象"
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用变基操作取代合并操作以合入修改"
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "允许快进式"
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff 的取值无效：%s"
-#: builtin/pull.c:399
+#: builtin/pull.c:403
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
-#: builtin/pull.c:401
+#: builtin/pull.c:405
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
-#: builtin/pull.c:402
+#: builtin/pull.c:406
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
-#: builtin/pull.c:405
+#: builtin/pull.c:409
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
"分支默认的远程仓库，您必须在命令行中指定一个分支名。"
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "您当前不在一个分支上。"
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "请指定您要变基到哪一个分支。"
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "请指定您要合并哪一个分支。"
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
msgid "See git-pull(1) for details."
msgstr "详见 git-pull(1)。"
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<远程>"
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "当前分支没有跟踪信息。"
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/pull.c:438 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
-#: builtin/pull.c:439
+#: builtin/pull.c:443
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"您的配置中指定要合并远程的引用 '%s'，\n"
"但是没有获取到这个引用。"
-#: builtin/pull.c:792
+#: builtin/pull.c:796
msgid "ignoring --verify-signatures for rebase"
msgstr "为变基操作忽略 --verify-signatures"
-#: builtin/pull.c:840
+#: builtin/pull.c:844
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
-#: builtin/pull.c:848
+#: builtin/pull.c:852
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支，变更添加至索引。"
-#: builtin/pull.c:851
+#: builtin/pull.c:855
msgid "pull with rebase"
msgstr "变基式拉取"
-#: builtin/pull.c:852
+#: builtin/pull.c:856
msgid "please commit or stash them."
msgstr "请提交或贮藏它们。"
-#: builtin/pull.c:877
+#: builtin/pull.c:881
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fetch 更新了当前的分支。快进您的工作区\n"
"至提交 %s。"
-#: builtin/pull.c:882
+#: builtin/pull.c:886
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"恢复之前的状态。"
-#: builtin/pull.c:897
+#: builtin/pull.c:901
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支合并到空分支。"
-#: builtin/pull.c:901
+#: builtin/pull.c:905
msgid "Cannot rebase onto multiple branches."
msgstr "无法变基到多个分支。"
-#: builtin/pull.c:908
+#: builtin/pull.c:912
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本地子模组中有修改，无法变基"
msgid "git rebase--helper [<options>]"
msgstr "git rebase--helper [<选项>]"
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "保持空提交"
+
+#: builtin/rebase--helper.c:23
msgid "continue rebase"
msgstr "继续变基"
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
msgid "abort rebase"
msgstr "中止变基"
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "制作变基脚本"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "缩短待办列表中的哈希值"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "扩展待办列表中的哈希值"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "检查待办列表"
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr "跳过不必要的拣选"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr "重新排列 fixup/squash 行"
+
+#: builtin/receive-pack.c:29
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:859
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"若要屏蔽此信息，您可以设置它为 'refuse'。"
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr "远程 %s 已经存在。"
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' 不是一个有效的远程名称"
msgid "(delete)"
msgstr "（删除）"
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "没有这样的远程：%s"
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "不能重命名配置小节 '%s' 到 '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\t如果必要请手动更新配置。"
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
msgstr "删除 '%s' 失败"
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
msgstr "创建 '%s' 失败"
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除配置小节 '%s'"
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的（下一次获取将存储于 remotes/%s）"
-#: builtin/remote.c:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr " 已跟踪"
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " 过时（使用 'git remote prune' 来移除）"
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
-#: builtin/remote.c:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "交互式变基到远程 %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr "变基到远程 %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr " 与远程 %s 合并"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "与远程 %s 合并"
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和远程 %s\n"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr "创建"
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr "删除"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr "可快进"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr "本地已过时"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 强制推送至 %-*s (%s)"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 强制推送至 %s"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr "不查询远程"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr "* 远程 %s"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr " 获取地址：%s"
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr "(无 URL)"
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr " 推送地址：%s"
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr "（未查询）"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr "（未知）"
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[1] " 远程分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr "（状态未查询）"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 为 'git pull' 配置的本地分支："
msgstr[1] " 为 'git pull' 配置的本地分支："
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜像"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 为 'git push' 配置的本地引用%s："
msgstr[1] " 为 'git push' 配置的本地引用%s："
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一个有效引用：%s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr "不能设置 %s"
# 译者：注意保持前导空格
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr " %s 将成为摇摆状态！"
# 译者：注意保持前导空格
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成为摇摆状态！"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr "URL：%s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr "抓取后清除远程"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
msgid "query push URLs rather than fetch URLs"
msgstr "查询推送 URL 地址，而非获取 URL 地址"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr "返回所有 URL 地址"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "没有给远程仓库 '%s' 设定 URL"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr "操作推送 URLS"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 无意义"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹配模版：%s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL：%s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr "将不会删除所有非推送 URL 地址"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出；必须置于子命令之前"
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子命令：%s"
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 和 -A 不兼容"
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
#, c-format
msgid "failed to remove '%s'"
msgstr "无法删除 '%s'"
msgid "keep"
msgstr "保持"
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr "您没有一个有效的 HEAD。"
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr "无法找到 HEAD 指向的树。"
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
msgstr "无法找到 %s 指向的树。"
-#: builtin/reset.c:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 现在位于 %s"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
-#: builtin/reset.c:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr "安静模式，只报告错误"
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr "重置 HEAD 和索引"
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr "只重置 HEAD"
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr "重置 HEAD、索引和工作区"
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr "重置 HEAD 但保存本地变更"
-#: builtin/reset.c:301
+#: builtin/reset.c:312
msgid "record only the fact that removed paths will be added later"
msgstr "将删除的路径标记为稍后添加"
-#: builtin/reset.c:320
+#: builtin/reset.c:329
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "无法将 '%s' 解析为一个有效的版本。"
-#: builtin/reset.c:328
+#: builtin/reset.c:337
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "无法将 '%s' 解析为一个有效的树对象。"
-#: builtin/reset.c:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
-#: builtin/reset.c:346
+#: builtin/reset.c:355
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能带路径进行%s重置。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能对纯仓库进行%s重置"
-#: builtin/reset.c:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr "-N 只能和 --mixed 同时使用"
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr "重置后取消暂存的变更："
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重置索引文件至版本 '%s'。"
-#: builtin/reset.c:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支持显示注解"
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr "保持 `--` 作为一个参数传递"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
msgid "stop parsing after the first non-option argument"
msgstr "遇到第一个非选项参数后停止解析"
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr "以固定长格式输出"
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "keep redundant, empty commits"
msgstr "保持多余的、空的提交"
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr "拣选失败"
msgid "exit with a zero status even if nothing matched"
msgstr "即使没有匹配，也以零状态退出"
-#: builtin/rm.c:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "未提供 -r 选项不会递归删除 '%s'"
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm：不能删除 %s"
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "无法删除 '%s'"
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr "按照提交者分组而不是作者"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr "根据每个作者的提交数量排序"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr "隐藏提交说明，只提供提交数量"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr "显示每个作者的电子邮件地址"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr "折行输出"
msgid "prepend comment character and space to each line"
msgstr "为每一行的行首添加注释符和空格"
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用：%s"
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用名称，却得到 %s"
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:71
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "无法从 url '%s' 剥离一个组件"
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记（anchor）"
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:389
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册 url"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:404
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
#
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:414
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:421
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册更新模式"
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:437
msgid "Suppress output for initializing a submodule"
msgstr "初始化子模组时抑制输出"
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<路径>]"
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路径>"
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模组 '%s' 不能添加仓库备选：%s"
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:597
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:626
msgid "where the new submodule will be cloned to"
msgstr "新的子模组将要克隆的路径"
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
msgid "name of the new submodule"
msgstr "新子模组的名称"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
msgid "url where to clone the submodule from"
msgstr "克隆子模组的 url 地址"
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
msgid "force cloning progress"
msgstr "强制显示克隆进度"
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:677
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' 的子模组目录"
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模组 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想要执行 'update --init'？"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未合并的子模组 %s"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过子模组 '%s'"
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "克隆 '%s' 失败。按计划重试"
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次尝试克隆 '%s' 失败，退出"
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
msgid "path into the working tree"
msgstr "到工作区的路径"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作区中的路径，递归嵌套子模组"
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1000
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1007
msgid "parallel jobs"
msgstr "并发任务"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1010
msgid "don't print cloning progress"
msgstr "不要输出克隆进度"
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
msgid "bad value for update parameter"
msgstr "update 参数取值错误"
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上"
-#: builtin/submodule--helper.c:1163
+#: builtin/submodule--helper.c:1214
msgid "recurse into submodules"
msgstr "在子模组中递归"
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<路径>...]"
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <名称>"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "不显示非符号（分离的）引用的错误信息"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "删除符号引用"
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
-msgstr "ç®\80ç\9fç\9a\84引用输出"
+msgstr "缩ç\9f引用输出"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "原因"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "更新的原因"
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<格式>] <标签名>..."
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "未发现标签 '%s'。"
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除标签 '%s'（曾为 %s）\n"
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
" %s\n"
"以 '%c' 开头的行将被忽略。\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
" %s\n"
"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr "无法签署标签"
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr "无法写标签文件"
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr "坏的对象类型。"
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr "无标签说明？"
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "标签说明被保留在 %s\n"
-#: builtin/tag.c:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr "列出标签名称"
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr "每个标签信息打印 <n> 行"
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr "删除标签"
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr "验证标签"
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr "标签创建选项"
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr "附注标签，需要一个说明"
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr "标签说明"
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr "附注并附加 GPG 签名的标签"
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr "使用另外的私钥签名该标签"
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr "如果存在，替换现有的标签"
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "创建引用日志"
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr "标签列表选项"
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr "以列的方式显示标签列表"
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr "只打印包含该提交的标签"
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr "只打印不包含该提交的标签"
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr "只打印已经合并的标签"
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr "只打印尚未合并的标签"
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr "只打印指向该对象的标签"
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不兼容"
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr "-n 选项只允许用在列表显示模式"
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr "--contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:496
+#: builtin/tag.c:479
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:498
+#: builtin/tag.c:481
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at 选项只允许用在列表显示模式"
-#: builtin/tag.c:500
+#: builtin/tag.c:483
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
-#: builtin/tag.c:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr "太多参数"
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的标签名称。"
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'（曾为 %s）\n"
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<选项>] [--] [<文件>...]"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
msgid "continue refresh even when index needs update"
msgstr "当索引需要更新时继续刷新"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
msgid "refresh: ignore submodules"
msgstr "刷新：忽略子模组"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
msgid "do not ignore new files"
msgstr "不忽略新的文件"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
msgid "let files replace directories and vice-versa"
msgstr "让文件替换目录（反之亦然）"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
msgid "notice files missing from worktree"
msgstr "通知文件从工作区丢失"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引区包含未合并的条目也执行刷新"
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
msgid "refresh stat information"
msgstr "刷新统计信息"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
msgid "<mode>,<object>,<path>"
msgstr "<存取模式>,<对象>,<路径>"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
msgid "add the specified entry to the index"
msgstr "添加指定的条目到索引区"
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
msgid "mark files as \"not changing\""
msgstr "把文件标记为 \"没有变更\""
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
msgid "mark files as \"index-only\""
msgstr "把文件标记为 \"仅索引\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
msgid "add to index only; do not add content to object database"
msgstr "只添加到索引区；不添加对象到对象库"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作区里，也删除路径"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "携带 --stdin：输入的行以 null 字符终止"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
msgid "read list of paths to be updated from standard input"
msgstr "从标准输入中读取需要更新的路径列表"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:981
msgid "add entries from standard input to the index"
msgstr "从标准输入添加条目到索引区"
-#: builtin/update-index.c:983
+#: builtin/update-index.c:985
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "为指定文件重新生成第2和第3暂存区"
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
msgid "only update entries that differ from HEAD"
msgstr "只更新与 HEAD 不同的条目"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
msgid "ignore files missing from worktree"
msgstr "忽略工作区丢失的文件"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
msgid "report actions to standard output"
msgstr "在标准输出显示操作"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘记保存的未解决的冲突"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
msgid "write index in this format"
msgstr "以这种格式写入索引区"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
msgid "enable or disable split index"
msgstr "启用或禁用索引拆分"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
msgid "enable/disable untracked cache"
msgstr "启用/禁用对未跟踪文件的缓存"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
msgid "test if the filesystem supports untracked cache"
msgstr "测试文件系统是否支持未跟踪文件缓存"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
msgid "enable untracked cache without testing the filesystem"
msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1107
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
"core.splitIndex 被设置为 false。如果您确实要启用索引拆分，请删除或修改它。"
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分，请删除或修改它。"
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1127
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修"
"改它。"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "缓存未跟踪文件被禁用"
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或"
"修改它。"
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "缓存未跟踪文件在 '%s' 启用"
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<选项>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "删除引用"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "更新 <引用名> 本身而不是它指向的引用"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr "标准输入有以 NUL 字符终止的参数"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "从标准输入读取更新"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "删除工作区/%s：不是一个有效的目录"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "删除 worktrees/%s：gitdir 文件不存在"
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
-#: builtin/worktree.c:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr "删除工作树/%s：读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）"
+
+#: builtin/worktree.c:84
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "删除 worktrees/%s：无效的 gitdir 文件"
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
-#: builtin/worktree.c:129
+#: builtin/worktree.c:147
msgid "report pruned working trees"
msgstr "报告清除的工作区"
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
msgid "expire working trees older than <time>"
msgstr "将早于 <time> 的工作区过期"
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已经存在"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "准备 %s（标识符 %s）"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:347
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
msgid "populate the new working tree"
msgstr "生成新的工作区"
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
msgid "keep the new working tree locked"
msgstr "锁定新工作区"
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:518
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定，原因：%s"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<选项>] <目录>"
-#: upload-pack.c:1041
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "在一次单独的请求/响应（request/response）交换后退出"
-#: upload-pack.c:1043
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "在初始的引用广告后立即退出"
-#: upload-pack.c:1045
+#: upload-pack.c:1044
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
-#: upload-pack.c:1047
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "不活动 <n> 秒钟后终止传输"
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "调试信息输出到标准错误"
"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
"帮助。"
-#: http.c:337
+#: http.c:338
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer 为负值，默认为 %d"
-#: http.c:358
+#: http.c:359
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "当 cURL < 7.22.0 时，不支持委托控制"
-#: http.c:367
+#: http.c:368
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
-#: http.c:1764
+#: http.c:1768
#, c-format
msgid ""
"unable to update url base from redirection:\n"
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr "已经和 $pretty_name 保持一致"
#: git-merge-octopus.sh:89
#: git-rebase.sh:58
msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
msgstr ""
-"当您解决了此问题后，执行 \"git rebase --continue\"。\n"
-"如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n"
-"要恢复原分支并停止变基，执行 \"git rebase --abort\"。"
+"手工解决所有冲突，执行 \"git add/rm <conflicted_files>\" 标记\n"
+"冲突已解决，然后执行 \"git rebase --continue\"。您也可以执行\n"
+"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
+"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr "无法移回 $head_name"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr "成功应用 autostash。"
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "无法保存 $stash_sha1"
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr "钩子 pre-rebase 拒绝变基操作。"
-#: git-rebase.sh:217
+#: git-rebase.sh:219
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr "没有正在进行的变基？"
-#: git-rebase.sh:369
+#: git-rebase.sh:374
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"您必须编辑所有的合并冲突，然后通过 git add\n"
"命令将它们标记为已解决"
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"\t$cmd_clear_stale_rebase\n"
"然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "无效的上游 $upstream_name"
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 有一个以上的合并基准"
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 没有合并基准"
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "没有指向一个有效的提交：$onto_name"
-#: git-rebase.sh:529
+#: git-rebase.sh:539
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "严重错误：无此分支：$branch_name"
-#: git-rebase.sh:562
+#: git-rebase.sh:572
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: git-rebase.sh:567
+#: git-rebase.sh:577
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "创建了 autostash: $stash_abbrev"
-#: git-rebase.sh:571
+#: git-rebase.sh:581
msgid "Please commit or stash them."
msgstr "请提交或贮藏修改。"
-#: git-rebase.sh:591
+#: git-rebase.sh:601
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "当前分支 $branch_name 是最新的。"
-#: git-rebase.sh:595
+#: git-rebase.sh:605
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "当前分支 $branch_name 是最新的，强制变基。"
-#: git-rebase.sh:606
+#: git-rebase.sh:616
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "变更从 $mb 到 $onto："
-#: git-rebase.sh:615
+#: git-rebase.sh:625
msgid "First, rewinding head to replay your work on top of it..."
msgstr "首先，回退分支以便在上面重放您的工作..."
-#: git-rebase.sh:625
+#: git-rebase.sh:635
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "快进 $branch_name 至 $onto_name。"
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear 不支持参数"
-#: git-stash.sh:95
+#: git-stash.sh:102
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: git-stash.sh:110
+#: git-stash.sh:117
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
-#: git-stash.sh:125
+#: git-stash.sh:132
msgid "Cannot save the untracked files"
msgstr "无法保存未跟踪文件"
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
-#: git-stash.sh:162
+#: git-stash.sh:169
msgid "No changes selected"
msgstr "没有选择变更"
-#: git-stash.sh:165
+#: git-stash.sh:172
msgid "Cannot remove temporary index (can't happen)"
msgstr "无法删除临时索引（不应发生）"
-#: git-stash.sh:178
+#: git-stash.sh:185
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
-#: git-stash.sh:210
+#: git-stash.sh:217
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "无法用 $w_commit 更新 $ref_stash"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
+#: git-stash.sh:273
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
"错误：'stash save' 的未知选项：$option\n"
" 要提供一个描述信息，使用 git stash save -- '$option'"
-#: git-stash.sh:281
+#: git-stash.sh:288
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-#: git-stash.sh:289
+#: git-stash.sh:296
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
-#: git-stash.sh:294
+#: git-stash.sh:301
msgid "Cannot initialize stash"
msgstr "无法初始化贮藏"
-#: git-stash.sh:298
+#: git-stash.sh:305
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
-#: git-stash.sh:299
+#: git-stash.sh:306
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "保存工作目录和索引状态 $stash_msg"
-#: git-stash.sh:326
+#: git-stash.sh:334
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: git-stash.sh:474
+#: git-stash.sh:482
#, sh-format
msgid "unknown option: $opt"
msgstr "未知选项: $opt"
-#: git-stash.sh:487
+#: git-stash.sh:495
msgid "No stash entries found."
msgstr "未发现贮藏条目。"
-#: git-stash.sh:494
+#: git-stash.sh:502
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "指定了太多的版本：$REV"
-#: git-stash.sh:509
+#: git-stash.sh:517
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference 不是一个有效的引用"
-#: git-stash.sh:537
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' 不是贮藏式提交"
-#: git-stash.sh:548
+#: git-stash.sh:556
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' 不是一个贮藏引用"
-#: git-stash.sh:556
+#: git-stash.sh:564
msgid "unable to refresh index"
msgstr "无法刷新索引"
-#: git-stash.sh:560
+#: git-stash.sh:568
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程应用贮藏"
-#: git-stash.sh:568
+#: git-stash.sh:576
msgid "Conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不使用 --index。"
-#: git-stash.sh:570
+#: git-stash.sh:578
msgid "Could not save index tree"
msgstr "不能保存索引树"
-#: git-stash.sh:579
+#: git-stash.sh:587
msgid "Could not restore untracked files from stash entry"
msgstr "无法从贮藏条目中恢复未跟踪文件"
-#: git-stash.sh:604
+#: git-stash.sh:612
msgid "Cannot unstage modified files"
msgstr "无法将修改的文件取消暂存"
-#: git-stash.sh:619
+#: git-stash.sh:627
msgid "Index was not unstashed."
msgstr "索引未从贮藏中恢复。"
-#: git-stash.sh:633
+#: git-stash.sh:641
msgid "The stash entry is kept in case you need it again."
msgstr "贮藏条目被保留以备您再次需要。"
-#: git-stash.sh:642
+#: git-stash.sh:650
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"
-#: git-stash.sh:643
+#: git-stash.sh:651
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}：无法丢弃贮藏条目"
-#: git-stash.sh:651
+#: git-stash.sh:659
msgid "No branch name specified"
msgstr "未指定分支名"
-#: git-stash.sh:730
+#: git-stash.sh:738
msgid "(To restore them type \"git stash apply\")"
msgstr "（为恢复数据输入 \"git stash apply\"）"
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
-#: git-submodule.sh:648
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-submodule.sh:653
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
-#: git-submodule.sh:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中获取"
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
msgstr ""
"获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。"
-#: git-submodule.sh:684
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-#: git-submodule.sh:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-#: git-submodule.sh:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "子模组 '$displaypath'：'$command $sha1'"
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进子模组路径 '$displaypath'"
-#: git-submodule.sh:841
+#: git-submodule.sh:840
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached 不能和选项 --files 同时使用"
-#: git-submodule.sh:893
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:913
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告：$display_name 未包含提交 $sha1_src"
# 译者：注意保持前导空格
-#: git-submodule.sh:916
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告：$display_name 未包含提交 $sha1_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:919
+#: git-submodule.sh:918
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
-#: git-submodule.sh:1065
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进子模组路径 '$sm_path'"
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "为 '$displaypath' 同步子模组 url"
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
"\n"
"命令:\n"
-" p, pick = 使用提交\n"
-" r, reword = 使用提交，但修改提交说明\n"
-" e, edit = 使用提交，但停止以便进行提交修补\n"
-" s, squash = 使用提交，但和前一个版本融合\n"
-" f, fixup = 类似于 \"squash\"，但丢弃提交说明日志\n"
-" x, exec = 使用 shell 运行命令（此行剩余部分）\n"
-" d, drop = 删除提交\n"
+"p, pick = 使用提交\n"
+"r, reword = 使用提交，但修改提交说明\n"
+"e, edit = 使用提交，但停止以便进行提交修补\n"
+"s, squash = 使用提交，但和前一个版本融合\n"
+"f, fixup = 类似于 \"squash\"，但丢弃提交说明日志\n"
+"x, exec = 使用 shell 运行命令（此行剩余部分）\n"
+"d, drop = 删除提交\n"
"\n"
"这些行可以被重新排序；它们会被从上至下地执行。\n"
-"\n"
#: git-rebase--interactive.sh:171
msgid ""
msgid "Refusing to squash a merge: $sha1"
msgstr "拒绝压缩一个合并：$sha1"
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "无法重做合并 $sha1"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr "不能拣选 $sha1"
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "这是提交说明 #${n}："
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "提交说明 #${n} 将被跳过："
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "这是一个 $count 个提交的组合。"
msgstr[1] "这是一个 $count 个提交的组合。"
-#: git-rebase--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "不能写入 $fixup_msg"
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr "这是一个 2 个提交的组合。"
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "不能应用 $sha1... $rest"
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"这通常是因为空的提交说明，或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
"钩子执行失败，你可能需要在重写提交说明前解决这个问题。"
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "停止在 $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "没有父提交的情况下不能 '$squash_style'"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr "执行：$rest"
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr "执行失败：$rest"
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
msgid "and made changes to the index and/or the working tree"
msgstr "并且修改索引和/或工作区"
# 译者：注意保持前导空格
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "未知命令：$command $sha1 $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "要修改请使用命令 'git rebase --edit-todo'。"
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "成功变基并更新 $head_name。"
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "不能跳过不必要的拣选命令"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"警告：缺失 SHA-1 或者在下面一行中不是一个提交：\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"警告：下面一行中的命令未能被识别：\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
msgid "could not detach HEAD"
msgstr "不能检出为分离头指针"
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr "警告：一些提交可能被意外丢弃。丢弃的提交（从新到旧）："
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"
-"\n"
-"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
-"可选值有：ignore、warn、error。"
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"您可以用 'git rebase --edit-todo' 修正问题然后执行 'git rebase --continue'。"
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。"
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
msgid "Error trying to find the author identity to amend commit"
msgstr "在修补提交中查找作者信息时遇到错误"
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:811
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
msgid "Could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
"\n"
msgstr ""
"\n"
-"您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基，\n"
+"您正在修改运行中的交互式变基待办列表。若要在编辑结束后继续变基，\n"
"请执行：\n"
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
msgid "Could not execute editor"
msgstr "无法运行编辑器"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "不能检出 $switch_to"
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
msgid "No HEAD?"
msgstr "没有 HEAD？"
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "不能创建临时 $state_dir"
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
msgid "Could not mark as interactive"
msgstr "不能标记为交互式"
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
msgid "Could not init rewritten commits"
msgstr "不能对重写提交进行初始化"
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
-#: git-rebase--interactive.sh:1296
+#: git-rebase--interactive.sh:998
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"然而，如果您删除全部内容，变基操作将会终止。\n"
"\n"
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
msgid "Note that empty commits are commented out"
msgstr "注意空提交已被注释掉"
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "本地时间偏移量大于等于 24 小时\n"
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr "编辑器非正常退出，终止所有操作"
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
-#: git-send-email.perl:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' 包含编辑的邮件。\n"
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases 和其它选项不兼容\n"
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "不能在仓库之外运行 git format-patch\n"
-#: git-send-email.perl:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "未知的 --suppress-cc 字段：'%s'\n"
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "未知的 --confirm 设置：'%s'\n"
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "警告：不支持带引号的 sendmail 别名：%s\n"
-#: git-send-email.perl:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "警告：不支持 `:include:`：%s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n"
-#: git-send-email.perl:518
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "警告：不能识别的 sendmail 行：%s\n"
-#: git-send-email.perl:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * 如果含义为一个文件，使用 \"./%s\"，或者\n"
" * 如果含义为一个范围，使用 --format-patch 选项。\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "无法打开目录 %s: %s"
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
"严重：%s：%s\n"
"警告：补丁未能发送\n"
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
"未指定补丁文件！\n"
"\n"
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr "在 %s 中没有标题行？"
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "无法写入 %s: %s"
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"如果您不想发送摘要，清除内容。\n"
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "无法打开 %s.final: %s"
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr "无法打开 %s: %s"
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr "To/Cc/Bcc 字段不解析，它们被忽略\n"
-#: git-send-email.perl:759
+#: git-send-email.perl:754
msgid "Summary email is empty, skipping it\n"
msgstr "摘要邮件为空，跳过\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "您确认要使用 <%s> [y/N]？"
-#: git-send-email.perl:820
+#: git-send-email.perl:815
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr "如下文件含 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n"
-#: git-send-email.perl:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？"
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"\t%s\n"
"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n"
-#: git-send-email.perl:852
+#: git-send-email.perl:847
msgid "To whom should the emails be sent (if anyone)?"
msgstr "邮件将要发送给谁？"
-#: git-send-email.perl:870
+#: git-send-email.perl:865
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "严重：别名 '%s' 扩展为它自己\n"
-#: git-send-email.perl:882
+#: git-send-email.perl:877
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ？"
-#: git-send-email.perl:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:944
+#: git-send-email.perl:939
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)："
-#: git-send-email.perl:1245
+#: git-send-email.perl:1260
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA 路径 \"%s\" 不存在"
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1350
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr "发送邮件？([y]es|[n]o|[q]uit|[a]ll)："
-#: git-send-email.perl:1338
+#: git-send-email.perl:1353
msgid "Send this email reply required"
msgstr "发送要求的邮件回复"
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
msgid "The required SMTP server is not properly defined."
msgstr "要求的 SMTP 服务器未被正确定义。"
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "服务器不支持 STARTTLS！%s"
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS 失败！%s"
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
-#: git-send-email.perl:1448
+#: git-send-email.perl:1463
#, perl-format
msgid "Failed to send %s\n"
msgstr "无法发送 %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "演习发送 %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
#, perl-format
msgid "Sent %s\n"
msgstr "正发送 %s\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
msgid "Dry-OK. Log says:\n"
msgstr "演习成功。日志说：\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
msgid "OK. Log says:\n"
msgstr "OK。日志说：\n"
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
msgid "Result: "
msgstr "结果："
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
msgid "Result: OK\n"
msgstr "结果：OK\n"
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
#, perl-format
msgid "can't open file %s"
msgstr "无法打开文件 %s"
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1534
+#: git-send-email.perl:1549
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
-#: git-send-email.perl:1582
+#: git-send-email.perl:1597
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1605
+#: git-send-email.perl:1622
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) 添加 cc: %s 自行 '%s'\n"
-#: git-send-email.perl:1711
+#: git-send-email.perl:1728
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) 不能执行 '%s'"
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) 添加 %s: %s 自：'%s'\n"
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) 无法关闭管道至 '%s'"
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
msgid "cannot send message as 7bit"
msgstr "不能以 7bit 形式发送信息"
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
msgid "invalid transfer encoding"
msgstr "无效的传送编码"
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "不能打开 %s：%s\n"
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s：补丁包含一个超过 998 字符的行"
-#: git-send-email.perl:1814
+#: git-send-email.perl:1831
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "略过 %s 含备份后缀 '%s'。\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1818
+#: git-send-email.perl:1835
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "您真的要发送 %s？[y|N]："