msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-08-10 20:12+0800\n"
-"PO-Revision-Date: 2019-08-13 21:16+0800\n"
+"POT-Creation-Date: 2019-10-28 13:19+0800\n"
+"PO-Revision-Date: 2019-10-30 14:58+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:193 builtin/merge.c:1327
+#: advice.c:193 builtin/merge.c:1332
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
msgid "inconsistent header lines %d and %d"
msgstr "不一致的文件头，%d 行和 %d 行"
-#: apply.c:1460
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount：意外的行：%.*s"
-
-#: apply.c:1529
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "第 %d 行的补丁片段没有头信息：%.*s"
-
-#: apply.c:1551
+#: apply.c:1372
#, 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:1564
+#: apply.c:1385
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"
-#: apply.c:1752
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount：意外的行：%.*s"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "第 %d 行的补丁片段没有头信息：%.*s"
+
+#: apply.c:1753
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"
-#: apply.c:1754
+#: apply.c:1755
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"
-#: apply.c:1788
+#: apply.c:1789
#, c-format
msgid "corrupt patch at line %d"
msgstr "补丁在第 %d 行损坏"
-#: apply.c:1825
+#: apply.c:1826
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"
-#: apply.c:1827
+#: apply.c:1828
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"
-#: apply.c:1830
+#: apply.c:1831
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告：文件 %s 成为空文件但并未删除"
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏：%.*s"
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
-#: apply.c:2925
+#: apply.c:2926
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符：'%c'"
-#: apply.c:3046
+#: apply.c:3047
#, 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:3058
+#: apply.c:3059
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
-#: apply.c:3064
+#: apply.c:3065
#, c-format
msgid ""
"while searching for:\n"
"当查询：\n"
"%.*s"
-#: apply.c:3086
+#: apply.c:3087
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
-#: apply.c:3094
+#: apply.c:3095
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
-#: apply.c:3141
+#: apply.c:3142
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
-#: apply.c:3159
+#: apply.c:3160
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "补丁应用到空文件 '%s'，但其并非空文件"
-#: apply.c:3177
+#: apply.c:3178
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
-#: apply.c:3190
+#: apply.c:3191
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
-#: apply.c:3196
+#: apply.c:3197
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
-#: apply.c:3217
+#: apply.c:3218
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败：%s:%ld"
-#: apply.c:3340
+#: apply.c:3341
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
+#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
-#: apply.c:3400
+#: apply.c:3401
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读取位于符号链接中的 '%s'"
-#: apply.c:3429 apply.c:3672
+#: apply.c:3430 apply.c:3673
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
-#: apply.c:3515 apply.c:3687
+#: apply.c:3516 apply.c:3688
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在于索引中"
-#: apply.c:3524 apply.c:3695
+#: apply.c:3525 apply.c:3696
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不匹配"
-#: apply.c:3559
+#: apply.c:3560
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: apply.c:3562
+#: apply.c:3563
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "回落到三方合并...\n"
-#: apply.c:3578 apply.c:3582
+#: apply.c:3579 apply.c:3583
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "无法读取 '%s' 的当前内容"
-#: apply.c:3594
+#: apply.c:3595
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "无法回落到三方合并...\n"
-#: apply.c:3608
+#: apply.c:3609
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "应用补丁到 '%s' 存在冲突。\n"
-#: apply.c:3613
+#: apply.c:3614
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功应用补丁到 '%s'。\n"
-#: apply.c:3639
+#: apply.c:3640
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
-#: apply.c:3712
+#: apply.c:3713
#, c-format
msgid "%s: wrong type"
msgstr "%s：错误类型"
-#: apply.c:3714
+#: apply.c:3715
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o，应为 %o"
-#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
+#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
-#: apply.c:3923
+#: apply.c:3924
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已经存在于索引中"
-#: apply.c:3926
+#: apply.c:3927
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已经存在于工作区中"
-#: apply.c:3946
+#: apply.c:3947
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
-#: apply.c:3951
+#: apply.c:3952
#, 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:3971
+#: apply.c:3972
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
-#: apply.c:3975
+#: apply.c:3976
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：补丁未应用"
-#: apply.c:3990
+#: apply.c:3991
#, c-format
msgid "Checking patch %s..."
msgstr "正在检查补丁 %s..."
-#: apply.c:4082
+#: apply.c:4083
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模组 %s 的 sha1 信息缺失或无效"
-#: apply.c:4089
+#: apply.c:4090
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式变更，但它不在当前 HEAD 中"
-#: apply.c:4092
+#: apply.c:4093
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效（%s）。"
-#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
+#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
-#: apply.c:4101
+#: apply.c:4102
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在临时索引中添加 %s"
-#: apply.c:4111
+#: apply.c:4112
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把临时索引写入到 %s"
-#: apply.c:4249
+#: apply.c:4250
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-#: apply.c:4283
+#: apply.c:4284
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
-#: apply.c:4289
+#: apply.c:4290
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"
-#: apply.c:4297
+#: apply.c:4298
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
-#: apply.c:4303 apply.c:4448
+#: apply.c:4304 apply.c:4449
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
-#: apply.c:4346
+#: apply.c:4347
#, c-format
msgid "failed to write to '%s'"
msgstr "写入 '%s' 失败"
-#: apply.c:4350
+#: apply.c:4351
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: apply.c:4420
+#: apply.c:4421
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
-#: apply.c:4518
+#: apply.c:4519
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
-#: apply.c:4526
+#: apply.c:4527
msgid "internal error"
msgstr "内部错误"
-#: apply.c:4529
+#: apply.c:4530
#, 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:4540
+#: apply.c:4541
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
+#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
-#: apply.c:4562
+#: apply.c:4563
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
-#: apply.c:4566
+#: apply.c:4567
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
-#: apply.c:4676
+#: apply.c:4686
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"
-#: apply.c:4684
+#: apply.c:4694
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: apply.c:4704
+#: apply.c:4714
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: apply.c:4859
+#: apply.c:4871
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s'：%s"
-#: apply.c:4886
+#: apply.c:4898
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: apply.c:4892 apply.c:4907
+#: apply.c:4904 apply.c:4919
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字符误用。"
msgstr[1] "%d 行新增了空白字符误用。"
-#: apply.c:4900
+#: apply.c:4912
#, 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:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
-#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
-#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
+#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
+#: builtin/pull.c:209 builtin/submodule--helper.c:407
#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "路径"
-#: apply.c:4944
+#: apply.c:4956
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: apply.c:4947
+#: apply.c:4959
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:4949 builtin/am.c:2217
+#: apply.c:4961 builtin/am.c:2206
msgid "num"
msgstr "数字"
-#: apply.c:4950
+#: apply.c:4962
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: apply.c:4953
+#: apply.c:4965
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: apply.c:4955
+#: apply.c:4967
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
-#: apply.c:4959
+#: apply.c:4971
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
-#: apply.c:4961
+#: apply.c:4973
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁，而是显示输入的概要"
-#: apply.c:4963
+#: apply.c:4975
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁，而是查看补丁是否可应用"
-#: apply.c:4965
+#: apply.c:4977
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: apply.c:4967
+#: apply.c:4979
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
-#: apply.c:4969
+#: apply.c:4981
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: apply.c:4971
+#: apply.c:4983
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
-#: apply.c:4974
+#: apply.c:4986
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
-#: apply.c:4976
+#: apply.c:4988
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三方合并"
-#: apply.c:4978
+#: apply.c:4990
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: apply.c:4983
+#: apply.c:4995
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
+#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
msgid "action"
msgstr "动作"
-#: apply.c:4985
+#: apply.c:4997
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: apply.c:4988 apply.c:4991
+#: apply.c:5000 apply.c:5003
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: apply.c:4994
+#: apply.c:5006
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: apply.c:4996
+#: apply.c:5008
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: apply.c:4998
+#: apply.c:5010
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: apply.c:5000
+#: apply.c:5012
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
+#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "冗长输出"
-#: apply.c:5003
+#: apply.c:5015
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
-#: apply.c:5006
+#: apply.c:5018
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:5008 builtin/am.c:2205
+#: apply.c:5020 builtin/am.c:2194
msgid "root"
msgstr "根目录"
-#: apply.c:5009
+#: apply.c:5021
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
msgid "archive format"
msgstr "归档格式"
-#: archive.c:458 builtin/log.c:1580
+#: archive.c:458 builtin/log.c:1581
msgid "prefix"
msgstr "前缀"
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
-#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
-#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:186
msgid "file"
msgstr "文件"
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "仓库"
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库（<仓库>）提取归档文件"
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
#: builtin/notes.c:498
msgid "command"
msgstr "命令"
msgid "cannot stream blob %s"
msgstr "不能打开数据对象 %s"
-#: archive-tar.c:260 archive-zip.c:363
+#: archive-tar.c:266 archive-zip.c:363
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "不支持的文件模式：0%o (SHA1: %s)"
-#: archive-tar.c:287 archive-zip.c:353
+#: archive-tar.c:293 archive-zip.c:353
#, c-format
msgid "cannot read %s"
msgstr "不能读取 %s"
-#: archive-tar.c:459
+#: archive-tar.c:465
#, c-format
msgid "unable to start '%s' filter"
msgstr "无法启动 '%s' 过滤器"
-#: archive-tar.c:462
+#: archive-tar.c:468
msgid "unable to redirect descriptor"
msgstr "无法重定向描述符"
-#: archive-tar.c:469
+#: archive-tar.c:475
#, c-format
msgid "'%s' filter reported error"
msgstr "'%s' 过滤器报告了错误"
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "对于本系统时间戳太大：%<PRIuMAX>"
-#: attr.c:211
+#: attr.c:213
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一个有效的属性名"
-#: attr.c:368
+#: attr.c:370
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "不允许 %s：%s:%d"
-#: attr.c:408
+#: attr.c:410
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
-#: blame.c:2697
+#: blame.c:2700
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
-#: blame.c:2711
+#: blame.c:2714
msgid "cannot use --contents with final commit object name"
msgstr "不能将 --contents 和最终的提交对象名共用"
-#: blame.c:2732
+#: blame.c:2735
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
-#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
-#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
-#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
+#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
+#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
+#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
-#: blame.c:2759
+#: blame.c:2762
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
-#: blame.c:2770
+#: blame.c:2773
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中无此路径 %1$s"
-#: blame.c:2781
+#: blame.c:2784
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能为路径 %2$s 读取数据对象 %1$s"
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
msgid "invalid color value: %.*s"
msgstr "无效的颜色值：%.*s"
-#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
+#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
+#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
"设置 \"git config advice.graftFileDeprecated false\"\n"
"可关闭本消息"
-#: commit.c:1127
+#: commit.c:1128
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
-#: commit.c:1130
+#: commit.c:1131
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-#: commit.c:1133
+#: commit.c:1134
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 没有 GPG 签名。"
-#: commit.c:1136
+#: commit.c:1137
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-#: commit.c:1390
+#: commit.c:1391
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 "unable to find all commit-graph files"
msgstr "无法找到所有提交图形文件"
-#: commit-graph.c:554 commit-graph.c:614
+#: commit-graph.c:561 commit-graph.c:621
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "无效的提交位置。提交图形可能已损坏"
-#: commit-graph.c:575
+#: commit-graph.c:582
#, c-format
msgid "could not find commit %s"
msgstr "无法找到提交 %s"
-#: commit-graph.c:1002 builtin/pack-objects.c:2657
+#: commit-graph.c:855 builtin/am.c:1287
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "不能解析提交 %s"
+
+#: commit-graph.c:859
+#, c-format
+msgid "unable to get tree for %s"
+msgstr "无法得到 %s 的树对象"
+
+#: commit-graph.c:1017 builtin/pack-objects.c:2641
#, c-format
msgid "unable to get type of object %s"
msgstr "无法获得对象 %s 类型"
-#: commit-graph.c:1034
+#: commit-graph.c:1049
msgid "Loading known commits in commit graph"
msgstr "正在加载提交图中的已知提交"
-#: commit-graph.c:1051
+#: commit-graph.c:1066
msgid "Expanding reachable commits in commit graph"
msgstr "正在扩展提交图中的可达提交"
-#: commit-graph.c:1070
+#: commit-graph.c:1085
msgid "Clearing commit marks in commit graph"
msgstr "正在清除提交图中的提交标记"
-#: commit-graph.c:1089
+#: commit-graph.c:1104
msgid "Computing commit graph generation numbers"
msgstr "正在计算提交图世代数字"
-#: commit-graph.c:1163
+#: commit-graph.c:1179
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "正在 %d 个包中查找提交图的提交"
msgstr[1] "正在 %d 个包中查找提交图的提交"
-#: commit-graph.c:1176
+#: commit-graph.c:1192
#, c-format
msgid "error adding pack %s"
msgstr "添加包 %s 出错"
-#: commit-graph.c:1180
+#: commit-graph.c:1196
#, c-format
msgid "error opening index for %s"
msgstr "为 %s 打开索引出错"
-#: commit-graph.c:1204
+#: commit-graph.c:1220
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] "正在从 %d 个引用中查找提交图的提交"
msgstr[1] "正在从 %d 个引用中查找提交图的提交"
-#: commit-graph.c:1238
+#: commit-graph.c:1240
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "无效的提交对象 ID：%s"
+
+#: commit-graph.c:1255
msgid "Finding commits for commit graph among packed objects"
msgstr "正在打包对象中查找提交图的提交"
-#: commit-graph.c:1253
+#: commit-graph.c:1270
msgid "Counting distinct commits in commit graph"
msgstr "正在计算提交图中不同的提交"
-#: commit-graph.c:1284
+#: commit-graph.c:1300
msgid "Finding extra edges in commit graph"
msgstr "正在查找提交图中额外的边"
-#: commit-graph.c:1332
+#: commit-graph.c:1346
msgid "failed to write correct number of base graph ids"
msgstr "无法写入正确数量的基础图形 ID"
-#: commit-graph.c:1365 midx.c:811
+#: commit-graph.c:1379 midx.c:810
#, c-format
msgid "unable to create leading directories of %s"
msgstr "不能为 %s 创建先导目录"
-#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241
#, c-format
msgid "unable to create '%s'"
msgstr "不能创建 '%s'"
-#: commit-graph.c:1437
+#: commit-graph.c:1451
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "正在用 %d 步写出提交图"
msgstr[1] "正在用 %d 步写出提交图"
-#: commit-graph.c:1478
+#: commit-graph.c:1492
msgid "unable to open commit-graph chain file"
msgstr "无法打开提交图形链文件"
-#: commit-graph.c:1490
+#: commit-graph.c:1504
msgid "failed to rename base commit-graph file"
msgstr "无法重命名基础提交图形文件"
-#: commit-graph.c:1510
+#: commit-graph.c:1524
msgid "failed to rename temporary commit-graph file"
msgstr "无法重命名临时提交图形文件"
-#: commit-graph.c:1621
+#: commit-graph.c:1635
msgid "Scanning merged commits"
msgstr "正在扫描合并提交"
-#: commit-graph.c:1632
+#: commit-graph.c:1646
#, c-format
msgid "unexpected duplicate commit id %s"
msgstr "意外的重复提交 ID %s"
-#: commit-graph.c:1657
+#: commit-graph.c:1670
msgid "Merging commit-graph"
msgstr "正在合并提交图形"
-#: commit-graph.c:1844
+#: commit-graph.c:1860
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr "提交图格式不能写入 %d 个提交"
-#: commit-graph.c:1855
+#: commit-graph.c:1871
msgid "too many commits to write graph"
msgstr "提交太多不能画图"
-#: commit-graph.c:1945
+#: commit-graph.c:1961
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "提交图文件的校验码错误，可能已经损坏"
-#: commit-graph.c:1955
+#: commit-graph.c:1971
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
-#: commit-graph.c:1965 commit-graph.c:1980
+#: commit-graph.c:1981 commit-graph.c:1996
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
-#: commit-graph.c:1972
+#: commit-graph.c:1988
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "无法从提交图形中解析提交 %s"
-#: commit-graph.c:1989
+#: commit-graph.c:2006
msgid "Verifying commits in commit graph"
msgstr "正在校验提交图中的提交"
-#: commit-graph.c:2002
+#: commit-graph.c:2020
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr "无法从提交图形的对象库中解析提交 %s"
-#: commit-graph.c:2009
+#: commit-graph.c:2027
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
-#: commit-graph.c:2019
+#: commit-graph.c:2037
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "提交 %s 的提交图形父提交列表太长了"
-#: commit-graph.c:2028
+#: commit-graph.c:2046
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "%s 的提交图形父提交是 %s != %s"
-#: commit-graph.c:2041
+#: commit-graph.c:2059
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "提交 %s 的提交图形父提交列表过早终止"
-#: commit-graph.c:2046
+#: commit-graph.c:2064
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
-#: commit-graph.c:2050
+#: commit-graph.c:2068
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
-#: commit-graph.c:2065
+#: commit-graph.c:2083
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
-#: commit-graph.c:2071
+#: commit-graph.c:2089
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
msgid "key does not contain variable name: %s"
msgstr "键名没有包含变量名：%s"
-#: config.c:406 sequencer.c:2463
+#: config.c:406 sequencer.c:2401
#, c-format
msgid "invalid key: %s"
msgstr "无效键名：%s"
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式：%s"
-#: config.c:1430
+#: config.c:1425
#, c-format
msgid "malformed value for %s"
msgstr "%s 的取值格式错误"
-#: config.c:1456
+#: config.c:1451
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s 的取值格式错误：%s"
-#: config.c:1457
+#: config.c:1452
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
-#: config.c:1518 builtin/pack-objects.c:3410
+#: config.c:1513 builtin/pack-objects.c:3394
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
-#: config.c:1639
+#: config.c:1634
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "无法从数据对象 '%s' 加载配置"
-#: config.c:1642
+#: config.c:1637
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "引用 '%s' 没有指向一个数据对象"
-#: config.c:1659
+#: config.c:1654
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "不能解析配置对象 '%s'"
-#: config.c:1689
+#: config.c:1684
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失败"
-#: config.c:1745
+#: config.c:1740
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
-#: config.c:2094
+#: config.c:2091
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
-#: config.c:2264
+#: config.c:2261
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s：'%s'"
-#: config.c:2307
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"
-
-#: config.c:2333
+#: config.c:2306
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
-#: config.c:2379
+#: config.c:2352
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
-#: config.c:2381
+#: config.c:2354
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:2462
+#: config.c:2435
#, c-format
msgid "invalid section name '%s'"
msgstr "无效的小节名称 '%s'"
-#: config.c:2494
+#: config.c:2467
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2523
+#: config.c:2496
#, c-format
msgid "failed to write new configuration file %s"
msgstr "写入新的配置文件 %s 失败"
-#: config.c:2775 config.c:3099
+#: config.c:2748 config.c:3072
#, c-format
msgid "could not lock config file %s"
msgstr "不能锁定配置文件 %s"
-#: config.c:2786
+#: config.c:2759
#, c-format
msgid "opening %s"
msgstr "打开 %s"
-#: config.c:2821 builtin/config.c:328
+#: config.c:2794 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "无效模式：%s"
-#: config.c:2846
+#: config.c:2819
#, c-format
msgid "invalid config file %s"
msgstr "无效的配置文件 %s"
-#: config.c:2859 config.c:3112
+#: config.c:2832 config.c:3085
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
-#: config.c:2870
+#: config.c:2843
#, c-format
msgid "unable to mmap '%s'"
msgstr "不能 mmap '%s'"
-#: config.c:2879 config.c:3117
+#: config.c:2852 config.c:3090
#, c-format
msgid "chmod on %s failed"
msgstr "对 %s 调用 chmod 失败"
-#: config.c:2964 config.c:3214
+#: config.c:2937 config.c:3187
#, c-format
msgid "could not write config file %s"
msgstr "不能写入配置文件 %s"
-#: config.c:2998
+#: config.c:2971
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:3000 builtin/remote.c:782
+#: config.c:2973 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
-#: config.c:3090
+#: config.c:3063
#, c-format
msgid "invalid section name: %s"
msgstr "无效的小节名称：%s"
-#: config.c:3257
+#: config.c:3230
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺失"
msgid "unknown port %s"
msgstr "未知端口 %s"
-#: connect.c:845 connect.c:1171
+#: connect.c:845 connect.c:1175
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "已阻止奇怪的主机名 '%s'"
msgid "cannot start proxy %s"
msgstr "不能启动代理 %s"
-#: connect.c:924
+#: connect.c:928
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"
-#: connect.c:1119
+#: connect.c:1123
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh 变体 'simple' 不支持 -4"
-#: connect.c:1131
+#: connect.c:1135
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh 变体 'simple' 不支持 -6"
-#: connect.c:1148
+#: connect.c:1152
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh 变体 'simple' 不支持设置端口"
-#: connect.c:1260
+#: connect.c:1264
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "已阻止奇怪的路径名 '%s'"
-#: connect.c:1307
+#: connect.c:1311
msgid "unable to fork"
msgstr "无法 fork"
-#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "正在检查连通性"
-#: connected.c:98
+#: connected.c:100
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"
-#: connected.c:118
+#: connected.c:120
msgid "failed write to rev-list"
msgstr "写入 rev-list 失败"
-#: connected.c:125
+#: connected.c:127
msgid "failed to close rev-list's stdin"
msgstr "关闭 rev-list 的标准输入失败"
-#: convert.c:193
+#: convert.c:194
#, c-format
msgid "illegal crlf_action %d"
msgstr "非法的 crlf 动作 %d"
-#: convert.c:206
+#: convert.c:207
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "%s 中的 CRLF 将被 LF 替换"
-#: convert.c:208
+#: convert.c:209
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
"%s 中的 CRLF 将被 LF 替换。<\n"
"在工作区中该文件仍保持原有的换行符。"
-#: convert.c:216
+#: convert.c:217
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "文件 %s 中的 LF 将被 CRLF 替换"
-#: convert.c:218
+#: convert.c:219
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
"%s 中的 LF 将被 CRLF 替换。\n"
"在工作区中该文件仍保持原有的换行符"
-#: convert.c:279
+#: convert.c:280
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM"
-#: convert.c:286
+#: convert.c:287
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
"tree-encoding."
msgstr "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%s 作为工作区编码。"
-#: convert.c:304
+#: convert.c:305
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM"
-#: convert.c:306
+#: convert.c:307
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
"文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"
"节序）作为工作区编码。"
-#: convert.c:424 convert.c:495
+#: convert.c:425 convert.c:496
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
-#: convert.c:467
+#: convert.c:468
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
-#: convert.c:673
+#: convert.c:674
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "不能 fork 以执行外部过滤器 '%s'"
-#: convert.c:693
+#: convert.c:694
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "不能将输入传递给外部过滤器 '%s'"
-#: convert.c:700
+#: convert.c:701
#, c-format
msgid "external filter '%s' failed %d"
msgstr "外部过滤器 '%s' 失败码 %d"
-#: convert.c:735 convert.c:738
+#: convert.c:736 convert.c:739
#, c-format
msgid "read from external filter '%s' failed"
msgstr "从外部过滤器 '%s' 读取失败"
-#: convert.c:741 convert.c:796
+#: convert.c:742 convert.c:797
#, c-format
msgid "external filter '%s' failed"
msgstr "外部过滤器 '%s' 失败"
-#: convert.c:844
+#: convert.c:845
msgid "unexpected filter type"
msgstr "意外的过滤类型"
-#: convert.c:855
+#: convert.c:856
msgid "path name too long for external filter"
msgstr "外部过滤器的路径名太长"
-#: convert.c:929
+#: convert.c:930
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"
-#: convert.c:1228
+#: convert.c:1229
msgid "true/false are no valid working-tree-encodings"
msgstr "true/false 不是有效的工作区编码"
-#: convert.c:1398 convert.c:1432
+#: convert.c:1417 convert.c:1451
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s：clean 过滤器 '%s' 失败"
-#: convert.c:1476
+#: convert.c:1495
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s：smudge 过滤器 %s 失败"
-#: date.c:137
+#: date.c:138
msgid "in the future"
msgstr "在将来"
-#: date.c:143
+#: date.c:144
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "%<PRIuMAX> 秒钟前"
msgstr[1] "%<PRIuMAX> 秒钟前"
-#: date.c:150
+#: date.c:151
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "%<PRIuMAX> 分钟前"
msgstr[1] "%<PRIuMAX> 分钟前"
-#: date.c:157
+#: date.c:158
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "%<PRIuMAX> 小时前"
msgstr[1] "%<PRIuMAX> 小时前"
-#: date.c:164
+#: date.c:165
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "%<PRIuMAX> 天前"
msgstr[1] "%<PRIuMAX> 天前"
-#: date.c:170
+#: date.c:171
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "%<PRIuMAX> 周前"
msgstr[1] "%<PRIuMAX> 周前"
-#: date.c:177
+#: date.c:178
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "%<PRIuMAX> 个月前"
msgstr[1] "%<PRIuMAX> 个月前"
-#: date.c:188
+#: date.c:189
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[1] "%<PRIuMAX> 年"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:191
+#: date.c:192
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s %<PRIuMAX> 个月前"
msgstr[1] "%s %<PRIuMAX> 个月前"
-#: date.c:196 date.c:201
+#: date.c:197 date.c:202
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgid "failed to read orderfile '%s'"
msgstr "读取排序文件 '%s' 失败"
-#: diffcore-rename.c:544
+#: diffcore-rename.c:543
msgid "Performing inexact rename detection"
msgstr "正在进行非精确的重命名探测"
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:4215
+#: diff.c:4218
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出，停止在 %s"
-#: diff.c:4560
+#: diff.c:4563
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: diff.c:4563
+#: diff.c:4566
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G、-S 和 --find-object 是互斥的"
-#: diff.c:4641
+#: diff.c:4644
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
-#: diff.c:4689
+#: diff.c:4692
#, c-format
msgid "invalid --stat value: %s"
msgstr "无效的 --stat 值：%s"
-#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225
#: parse-options.c:199 parse-options.c:203
#, c-format
msgid "%s expects a numerical value"
msgstr "%s 期望一个数字值"
-#: diff.c:4726
+#: diff.c:4729
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: diff.c:4811
+#: diff.c:4814
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
-#: diff.c:4835
+#: diff.c:4838
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "ws-error-highlight=%.*s 之后未知的值"
-#: diff.c:4849
+#: diff.c:4852
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析 '%s'"
-#: diff.c:4899 diff.c:4905
+#: diff.c:4902 diff.c:4908
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s 期望 <n>/<m> 格式"
-#: diff.c:4917
+#: diff.c:4920
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s 期望一个字符，得到 '%s'"
-#: diff.c:4938
+#: diff.c:4941
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "坏的 --color-moved 参数：%s"
-#: diff.c:4957
+#: diff.c:4960
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws 中的无效模式 '%s' "
-#: diff.c:4997
+#: diff.c:5000
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-#: diff.c:5033 diff.c:5053
+#: diff.c:5036 diff.c:5056
#, c-format
msgid "invalid argument to %s"
msgstr "%s 的参数无效"
-#: diff.c:5191
+#: diff.c:5194
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数：'%s'"
-#: diff.c:5247
+#: diff.c:5250
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "坏的 --word-diff 参数：%s"
-#: diff.c:5270
+#: diff.c:5273
msgid "Diff output format options"
msgstr "差异输出格式化选项"
-#: diff.c:5272 diff.c:5278
+#: diff.c:5275 diff.c:5281
msgid "generate patch"
msgstr "生成补丁"
-#: diff.c:5275 builtin/log.c:172
+#: diff.c:5278 builtin/log.c:172
msgid "suppress diff output"
msgstr "不显示差异输出"
-#: diff.c:5280 diff.c:5394 diff.c:5401
+#: diff.c:5283 diff.c:5397 diff.c:5404
msgid "<n>"
msgstr "<n>"
-#: diff.c:5281 diff.c:5284
+#: diff.c:5284 diff.c:5287
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差异"
-#: diff.c:5286
+#: diff.c:5289
msgid "generate the diff in raw format"
msgstr "生成原始格式的差异"
-#: diff.c:5289
+#: diff.c:5292
msgid "synonym for '-p --raw'"
msgstr "和 '-p --raw' 同义"
-#: diff.c:5293
+#: diff.c:5296
msgid "synonym for '-p --stat'"
msgstr "和 '-p --stat' 同义"
-#: diff.c:5297
+#: diff.c:5300
msgid "machine friendly --stat"
msgstr "机器友好的 --stat"
-#: diff.c:5300
+#: diff.c:5303
msgid "output only the last line of --stat"
msgstr "只输出 --stat 的最后一行"
-#: diff.c:5302 diff.c:5310
+#: diff.c:5305 diff.c:5313
msgid "<param1,param2>..."
msgstr "<参数1,参数2>..."
-#: diff.c:5303
+#: diff.c:5306
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "输出每个子目录相对变更的分布"
-#: diff.c:5307
+#: diff.c:5310
msgid "synonym for --dirstat=cumulative"
msgstr "和 --dirstat=cumulative 同义"
-#: diff.c:5311
+#: diff.c:5314
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "是 --dirstat=files,param1,param2... 的同义词"
-#: diff.c:5315
+#: diff.c:5318
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
-#: diff.c:5318
+#: diff.c:5321
msgid "condensed summary such as creations, renames and mode changes"
msgstr "精简摘要，例如创建、重命名和模式变更"
-#: diff.c:5321
+#: diff.c:5324
msgid "show only names of changed files"
msgstr "只显示变更文件的文件名"
-#: diff.c:5324
+#: diff.c:5327
msgid "show only names and status of changed files"
msgstr "只显示变更文件的文件名和状态"
-#: diff.c:5326
+#: diff.c:5329
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
-#: diff.c:5327
+#: diff.c:5330
msgid "generate diffstat"
msgstr "生成差异统计（diffstat）"
-#: diff.c:5329 diff.c:5332 diff.c:5335
+#: diff.c:5332 diff.c:5335 diff.c:5338
msgid "<width>"
msgstr "<宽度>"
-#: diff.c:5330
+#: diff.c:5333
msgid "generate diffstat with a given width"
msgstr "使用给定的长度生成差异统计"
-#: diff.c:5333
+#: diff.c:5336
msgid "generate diffstat with a given name width"
msgstr "使用给定的文件名长度生成差异统计"
-#: diff.c:5336
+#: diff.c:5339
msgid "generate diffstat with a given graph width"
msgstr "使用给定的图形长度生成差异统计"
-#: diff.c:5338
+#: diff.c:5341
msgid "<count>"
msgstr "<次数>"
-#: diff.c:5339
+#: diff.c:5342
msgid "generate diffstat with limited lines"
msgstr "生成有限行数的差异统计"
-#: diff.c:5342
+#: diff.c:5345
msgid "generate compact summary in diffstat"
msgstr "生成差异统计的简洁摘要"
-#: diff.c:5345
+#: diff.c:5348
msgid "output a binary diff that can be applied"
msgstr "输出一个可以应用的二进制差异"
-#: diff.c:5348
+#: diff.c:5351
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "在 \"index\" 行显示完整的前后对象名称"
-#: diff.c:5350
+#: diff.c:5353
msgid "show colored diff"
msgstr "显示带颜色的差异"
-#: diff.c:5351
+#: diff.c:5354
msgid "<kind>"
msgstr "<类型>"
-#: diff.c:5352
+#: diff.c:5355
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
-#: diff.c:5355
+#: diff.c:5358
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
"符"
-#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473
msgid "<prefix>"
msgstr "<前缀>"
-#: diff.c:5359
+#: diff.c:5362
msgid "show the given source prefix instead of \"a/\""
msgstr "显示给定的源前缀取代 \"a/\""
-#: diff.c:5362
+#: diff.c:5365
msgid "show the given destination prefix instead of \"b/\""
msgstr "显示给定的目标前缀取代 \"b/\""
-#: diff.c:5365
+#: diff.c:5368
msgid "prepend an additional prefix to every line of output"
msgstr "输出的每一行附加前缀"
-#: diff.c:5368
+#: diff.c:5371
msgid "do not show any source or destination prefix"
msgstr "不显示任何源和目标前缀"
-#: diff.c:5371
+#: diff.c:5374
msgid "show context between diff hunks up to the specified number of lines"
msgstr "显示指定行数的差异块间的上下文"
-#: diff.c:5375 diff.c:5380 diff.c:5385
+#: diff.c:5378 diff.c:5383 diff.c:5388
msgid "<char>"
msgstr "<字符>"
-#: diff.c:5376
+#: diff.c:5379
msgid "specify the character to indicate a new line instead of '+'"
msgstr "指定一个字符取代 '+' 来表示新的一行"
-#: diff.c:5381
+#: diff.c:5384
msgid "specify the character to indicate an old line instead of '-'"
msgstr "指定一个字符取代 '-' 来表示旧的一行"
-#: diff.c:5386
+#: diff.c:5389
msgid "specify the character to indicate a context instead of ' '"
msgstr "指定一个字符取代 ' ' 来表示一行上下文"
-#: diff.c:5389
+#: diff.c:5392
msgid "Diff rename options"
msgstr "差异重命名选项"
-#: diff.c:5390
+#: diff.c:5393
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5391
+#: diff.c:5394
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "将完全重写的变更打破为成对的删除和创建"
-#: diff.c:5395
+#: diff.c:5398
msgid "detect renames"
msgstr "检测重命名"
-#: diff.c:5399
+#: diff.c:5402
msgid "omit the preimage for deletes"
msgstr "省略删除操作的差异输出"
-#: diff.c:5402
+#: diff.c:5405
msgid "detect copies"
msgstr "检测拷贝"
-#: diff.c:5406
+#: diff.c:5409
msgid "use unmodified files as source to find copies"
msgstr "使用未修改的文件做为发现拷贝的源"
-#: diff.c:5408
+#: diff.c:5411
msgid "disable rename detection"
msgstr "禁用重命名探测"
-#: diff.c:5411
+#: diff.c:5414
msgid "use empty blobs as rename source"
msgstr "使用空的数据对象做为重命名的源"
-#: diff.c:5413
+#: diff.c:5416
msgid "continue listing the history of a file beyond renames"
msgstr "继续列出文件重命名以外的历史记录"
-#: diff.c:5416
+#: diff.c:5419
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
-#: diff.c:5418
+#: diff.c:5421
msgid "Diff algorithm options"
msgstr "差异算法选项"
-#: diff.c:5420
+#: diff.c:5423
msgid "produce the smallest possible diff"
msgstr "生成尽可能小的差异"
-#: diff.c:5423
+#: diff.c:5426
msgid "ignore whitespace when comparing lines"
msgstr "行比较时忽略空白字符"
-#: diff.c:5426
+#: diff.c:5429
msgid "ignore changes in amount of whitespace"
msgstr "忽略空白字符的变更"
-#: diff.c:5429
+#: diff.c:5432
msgid "ignore changes in whitespace at EOL"
msgstr "忽略行尾的空白字符变更"
-#: diff.c:5432
+#: diff.c:5435
msgid "ignore carrier-return at the end of line"
msgstr "忽略行尾的回车符（CR）"
-#: diff.c:5435
+#: diff.c:5438
msgid "ignore changes whose lines are all blank"
msgstr "忽略整行都是空白的变更"
-#: diff.c:5438
+#: diff.c:5441
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "启发式转换差异边界以便阅读"
-#: diff.c:5441
+#: diff.c:5444
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "使用 \"patience diff\" 算法生成差异"
-#: diff.c:5445
+#: diff.c:5448
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "使用 \"histogram diff\" 算法生成差异"
-#: diff.c:5447
+#: diff.c:5450
msgid "<algorithm>"
msgstr "<算法>"
-#: diff.c:5448
+#: diff.c:5451
msgid "choose a diff algorithm"
msgstr "选择一个差异算法"
-#: diff.c:5450
+#: diff.c:5453
msgid "<text>"
msgstr "<文本>"
-#: diff.c:5451
+#: diff.c:5454
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "使用 \"anchored diff\" 算法生成差异"
-#: diff.c:5453 diff.c:5462 diff.c:5465
+#: diff.c:5456 diff.c:5465 diff.c:5468
msgid "<mode>"
msgstr "<模式>"
-#: diff.c:5454
+#: diff.c:5457
msgid "show word diff, using <mode> to delimit changed words"
msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
-#: diff.c:5456 diff.c:5459 diff.c:5504
+#: diff.c:5459 diff.c:5462 diff.c:5507
msgid "<regex>"
msgstr "<正则>"
-#: diff.c:5457
+#: diff.c:5460
msgid "use <regex> to decide what a word is"
msgstr "使用 <正则表达式> 确定何为一个词"
-#: diff.c:5460
+#: diff.c:5463
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
-#: diff.c:5463
+#: diff.c:5466
msgid "moved lines of code are colored differently"
msgstr "移动的代码行用不同方式着色"
-#: diff.c:5466
+#: diff.c:5469
msgid "how white spaces are ignored in --color-moved"
msgstr "在 --color-moved 下如何忽略空白字符"
-#: diff.c:5469
+#: diff.c:5472
msgid "Other diff options"
msgstr "其它差异选项"
-#: diff.c:5471
+#: diff.c:5474
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
-#: diff.c:5475
+#: diff.c:5478
msgid "treat all files as text"
msgstr "把所有文件当做文本处理"
-#: diff.c:5477
+#: diff.c:5480
msgid "swap two inputs, reverse the diff"
msgstr "交换两个输入，反转差异"
-#: diff.c:5479
+#: diff.c:5482
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "有差异时退出码为 1，否则为 0"
-#: diff.c:5481
+#: diff.c:5484
msgid "disable all output of the program"
msgstr "禁用本程序的所有输出"
-#: diff.c:5483
+#: diff.c:5486
msgid "allow an external diff helper to be executed"
msgstr "允许执行一个外置的差异助手"
-#: diff.c:5485
+#: diff.c:5488
msgid "run external text conversion filters when comparing binary files"
msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
-#: diff.c:5487
+#: diff.c:5490
msgid "<when>"
msgstr "<何时>"
-#: diff.c:5488
+#: diff.c:5491
msgid "ignore changes to submodules in the diff generation"
msgstr "在生成差异时，忽略子模组的更改"
-#: diff.c:5491
+#: diff.c:5494
msgid "<format>"
msgstr "<格式>"
-#: diff.c:5492
+#: diff.c:5495
msgid "specify how differences in submodules are shown"
msgstr "指定子模组的差异如何显示"
-#: diff.c:5496
+#: diff.c:5499
msgid "hide 'git add -N' entries from the index"
msgstr "隐藏索引中 'git add -N' 条目"
-#: diff.c:5499
+#: diff.c:5502
msgid "treat 'git add -N' entries as real in the index"
msgstr "将索引中 'git add -N' 条目当做真实的"
-#: diff.c:5501
+#: diff.c:5504
msgid "<string>"
msgstr "<字符串>"
-#: diff.c:5502
+#: diff.c:5505
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "查找改变了指定字符串出现次数的差异"
-#: diff.c:5505
+#: diff.c:5508
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "查找改变指定正则匹配出现次数的差异"
-#: diff.c:5508
+#: diff.c:5511
msgid "show all changes in the changeset with -S or -G"
msgstr "显示使用 -S 或 -G 的变更集的所有变更"
-#: diff.c:5511
+#: diff.c:5514
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
-#: diff.c:5514
+#: diff.c:5517
msgid "control the order in which files appear in the output"
msgstr "控制输出中的文件显示顺序"
-#: diff.c:5515
+#: diff.c:5518
msgid "<object-id>"
msgstr "<对象 ID>"
-#: diff.c:5516
+#: diff.c:5519
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "查找改变指定对象出现次数的差异"
-#: diff.c:5518
+#: diff.c:5521
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5519
+#: diff.c:5522
msgid "select files by diff type"
msgstr "通过差异类型选择文件"
-#: diff.c:5521
+#: diff.c:5524
msgid "<file>"
msgstr "<文件>"
-#: diff.c:5522
+#: diff.c:5525
msgid "Output to a specific file"
msgstr "输出到一个指定的文件"
-#: diff.c:6177
+#: diff.c:6180
msgid "inexact rename detection was skipped due to too many files."
msgstr "因为文件太多，略过不严格的重命名检查。"
-#: diff.c:6180
+#: diff.c:6183
msgid "only found copies from modified paths due to too many files."
msgstr "因为文件太多，只在修改的路径中查找拷贝。"
-#: diff.c:6183
+#: diff.c:6186
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
-#: dir.c:537
+#: dir.c:549
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
-#: dir.c:926
+#: dir.c:938
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "不能将 %s 用作排除文件"
-#: dir.c:1843
+#: dir.c:1877
#, c-format
msgid "could not open directory '%s'"
msgstr "不能打开目录 '%s'"
-#: dir.c:2085
+#: dir.c:2128
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"
-#: dir.c:2209
+#: dir.c:2252
msgid "untracked cache is disabled on this system or location"
msgstr "缓存未跟踪文件在本系统或位置中被禁用"
-#: dir.c:3013
+#: dir.c:3056
#, c-format
msgid "index file corrupt in repo %s"
msgstr "仓库 %s 中的索引文件损坏"
-#: dir.c:3058 dir.c:3063
+#: dir.c:3101 dir.c:3106
#, c-format
msgid "could not create directories for %s"
msgstr "不能为 %s 创建目录"
-#: dir.c:3092
+#: dir.c:3135
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
msgid "could not stat file '%s'"
msgstr "不能对文件 '%s' 调用 stat"
-#: environment.c:150
+#: environment.c:148
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "错误的 git 名字空间路径 \"%s\""
-#: environment.c:332
+#: environment.c:330
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "不能设置 GIT_DIR 为 '%s'"
msgid "too many args to run %s"
msgstr "执行 %s 的参数太多"
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "远程未设置 URL"
-
-#: fetch-pack.c:151
+#: fetch-pack.c:150
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack：应为 shallow 列表"
-#: fetch-pack.c:154
+#: fetch-pack.c:153
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"
-#: fetch-pack.c:165
+#: fetch-pack.c:164
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"
-#: fetch-pack.c:185
+#: fetch-pack.c:184
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-#: fetch-pack.c:196
+#: fetch-pack.c:195
msgid "unable to write to remote"
msgstr "无法写到远程"
-#: fetch-pack.c:258
+#: fetch-pack.c:257
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: fetch-pack.c:360 fetch-pack.c:1284
+#: fetch-pack.c:356 fetch-pack.c:1280
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息：%s"
-#: fetch-pack.c:366 fetch-pack.c:1290
+#: fetch-pack.c:362 fetch-pack.c:1286
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息：%s"
-#: fetch-pack.c:368 fetch-pack.c:1292
+#: fetch-pack.c:364 fetch-pack.c:1288
#, c-format
msgid "object not found: %s"
msgstr "对象未找到：%s"
-#: fetch-pack.c:371 fetch-pack.c:1295
+#: fetch-pack.c:367 fetch-pack.c:1291
#, c-format
msgid "error in object: %s"
msgstr "对象中出错：%s"
-#: fetch-pack.c:373 fetch-pack.c:1297
+#: fetch-pack.c:369 fetch-pack.c:1293
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow：%s"
-#: fetch-pack.c:376 fetch-pack.c:1301
+#: fetch-pack.c:372 fetch-pack.c:1297
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow，却得到 %s"
-#: fetch-pack.c:417
+#: fetch-pack.c:414
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:431
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
-#: fetch-pack.c:465
+#: fetch-pack.c:462
msgid "giving up"
msgstr "放弃"
-#: fetch-pack.c:477 progress.c:277
+#: fetch-pack.c:475 progress.c:312
msgid "done"
msgstr "完成"
-#: fetch-pack.c:489
+#: fetch-pack.c:487
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:535
+#: fetch-pack.c:533
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
-#: fetch-pack.c:744
+#: fetch-pack.c:742
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s（%s）"
-#: fetch-pack.c:783
+#: fetch-pack.c:781
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：无法派生 sideband 多路输出"
-#: fetch-pack.c:791
+#: fetch-pack.c:789
msgid "protocol error: bad pack header"
msgstr "协议错误：坏的包头"
-#: fetch-pack.c:859
+#: fetch-pack.c:857
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：无法派生进程 %s"
-#: fetch-pack.c:875
+#: fetch-pack.c:873
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: fetch-pack.c:877
+#: fetch-pack.c:875
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
-#: fetch-pack.c:908
+#: fetch-pack.c:907
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
-#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
-#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
-#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
-#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927
+#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943
+#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959
+#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981
#, c-format
msgid "Server supports %s"
msgstr "服务器支持 %s"
-#: fetch-pack.c:915
+#: fetch-pack.c:914
msgid "Server does not support shallow clients"
msgstr "服务器不支持 shalllow 客户端"
-#: fetch-pack.c:975
+#: fetch-pack.c:974
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
-#: fetch-pack.c:980
+#: fetch-pack.c:979
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
-#: fetch-pack.c:984
+#: fetch-pack.c:983
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
-#: fetch-pack.c:1001
+#: fetch-pack.c:1000
msgid "no common commits"
msgstr "没有共同的提交"
-#: fetch-pack.c:1013 fetch-pack.c:1462
+#: fetch-pack.c:1012 fetch-pack.c:1468
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：获取失败。"
-#: fetch-pack.c:1151
+#: fetch-pack.c:1150
msgid "Server does not support shallow requests"
msgstr "服务器不支持 shalllow 请求"
msgid "Server supports filter"
msgstr "服务器支持 filter"
-#: fetch-pack.c:1184
+#: fetch-pack.c:1180
msgid "unable to write request to remote"
msgstr "无法将请求写到远程"
-#: fetch-pack.c:1202
+#: fetch-pack.c:1198
#, c-format
msgid "error reading section header '%s'"
msgstr "读取节标题 '%s' 出错"
-#: fetch-pack.c:1208
+#: fetch-pack.c:1204
#, c-format
msgid "expected '%s', received '%s'"
msgstr "预期 '%s'，得到 '%s'"
-#: fetch-pack.c:1247
+#: fetch-pack.c:1243
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "意外的确认行：'%s'"
-#: fetch-pack.c:1252
+#: fetch-pack.c:1248
#, c-format
msgid "error processing acks: %d"
msgstr "处理 ack 出错：%d"
-#: fetch-pack.c:1262
+#: fetch-pack.c:1258
msgid "expected packfile to be sent after 'ready'"
msgstr "预期在 'ready' 之后发送 packfile"
-#: fetch-pack.c:1264
+#: fetch-pack.c:1260
msgid "expected no other sections to be sent after no 'ready'"
msgstr "在没有 'ready' 不应该发送其它小节"
-#: fetch-pack.c:1306
+#: fetch-pack.c:1302
#, c-format
msgid "error processing shallow info: %d"
msgstr "处理浅克隆信息出错：%d"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1349
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "预期 wanted-ref，得到 '%s'"
-#: fetch-pack.c:1358
+#: fetch-pack.c:1354
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "意外的 wanted-ref：'%s'"
-#: fetch-pack.c:1363
+#: fetch-pack.c:1359
#, c-format
msgid "error processing wanted refs: %d"
msgstr "处理要获取的引用出错：%d"
-#: fetch-pack.c:1689
+#: fetch-pack.c:1693
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
-#: fetch-pack.c:1712 builtin/clone.c:686
+#: fetch-pack.c:1716 builtin/clone.c:685
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必需的对象"
-#: fetch-pack.c:1739
+#: fetch-pack.c:1743
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"
-#: fetch-pack.c:1742
+#: fetch-pack.c:1746
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
-#: grep.c:2117
+#: grep.c:668
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此功能"
+
+#: grep.c:2124
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：无法读取 %s"
-#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "对 '%s' 调用 stat 失败"
-#: grep.c:2145
+#: grep.c:2152
#, c-format
msgid "'%s': short read"
msgstr "'%s'：读取不完整"
msgid "git version [<options>]"
msgstr "git version [<选项>]"
-#: help.c:782
+#: help.c:783
#, c-format
msgid "%s: %s - %s"
msgstr "%s：%s - %s"
-#: help.c:786
+#: help.c:787
msgid ""
"\n"
"Did you mean this?"
msgid "invalid date format: %s"
msgstr "无效的日期格式：%s"
-#: list-objects.c:129
+#: list-objects.c:127
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性，但不是一个树对象"
-#: list-objects.c:142
+#: list-objects.c:140
#, c-format
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性，但不是一个数据对象"
-#: list-objects.c:378
+#: list-objects.c:375
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "无法为提交 %s 加载根树"
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
-msgstr "不能混用多种过滤规格"
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "不能访问 '%s' 中的稀疏数据对象"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "无法解析 %s 中的稀疏过滤器数据"
#: list-objects-filter-options.c:58
msgid "expected 'tree:<depth>'"
msgstr "期望 'tree:<深度>'"
-#: list-objects-filter-options.c:84
+#: list-objects-filter-options.c:73
msgid "sparse:path filters support has been dropped"
msgstr "sparse:path 过滤器支持已被删除"
-#: list-objects-filter-options.c:94
+#: list-objects-filter-options.c:86
#, c-format
msgid "invalid filter-spec '%s'"
msgstr "无效的过滤器表达式 '%s'"
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
-msgstr "无法修改部分克隆的 promisor 远程仓库"
+#: list-objects-filter-options.c:102
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'"
+
+#: list-objects-filter-options.c:144
+msgid "expected something after combine:"
+msgstr "期望在组合后有一些东西："
+
+#: list-objects-filter-options.c:226
+msgid "multiple filter-specs cannot be combined"
+msgstr "不能混用多种过滤规格"
#: lockfile.c:151
#, c-format
msgid "failed to read the cache"
msgstr "读取缓存失败"
-#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
-#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
+#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
-#: merge-recursive.c:322
+#: merge-recursive.c:367
msgid "(bad commit)\n"
msgstr "（坏提交）\n"
-#: merge-recursive.c:345
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"
-#: merge-recursive.c:354
+#: merge-recursive.c:399
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"
-#: merge-recursive.c:437
-msgid "error building trees"
-msgstr "创建树出错"
-
-#: merge-recursive.c:863
+#: merge-recursive.c:885
#, c-format
msgid "failed to create path '%s'%s"
msgstr "创建路径 '%s'%s 失败"
-#: merge-recursive.c:874
+#: merge-recursive.c:896
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"
-#: merge-recursive.c:888 merge-recursive.c:907
+#: merge-recursive.c:910 merge-recursive.c:929
msgid ": perhaps a D/F conflict?"
msgstr "：可能是一个目录/文件冲突？"
-#: merge-recursive.c:897
+#: merge-recursive.c:919
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
-#: merge-recursive.c:938 builtin/cat-file.c:40
+#: merge-recursive.c:960 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"
-#: merge-recursive.c:941
+#: merge-recursive.c:965
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据对象"
-#: merge-recursive.c:965
+#: merge-recursive.c:990
#, c-format
msgid "failed to open '%s': %s"
msgstr "打开 '%s' 失败：%s"
-#: merge-recursive.c:976
+#: merge-recursive.c:1001
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "创建符号链接 '%s' 失败：%s"
-#: merge-recursive.c:981
+#: merge-recursive.c:1006
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
-#: merge-recursive.c:1177
+#: merge-recursive.c:1199
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "无法合并子模组 %s （没有检出）"
-#: merge-recursive.c:1184
+#: merge-recursive.c:1206
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "无法合并子模组 %s（提交不存在）"
-#: merge-recursive.c:1191
+#: merge-recursive.c:1213
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "无法合并子模组 %s （提交未跟随合并基线）"
-#: merge-recursive.c:1199 merge-recursive.c:1211
+#: merge-recursive.c:1221 merge-recursive.c:1233
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "子模组 %s 快进到如下提交："
-#: merge-recursive.c:1202 merge-recursive.c:1214
+#: merge-recursive.c:1224 merge-recursive.c:1236
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "快进子模组 %s"
-#: merge-recursive.c:1237
+#: merge-recursive.c:1259
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr "无法合并子模组 %s （没发现合并跟随的提交）"
-#: merge-recursive.c:1241
+#: merge-recursive.c:1263
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "无法合并子模组 %s（非快进）"
-#: merge-recursive.c:1242
+#: merge-recursive.c:1264
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "找到子模组的一个可能的合并方案：\n"
-#: merge-recursive.c:1245
+#: merge-recursive.c:1267
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"\n"
"以接受此建议。\n"
-#: merge-recursive.c:1254
+#: merge-recursive.c:1276
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "无法合并子模组 %s （发现多个合并）"
-#: merge-recursive.c:1327
+#: merge-recursive.c:1349
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
-#: merge-recursive.c:1332
+#: merge-recursive.c:1354
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
-#: merge-recursive.c:1364
+#: merge-recursive.c:1386
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
-#: merge-recursive.c:1387
+#: merge-recursive.c:1410
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"
-#: merge-recursive.c:1459
+#: merge-recursive.c:1482
#, 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:1464
+#: merge-recursive.c:1487
#, 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:1471
+#: merge-recursive.c:1494
#, 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:1476
+#: merge-recursive.c:1499
#, 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:1511
+#: merge-recursive.c:1534
msgid "rename"
msgstr "重命名"
-#: merge-recursive.c:1511
+#: merge-recursive.c:1534
msgid "renamed"
msgstr "重命名"
-#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
+#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "拒绝丢失脏文件 '%s'"
-#: merge-recursive.c:1601
+#: merge-recursive.c:1624
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
-#: merge-recursive.c:1659
+#: merge-recursive.c:1682
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1713
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: merge-recursive.c:1695
+#: merge-recursive.c:1718
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"
-#: merge-recursive.c:1714
+#: merge-recursive.c:1737
#, 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:1719
+#: merge-recursive.c:1742
msgid " (left unresolved)"
msgstr "（留下未解决）"
-#: merge-recursive.c:1828
+#: merge-recursive.c:1851
#, 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:2035
+#: merge-recursive.c:2056
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
"其它目录，没有目录包含大部分文件。"
-#: merge-recursive.c:2067
+#: merge-recursive.c:2088
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
"在：%s。"
-#: merge-recursive.c:2077
+#: merge-recursive.c:2098
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"
"径放置于此：%s"
-#: merge-recursive.c:2169
+#: merge-recursive.c:2190
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
"冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
"%4$s->%5$s"
-#: merge-recursive.c:2413
+#: merge-recursive.c:2435
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
-#: merge-recursive.c:2938
+#: merge-recursive.c:2961
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
-#: merge-recursive.c:2941
+#: merge-recursive.c:2964
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:3017
+#: merge-recursive.c:3040
msgid "content"
msgstr "内容"
-#: merge-recursive.c:3021
+#: merge-recursive.c:3044
msgid "add/add"
msgstr "添加/添加"
-#: merge-recursive.c:3044
+#: merge-recursive.c:3067
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s（已经做过相同合并）"
-#: merge-recursive.c:3066 git-submodule.sh:937
+#: merge-recursive.c:3089 git-submodule.sh:937
msgid "submodule"
msgstr "子模组"
-#: merge-recursive.c:3067
+#: merge-recursive.c:3090
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突（%s）：合并冲突于 %s"
-#: merge-recursive.c:3097
+#: merge-recursive.c:3120
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
-#: merge-recursive.c:3179
+#: merge-recursive.c:3203
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
msgstr ""
"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
-#: merge-recursive.c:3182
+#: merge-recursive.c:3206
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
"到 %s。"
-#: merge-recursive.c:3186
+#: merge-recursive.c:3210
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
"动到 %5$s。"
-#: merge-recursive.c:3189
+#: merge-recursive.c:3213
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"
"建议将其移动到 %5$s。"
-#: merge-recursive.c:3303
+#: merge-recursive.c:3327
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:3326
+#: merge-recursive.c:3350
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:3331
+#: merge-recursive.c:3355
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:3338
+#: merge-recursive.c:3362
#, 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:3347
+#: merge-recursive.c:3371
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:3356
+#: merge-recursive.c:3380
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "冲突（add/add）：合并冲突于 %s"
-#: merge-recursive.c:3394
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-"您对下列文件的本地修改将被合并操作覆盖：\n"
-" %s"
-
-#: merge-recursive.c:3405
+#: merge-recursive.c:3424
msgid "Already up to date!"
msgstr "已经是最新的！"
-#: merge-recursive.c:3414
+#: merge-recursive.c:3433
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
-#: merge-recursive.c:3513
+#: merge-recursive.c:3537
msgid "Merging:"
msgstr "合并："
-#: merge-recursive.c:3526
+#: merge-recursive.c:3550
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先："
msgstr[1] "发现 %u 个共同祖先："
-#: merge-recursive.c:3565
+#: merge-recursive.c:3600
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:3631
+#: merge-recursive.c:3659
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+"您对下列文件的本地修改将被合并操作覆盖：\n"
+" %s"
+
+#: merge-recursive.c:3756
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
+#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874
msgid "Unable to write index."
msgstr "不能写入索引。"
-#: midx.c:69
+#: midx.c:68
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "多包索引文件 %s 太小"
-#: midx.c:85
+#: midx.c:84
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
-#: midx.c:90
+#: midx.c:89
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index 版本 %d 不能被识别"
-#: midx.c:95
+#: midx.c:94
#, c-format
msgid "hash version %u does not match"
msgstr "散列版本 %u 不匹配"
-#: midx.c:109
+#: midx.c:108
msgid "invalid chunk offset (too large)"
msgstr "无效的块偏移（太大）"
-#: midx.c:133
+#: midx.c:132
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr "终止多包索引块 id 出现时间早于预期"
-#: midx.c:146
+#: midx.c:145
msgid "multi-pack-index missing required pack-name chunk"
msgstr "多包索引缺少必需的包名块"
-#: midx.c:148
+#: midx.c:147
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "多包索引缺少必需的对象 ID 扇出块"
-#: midx.c:150
+#: midx.c:149
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "多包索引缺少必需的对象 ID 查询块"
-#: midx.c:152
+#: midx.c:151
msgid "multi-pack-index missing required object offsets chunk"
msgstr "多包索引缺少必需的对象偏移块"
-#: midx.c:166
+#: midx.c:165
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
-#: midx.c:211
+#: midx.c:210
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "错的 pack-int-id：%u（共有 %u 个包）"
-#: midx.c:261
+#: midx.c:260
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
-#: midx.c:289
+#: midx.c:288
msgid "error preparing packfile from multi-pack-index"
msgstr "从多包索引准备 packfile 出错"
-#: midx.c:470
+#: midx.c:469
#, c-format
msgid "failed to add packfile '%s'"
msgstr "添加包文件 '%s' 失败"
-#: midx.c:476
+#: midx.c:475
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "打开包索引 '%s' 失败"
-#: midx.c:536
+#: midx.c:535
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "在包文件中定位对象 %d 失败"
-#: midx.c:865
+#: midx.c:864
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "没有看到要丢弃的包文件 %s"
-#: midx.c:1036
+#: midx.c:1035
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "清理位于 %s 的多包索引失败"
-#: midx.c:1091
+#: midx.c:1090
msgid "Looking for referenced packfiles"
msgstr "正在查找引用的包文件"
-#: midx.c:1106
+#: midx.c:1105
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1110
+#: midx.c:1109
msgid "Verifying OID order in MIDX"
msgstr "正在校验 MIDX 中的对象 ID 顺序"
-#: midx.c:1119
+#: midx.c:1118
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1138
+#: midx.c:1137
msgid "Sorting objects by packfile"
msgstr "通过包文件为对象排序"
-#: midx.c:1144
+#: midx.c:1143
msgid "Verifying object offsets"
msgstr "校验对象偏移"
-#: midx.c:1160
+#: midx.c:1159
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "为 oid[%d] = %s 加载包条目失败"
-#: midx.c:1166
+#: midx.c:1165
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "为包文件 %s 加载包索引失败"
-#: midx.c:1175
+#: midx.c:1174
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
-#: midx.c:1350
+#: midx.c:1349
msgid "could not start pack-objects"
msgstr "不能开始 pack-objects"
-#: midx.c:1369
+#: midx.c:1368
msgid "could not finish pack-objects"
msgstr "不能结束 pack-objects"
-#: name-hash.c:532
+#: name-hash.c:537
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "不能创建 lazy_dir 线程：%s"
-#: name-hash.c:554
+#: name-hash.c:559
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "不能创建 lazy_name 线程：%s"
-#: name-hash.c:560
+#: name-hash.c:565
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "不能加入 lasy_name 线程：%s"
msgid "Bad %s value: '%s'"
msgstr "坏的 %s 值：'%s'"
-#: object.c:54
+#: object.c:53
#, c-format
msgid "invalid object type \"%s\""
msgstr "无效的对象类型 \"%s\""
-#: object.c:174
+#: object.c:173
#, c-format
msgid "object %s is a %s, not a %s"
msgstr "对象 %s 是一个 %s，不是一个 %s"
-#: object.c:234
+#: object.c:233
#, c-format
msgid "object %s has unknown type id %d"
msgstr "对象 %s 有未知的类型 id %d"
-#: object.c:247
+#: object.c:246
#, c-format
msgid "unable to parse object: %s"
msgstr "不能解析对象：%s"
-#: object.c:267 object.c:278
+#: object.c:266 object.c:277
#, c-format
msgid "hash mismatch %s"
msgstr "哈希值与 %s 不匹配"
-#: packfile.c:648
+#: packfile.c:641
msgid "offset before end of packfile (broken .idx?)"
msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
-#: packfile.c:1899
+#: packfile.c:1887
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
-#: packfile.c:1903
+#: packfile.c:1891
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
msgid "did you mean `--%s` (with two dashes ?)"
msgstr "你的意思是 `--%s`（有两个短线？）"
-#: parse-options.c:859
+#: parse-options.c:860
#, c-format
msgid "unknown option `%s'"
msgstr "未知选项 `%s'"
-#: parse-options.c:861
+#: parse-options.c:862
#, c-format
msgid "unknown switch `%c'"
msgstr "未知开关 `%c'"
-#: parse-options.c:863
+#: parse-options.c:864
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "字符串中未知的非 ascii 字符选项：`%s'"
-#: parse-options.c:887
+#: parse-options.c:888
msgid "..."
msgstr "..."
-#: parse-options.c:906
+#: parse-options.c:907
#, c-format
msgid "usage: %s"
msgstr "用法：%s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:912
+#: parse-options.c:913
#, c-format
msgid " or: %s"
msgstr " 或：%s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:915
+#: parse-options.c:916
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:954
+#: parse-options.c:955
msgid "-NUM"
msgstr "-数字"
-#: parse-options.c:968
+#: parse-options.c:969
#, c-format
msgid "alias of --%s"
msgstr "--%s 的别名"
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
-#: range-diff.c:70
+#: promisor-remote.c:25
+msgid "Remote with no URL"
+msgstr "远程未设置 URL"
+
+#: promisor-remote.c:61
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "promisor 远程名称不能以 '/' 开始：%s"
+
+#: range-diff.c:71
msgid "could not start `log`"
msgstr "不能启动 `log`"
-#: range-diff.c:72
+#: range-diff.c:73
msgid "could not read `log` output"
msgstr "不能读取 `log` 的输出"
-#: range-diff.c:91 sequencer.c:5021
+#: range-diff.c:92 sequencer.c:4985
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
-#: range-diff.c:117
+#: range-diff.c:118
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "无法解析 git 头 '%.*s'"
-#: range-diff.c:274
+#: range-diff.c:275
msgid "failed to generate diff"
msgstr "生成 diff 失败"
-#: range-diff.c:506 range-diff.c:508
+#: range-diff.c:507 range-diff.c:509
#, c-format
msgid "could not parse log for '%s'"
msgstr "不能解析 '%s' 的日志"
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' 看起来既是文件又是目录"
-#: read-cache.c:1499
+#: read-cache.c:1520
msgid "Refresh index"
msgstr "刷新索引"
-#: read-cache.c:1613
+#: read-cache.c:1635
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"设置了 index.version，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1623
+#: read-cache.c:1645
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1679
+#: read-cache.c:1701
#, c-format
msgid "bad signature 0x%08x"
msgstr "坏的签名 0x%08x"
-#: read-cache.c:1682
+#: read-cache.c:1704
#, c-format
msgid "bad index version %d"
msgstr "坏的索引版本 %d"
-#: read-cache.c:1691
+#: read-cache.c:1713
msgid "bad index file sha1 signature"
msgstr "坏的索引文件 sha1 签名"
-#: read-cache.c:1721
+#: read-cache.c:1743
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "索引使用不被支持的 %.4s 扩展"
#
-#: read-cache.c:1723
+#: read-cache.c:1745
#, c-format
msgid "ignoring %.4s extension"
msgstr "忽略 %.4s 扩展"
-#: read-cache.c:1760
+#: read-cache.c:1782
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "未知的索引条目格式 0x%08x"
-#: read-cache.c:1776
+#: read-cache.c:1798
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "索引中靠近路径 '%s' 有错误的名称字段"
-#: read-cache.c:1833
+#: read-cache.c:1855
msgid "unordered stage entries in index"
msgstr "索引中有未排序的暂存条目"
-#: read-cache.c:1836
+#: read-cache.c:1858
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "合并文件 '%s' 有多个暂存条目"
-#: read-cache.c:1839
+#: read-cache.c:1861
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' 的未排序暂存条目"
-#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
-#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468
+#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347
#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: read-cache.c:2087
+#: read-cache.c:2108
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "无法创建 load_cache_entries 线程：%s"
-#: read-cache.c:2100
+#: read-cache.c:2121
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "无法加入 load_cache_entries 线程：%s"
-#: read-cache.c:2133
+#: read-cache.c:2154
#, c-format
msgid "%s: index file open failed"
msgstr "%s：打开索引文件失败"
-#: read-cache.c:2137
+#: read-cache.c:2158
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s：不能对打开的索引执行 stat 操作"
-#: read-cache.c:2141
+#: read-cache.c:2162
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s：索引文件比预期的小"
-#: read-cache.c:2145
+#: read-cache.c:2166
#, c-format
msgid "%s: unable to map index file"
msgstr "%s：无法对索引文件执行 map 操作"
-#: read-cache.c:2187
+#: read-cache.c:2208
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "无法创建 load_index_extensions 线程：%s"
-#: read-cache.c:2214
+#: read-cache.c:2235
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "无法加入 load_index_extensions 线程：%s"
-#: read-cache.c:2246
+#: read-cache.c:2267
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "无法刷新共享索引 '%s'"
-#: read-cache.c:2293
+#: read-cache.c:2314
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
+#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
-#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
+#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917
#, c-format
msgid "could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: read-cache.c:3105
+#: read-cache.c:3126
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能打开 git 目录：%s"
-#: read-cache.c:3117
+#: read-cache.c:3138
#, c-format
msgid "unable to unlink: %s"
msgstr "无法删除：%s"
-#: read-cache.c:3142
+#: read-cache.c:3163
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "不能修复 '%s' 的权限位"
-#: read-cache.c:3291
+#: read-cache.c:3312
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s：不能落到暂存区 #0"
msgid "Note that empty commits are commented out"
msgstr "注意空提交已被注释掉"
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
-#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388
+#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
msgid "could not write '%s'"
msgstr "不能写入 '%s'"
msgid "ignoring dangling symref %s"
msgstr "忽略悬空符号引用 %s"
-#: refs.c:669 ref-filter.c:2092
+#: refs.c:669 ref-filter.c:2098
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略损坏的引用 %s"
msgid "unexpected object ID when writing '%s'"
msgstr "写入 '%s' 时意外的对象 ID"
-#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
-#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851
+#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
-#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:1003
+#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714
+#: builtin/rebase.c:1004
#, c-format
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
msgid "update_ref failed for ref '%s': %s"
msgstr "对引用 '%s' 执行 update_ref 失败：%s"
-#: refs.c:2012
+#: refs.c:2023
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "不允许对引用 '%s' 多次更新"
-#: refs.c:2044
+#: refs.c:2055
msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔离环境中禁止更新引用"
-#: refs.c:2140 refs.c:2170
+#: refs.c:2151 refs.c:2181
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' 已存在，无法创建 '%s'"
-#: refs.c:2146 refs.c:2181
+#: refs.c:2157 refs.c:2192
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "无法同时处理 '%s' 和 '%s'"
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
-#: refs/files-backend.c:1248 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
+#: refs/files-backend.c:1248 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s：%s"
-#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#: refs/files-backend.c:1251 refs/packed-backend.c:1554
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用：%s"
msgid "invalid refspec '%s'"
msgstr "无效的引用表达式：'%s'"
-#: ref-filter.c:42 wt-status.c:1934
+#: ref-filter.c:42 wt-status.c:1938
msgid "gone"
msgstr "丢失"
msgid "ahead %d, behind %d"
msgstr "领先 %d，落后 %d"
-#: ref-filter.c:162
+#: ref-filter.c:165
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "期望的格式：%%(color:<颜色>)"
-#: ref-filter.c:164
+#: ref-filter.c:167
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "未能识别的颜色：%%(color:%s)"
-#: ref-filter.c:186
+#: ref-filter.c:189
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "期望整数值 refname:lstrip=%s"
-#: ref-filter.c:190
+#: ref-filter.c:193
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "期望整数值 refname:rstrip=%s"
-#: ref-filter.c:192
+#: ref-filter.c:195
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "未能识别的 %%(%s) 参数：%s"
-#: ref-filter.c:247
+#: ref-filter.c:250
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) 不带参数"
-#: ref-filter.c:269
+#: ref-filter.c:272
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "未能识别的 %%(objectsize) 参数：%s"
-#: ref-filter.c:277
+#: ref-filter.c:280
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) 不带参数"
-#: ref-filter.c:289
+#: ref-filter.c:292
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不带参数"
-#: ref-filter.c:298
+#: ref-filter.c:301
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) 不带参数"
-#: ref-filter.c:320
+#: ref-filter.c:323
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "未知的 %%(trailers) 参数：%s"
-#: ref-filter.c:349
+#: ref-filter.c:352
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "期望一个正数 contents:lines=%s"
-#: ref-filter.c:351
+#: ref-filter.c:354
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "未能识别的 %%(contents) 参数：%s"
-#: ref-filter.c:366
+#: ref-filter.c:369
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "期望一个正数 objectname:short=%s"
-#: ref-filter.c:370
+#: ref-filter.c:373
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "未能识别的 %%(objectname) 参数：%s"
-#: ref-filter.c:400
+#: ref-filter.c:403
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "期望的格式：%%(align:<宽度>,<位置>)"
-#: ref-filter.c:412
+#: ref-filter.c:415
#, c-format
msgid "unrecognized position:%s"
msgstr "未能识别的位置：%s"
-#: ref-filter.c:419
+#: ref-filter.c:422
#, c-format
msgid "unrecognized width:%s"
msgstr "未能识别的宽度：%s"
-#: ref-filter.c:428
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "未能识别的 %%(align) 参数：%s"
-#: ref-filter.c:436
+#: ref-filter.c:439
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一个正数的宽度"
-#: ref-filter.c:454
+#: ref-filter.c:457
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "未能识别的 %%(if) 参数：%s"
-#: ref-filter.c:556
+#: ref-filter.c:559
#, c-format
msgid "malformed field name: %.*s"
msgstr "格式错误的字段名：%.*s"
-#: ref-filter.c:583
+#: ref-filter.c:586
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的字段名：%.*s"
-#: ref-filter.c:587
+#: ref-filter.c:590
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "不是一个 git 仓库，但是字段 '%.*s' 需要访问对象数据"
-#: ref-filter.c:711
+#: ref-filter.c:714
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"
-#: ref-filter.c:774
+#: ref-filter.c:777
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
-#: ref-filter.c:776
+#: ref-filter.c:779
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "格式：%%(then) 元素用了多次"
-#: ref-filter.c:778
+#: ref-filter.c:781
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
-#: ref-filter.c:806
+#: ref-filter.c:809
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
-#: ref-filter.c:808
+#: ref-filter.c:811
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"
-#: ref-filter.c:810
+#: ref-filter.c:813
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "格式：%%(else) 元素用了多次"
-#: ref-filter.c:825
+#: ref-filter.c:828
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
-#: ref-filter.c:882
+#: ref-filter.c:885
#, c-format
msgid "malformed format string %s"
msgstr "错误的格式化字符串 %s"
-#: ref-filter.c:1485
+#: ref-filter.c:1488
#, c-format
msgid "no branch, rebasing %s"
msgstr "非分支，正变基 %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1491
#, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr "非分支，正变基分离头指针 %s"
-#: ref-filter.c:1491
+#: ref-filter.c:1494
#, c-format
msgid "no branch, bisect started on %s"
msgstr "非分支，二分查找开始于 %s"
-#: ref-filter.c:1501
+#: ref-filter.c:1504
msgid "no branch"
msgstr "非分支"
-#: ref-filter.c:1537 ref-filter.c:1743
+#: ref-filter.c:1540 ref-filter.c:1749
#, c-format
msgid "missing object %s for %s"
msgstr "缺失 %2$s 的对象 %1$s"
-#: ref-filter.c:1547
+#: ref-filter.c:1550
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-#: ref-filter.c:1998
+#: ref-filter.c:2004
#, c-format
msgid "malformed object at '%s'"
msgstr "格式错误的对象 '%s'"
-#: ref-filter.c:2087
+#: ref-filter.c:2093
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略带有错误名称 %s 的引用"
-#: ref-filter.c:2382
+#: ref-filter.c:2389
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式：缺少 %%(end) 元素"
-#: ref-filter.c:2482
+#: ref-filter.c:2489
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "选项 `%s' 和 --merged 不兼容"
-#: ref-filter.c:2485
+#: ref-filter.c:2492
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr "选项 `%s' 和 --no-merged 不兼容"
-#: ref-filter.c:2495
+#: ref-filter.c:2502
#, c-format
msgid "malformed object name %s"
msgstr "格式错误的对象名 %s"
-#: ref-filter.c:2500
+#: ref-filter.c:2507
#, c-format
msgid "option `%s' must point to a commit"
msgstr "选项 `%s' 必须指向一个提交"
-#: remote.c:363
+#: remote.c:366
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "配置的远程短名称不能以 '/' 开始：%s"
-#: remote.c:410
+#: remote.c:413
msgid "more than one receivepack given, using the first"
msgstr "提供了一个以上的 receivepack，使用第一个"
-#: remote.c:418
+#: remote.c:421
msgid "more than one uploadpack given, using the first"
msgstr "提供了一个以上的 uploadpack，使用第一个"
-#: remote.c:608
+#: remote.c:611
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同时获取 %s 和 %s 至 %s"
-#: remote.c:612
+#: remote.c:615
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常跟踪 %s，而非 %s"
-#: remote.c:616
+#: remote.c:619
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同时跟踪 %s 和 %s"
-#: remote.c:684
+#: remote.c:687
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "模式的键 '%s' 没有 '*'"
-#: remote.c:694
+#: remote.c:697
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "模式的值 '%s' 没有 '*'"
-#: remote.c:1000
+#: remote.c:1003
#, c-format
msgid "src refspec %s does not match any"
msgstr "源引用表达式 %s 没有匹配"
-#: remote.c:1005
+#: remote.c:1008
#, c-format
msgid "src refspec %s matches more than one"
msgstr "源引用表达式 %s 匹配超过一个"
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1020
+#: remote.c:1023
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"\n"
"都不行，所以我们已放弃。您必须给出完整的引用。"
-#: remote.c:1040
+#: remote.c:1043
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
"'%s:refs/heads/%s' 推送么？"
-#: remote.c:1045
+#: remote.c:1048
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
"'%s:refs/tags/%s' 推送么？"
-#: remote.c:1050
+#: remote.c:1053
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
"'%s:refs/tags/%s' 推送么？"
-#: remote.c:1055
+#: remote.c:1058
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
"'%s:refs/tags/%s' 推送么？"
-#: remote.c:1091
+#: remote.c:1094
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s 无法被解析为分支"
-#: remote.c:1102
+#: remote.c:1105
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "无法删除 '%s'：远程引用不存在"
-#: remote.c:1114
+#: remote.c:1117
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "目标引用表达式 %s 匹配超过一个"
-#: remote.c:1121
+#: remote.c:1124
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "目标引用 %s 接收超过一个源"
-#: remote.c:1624 remote.c:1725
+#: remote.c:1627 remote.c:1728
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
-#: remote.c:1633
+#: remote.c:1636
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支：'%s'"
-#: remote.c:1636
+#: remote.c:1639
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
-#: remote.c:1642
+#: remote.c:1645
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: remote.c:1657
+#: remote.c:1660
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
-#: remote.c:1669
+#: remote.c:1672
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置要推送的远程服务器"
-#: remote.c:1679
+#: remote.c:1682
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用规格未包含 '%s'"
-#: remote.c:1692
+#: remote.c:1695
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送无目标（push.default 是 'nothing'）"
-#: remote.c:1714
+#: remote.c:1717
msgid "cannot resolve 'simple' push to a single destination"
msgstr "无法解析 'simple' 推送至一个单独的目标"
-#: remote.c:1840
+#: remote.c:1843
#, c-format
msgid "couldn't find remote ref %s"
msgstr "无法找到远程引用 %s"
-#: remote.c:1853
+#: remote.c:1856
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* 在本地忽略可笑的引用 '%s'"
-#: remote.c:2016
+#: remote.c:2019
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
-#: remote.c:2020
+#: remote.c:2023
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
-#: remote.c:2023
+#: remote.c:2026
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: remote.c:2027
+#: remote.c:2030
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "您的分支和 '%s' 指向不同的提交。\n"
-#: remote.c:2030
+#: remote.c:2033
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " （使用 \"%s\" 查看详情）\n"
-#: remote.c:2034
+#: remote.c:2037
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
-#: remote.c:2040
+#: remote.c:2043
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
-#: remote.c:2043
+#: remote.c:2046
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
# 译者：注意保持前导空格
-#: remote.c:2051
+#: remote.c:2054
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
-#: remote.c:2054
+#: remote.c:2057
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"并且分别有 %d 和 %d 处不同的提交。\n"
# 译者：注意保持前导空格
-#: remote.c:2064
+#: remote.c:2067
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " （使用 \"git pull\" 来合并远程分支）\n"
-#: remote.c:2247
+#: remote.c:2250
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "无法解析期望的对象名 '%s'"
msgid "Recorded preimage for '%s'"
msgstr "为 '%s' 记录 preimage"
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgid "unable to open rr-cache directory"
msgstr "不能打开 rr-cache 目录"
-#: revision.c:2507
+#: revision.c:2509
msgid "your current branch appears to be broken"
msgstr "您的当前分支好像被损坏"
-#: revision.c:2510
+#: revision.c:2512
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当前分支 '%s' 尚无任何提交"
-#: revision.c:2710
+#: revision.c:2720
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent 与 --bisect 不兼容"
-#: revision.c:2714
+#: revision.c:2724
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
-#: send-pack.c:141
+#: send-pack.c:142
msgid "unexpected flush packet while reading remote unpack status"
msgstr "读取远程解包状态时收到意外的 flush 包"
-#: send-pack.c:143
+#: send-pack.c:144
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "不能解析远程解包状态：%s"
-#: send-pack.c:145
+#: send-pack.c:146
#, c-format
msgid "remote unpack failed: %s"
msgstr "远程解包失败：%s"
-#: send-pack.c:306
+#: send-pack.c:307
msgid "failed to sign the push certificate"
msgstr "为推送证书签名失败"
-#: send-pack.c:420
+#: send-pack.c:421
msgid "the receiving end does not support --signed push"
msgstr "接收端不支持签名推送"
-#: send-pack.c:422
+#: send-pack.c:423
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未发送推送证书，因为接收端不支持签名推送"
-#: send-pack.c:434
+#: send-pack.c:435
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支持原子推送"
-#: send-pack.c:439
+#: send-pack.c:440
msgid "the receiving end does not support push options"
msgstr "接收端不支持推送选项"
msgid "could not delete '%s'"
msgstr "无法删除 '%s'"
-#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "无法删除 '%s'"
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"对修正后的文件做标记，然后用 'git commit' 提交"
-#: sequencer.c:401 sequencer.c:2909
+#: sequencer.c:401 sequencer.c:2847
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
-#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
-#: sequencer.c:3192
+#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867
+#: sequencer.c:3130
#, c-format
msgid "failed to finalize '%s'"
msgstr "无法完成 '%s'"
-#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
-#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
-#: builtin/merge.c:1112 builtin/rebase.c:567
+#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112
+#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117
+#: builtin/rebase.c:568
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:632
+#: sequencer.c:631
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s：无法写入新索引文件"
-#: sequencer.c:649
+#: sequencer.c:648
msgid "unable to update cache tree"
msgstr "不能更新缓存树"
-#: sequencer.c:663
+#: sequencer.c:662
msgid "could not resolve HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:743
+#: sequencer.c:742
#, c-format
msgid "no key present in '%.*s'"
msgstr "在 '%.*s' 中没有 key"
-#: sequencer.c:754
+#: sequencer.c:753
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "无法为 '%s' 的值去引号"
-#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
+#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705
+#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
-#: sequencer.c:801
+#: sequencer.c:800
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "已经给出 'GIT_AUTHOR_NAME'"
-#: sequencer.c:806
+#: sequencer.c:805
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:811
+#: sequencer.c:810
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "已经给出 'GIT_AUTHOR_DATE'"
-#: sequencer.c:815
+#: sequencer.c:814
#, c-format
msgid "unknown variable '%s'"
msgstr "未知变量 '%s'"
-#: sequencer.c:820
+#: sequencer.c:819
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "缺少 'GIT_AUTHOR_NAME'"
-#: sequencer.c:822
+#: sequencer.c:821
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:824
+#: sequencer.c:823
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "缺少 'GIT_AUTHOR_DATE'"
-#: sequencer.c:884
-#, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr "'%2$s' 中无效的日期格式 '%1$s'"
-
-#: sequencer.c:901
+#: sequencer.c:872
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:995
-msgid "writing root commit"
-msgstr "写根提交"
-
-#: sequencer.c:1216
+#: sequencer.c:1146
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 钩子失败"
-#: sequencer.c:1223
+#: sequencer.c:1153
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1236
+#: sequencer.c:1166
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1278
+#: sequencer.c:1208
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
-#: sequencer.c:1280
+#: sequencer.c:1210
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
-#: sequencer.c:1326
+#: sequencer.c:1256
msgid "unable to resolve HEAD after creating commit"
msgstr "创建提交后，不能解析 HEAD"
-#: sequencer.c:1328
+#: sequencer.c:1258
msgid "detached HEAD"
msgstr "分离头指针"
# 译者：中文字符串拼接，可删除前导空格
-#: sequencer.c:1332
+#: sequencer.c:1262
msgid " (root-commit)"
msgstr "（根提交）"
-#: sequencer.c:1353
+#: sequencer.c:1283
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1355
+#: sequencer.c:1285
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一个提交！"
-#: sequencer.c:1359 builtin/commit.c:1571
+#: sequencer.c:1289 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:1411 sequencer.c:2004
+#: sequencer.c:1341 sequencer.c:1933
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
-#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入树对象"
-#: sequencer.c:1438 sequencer.c:1499
+#: sequencer.c:1369 sequencer.c:1429
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能从 '%s' 读取提交说明"
-#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
-#: builtin/merge.c:903
+#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883
+#: builtin/merge.c:908
msgid "failed to write commit object"
msgstr "写提交对象失败"
-#: sequencer.c:1526
+#: sequencer.c:1456
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
-#: sequencer.c:1531
+#: sequencer.c:1461
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
-#: sequencer.c:1605 sequencer.c:1715
+#: sequencer.c:1535 sequencer.c:1645
#, c-format
msgid "unknown command: %d"
msgstr "未知命令：%d"
-#: sequencer.c:1662 sequencer.c:1687
+#: sequencer.c:1592 sequencer.c:1617
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
-#: sequencer.c:1672
+#: sequencer.c:1602
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
-#: sequencer.c:1674 sequencer.c:3219
+#: sequencer.c:1604 sequencer.c:3157
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:1676
+#: sequencer.c:1606
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
-#: sequencer.c:1682
+#: sequencer.c:1612
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
-#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1619 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明："
-#: sequencer.c:1697
+#: sequencer.c:1627
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
-#: sequencer.c:1704
+#: sequencer.c:1634
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d："
-#: sequencer.c:1710
+#: sequencer.c:1640
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过："
-#: sequencer.c:1798
+#: sequencer.c:1728
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
-#: sequencer.c:1805
+#: sequencer.c:1735
msgid "cannot fixup root commit"
msgstr "不能修复根提交"
-#: sequencer.c:1824
+#: sequencer.c:1754
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: sequencer.c:1832 sequencer.c:1840
+#: sequencer.c:1762 sequencer.c:1770
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
-#: sequencer.c:1846
+#: sequencer.c:1776
#, 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:1865
+#: sequencer.c:1795
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:1930
+#: sequencer.c:1860
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
-#: sequencer.c:1985
+#: sequencer.c:1915
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
-#: sequencer.c:1986
+#: sequencer.c:1916
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
-#: sequencer.c:2045
+#: sequencer.c:1983
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：无法读取索引"
-#: sequencer.c:2052
+#: sequencer.c:1990
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：无法刷新索引"
-#: sequencer.c:2128
+#: sequencer.c:2066
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受参数：'%s'"
-#: sequencer.c:2137
+#: sequencer.c:2075
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的参数"
-#: sequencer.c:2174
+#: sequencer.c:2112
#, c-format
msgid "could not parse '%.*s'"
msgstr "无法解析 '%.*s'"
-#: sequencer.c:2228
+#: sequencer.c:2166
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d：%.*s"
-#: sequencer.c:2239
+#: sequencer.c:2177
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
-#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
+#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178
#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
msgid "could not read '%s'."
msgstr "不能读取 '%s'。"
-#: sequencer.c:2323
+#: sequencer.c:2261
msgid "cancelling a cherry picking in progress"
msgstr "正在取消一个进行中的拣选"
-#: sequencer.c:2330
+#: sequencer.c:2268
msgid "cancelling a revert in progress"
msgstr "正在取消一个进行中的还原"
-#: sequencer.c:2364
+#: sequencer.c:2302
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: sequencer.c:2366
+#: sequencer.c:2304
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单：'%s'"
-#: sequencer.c:2371
+#: sequencer.c:2309
msgid "no commits parsed."
msgstr "没有解析提交。"
-#: sequencer.c:2382
+#: sequencer.c:2320
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
-#: sequencer.c:2384
+#: sequencer.c:2322
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
-#: sequencer.c:2466
+#: sequencer.c:2404
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效：%s"
-#: sequencer.c:2553
+#: sequencer.c:2491
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
-#: sequencer.c:2569
+#: sequencer.c:2507
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式错误的选项清单：'%s'"
-#: sequencer.c:2652 sequencer.c:4351
+#: sequencer.c:2590 sequencer.c:4308
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:2668
+#: sequencer.c:2606
msgid "revert is already in progress"
msgstr "一个还原操作已在进行"
-#: sequencer.c:2670
+#: sequencer.c:2608
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2673
+#: sequencer.c:2611
msgid "cherry-pick is already in progress"
msgstr "拣选操作已在进行"
-#: sequencer.c:2675
+#: sequencer.c:2613
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2689
+#: sequencer.c:2627
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
-#: sequencer.c:2704
+#: sequencer.c:2642
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
-#: sequencer.c:2764 sequencer.c:4103
+#: sequencer.c:2702 sequencer.c:4057
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:2766 sequencer.c:2777
+#: sequencer.c:2704 sequencer.c:2715
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:2768 sequencer.c:2812
+#: sequencer.c:2706 sequencer.c:2750
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:2798 builtin/grep.c:734
+#: sequencer.c:2736 builtin/grep.c:736
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: sequencer.c:2800
+#: sequencer.c:2738
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s'：%s"
-#: sequencer.c:2801
+#: sequencer.c:2739
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:2807
+#: sequencer.c:2745
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:2818
+#: sequencer.c:2756
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-#: sequencer.c:2859
+#: sequencer.c:2797
msgid "no revert in progress"
msgstr "没有正在进行的还原"
-#: sequencer.c:2867
+#: sequencer.c:2805
msgid "no cherry-pick in progress"
msgstr "没有正在进行的拣选"
-#: sequencer.c:2877
+#: sequencer.c:2815
msgid "failed to skip the commit"
msgstr "无法跳过这个提交"
-#: sequencer.c:2884
+#: sequencer.c:2822
msgid "there is nothing to skip"
msgstr "没有要跳过的"
-#: sequencer.c:2887
+#: sequencer.c:2825
#, c-format
msgid ""
"have you committed already?\n"
"您已经提交了么？\n"
"试试 \"git %s --continue\""
-#: sequencer.c:3011 sequencer.c:4015
+#: sequencer.c:2949 sequencer.c:3969
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:3049 sequencer.c:3995
+#: sequencer.c:2987 sequencer.c:3949
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:3066
+#: sequencer.c:3004
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "无法拷贝 '%s' 至 '%s'"
-#: sequencer.c:3074
+#: sequencer.c:3012
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:3084
+#: sequencer.c:3022
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能应用 %s... %.*s"
-#: sequencer.c:3091
+#: sequencer.c:3029
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合并 %.*s"
-#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
-#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
-#: builtin/rebase.c:1953 builtin/rebase.c:2008
+#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613
+#: builtin/rebase.c:1987 builtin/rebase.c:2031
msgid "could not read index"
msgstr "不能读取索引"
# 译者：注意保持前导空格
-#: sequencer.c:3136
+#: sequencer.c:3074
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3142
+#: sequencer.c:3080
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
-#: sequencer.c:3148
+#: sequencer.c:3086
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3209
+#: sequencer.c:3147
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的标签名称：'%.*s'"
-#: sequencer.c:3263
+#: sequencer.c:3201
msgid "writing fake root commit"
msgstr "写伪根提交"
-#: sequencer.c:3268
+#: sequencer.c:3206
msgid "writing squash-onto"
msgstr "写入 squash-onto"
-#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
+#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861
#, c-format
msgid "failed to find tree of %s"
msgstr "无法找到 %s 指向的树。"
-#: sequencer.c:3324 builtin/rebase.c:873
+#: sequencer.c:3262 builtin/rebase.c:874
msgid "could not write index"
msgstr "不能写入索引"
-#: sequencer.c:3351
+#: sequencer.c:3289
#, c-format
msgid "could not resolve '%s'"
msgstr "无法解析 '%s'"
-#: sequencer.c:3379
+#: sequencer.c:3320
msgid "cannot merge without a current revision"
msgstr "没有当前版本不能合并"
-#: sequencer.c:3401
+#: sequencer.c:3342
#, c-format
msgid "unable to parse '%.*s'"
msgstr "无法解析 '%.*s'"
-#: sequencer.c:3410
+#: sequencer.c:3351
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "无可用合并：'%.*s'"
-#: sequencer.c:3422
+#: sequencer.c:3363
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章鱼合并不能在一个新的根提交上执行"
-#: sequencer.c:3437
+#: sequencer.c:3378
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能获取 '%s' 的提交说明"
-#: sequencer.c:3590
+#: sequencer.c:3538
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能尝试合并 '%.*s'"
-#: sequencer.c:3606
+#: sequencer.c:3554
msgid "merge: Unable to write new index file"
msgstr "合并：无法写入新索引文件"
-#: sequencer.c:3675 builtin/rebase.c:711
+#: sequencer.c:3623 builtin/rebase.c:712
#, c-format
msgid "Applied autostash.\n"
msgstr "已应用 autostash。\n"
-#: sequencer.c:3687
+#: sequencer.c:3635
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
-#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"您的修改安全地保存在贮藏区中。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:3751
+#: sequencer.c:3699
#, c-format
msgid "could not checkout %s"
msgstr "不能检出 %s"
-#: sequencer.c:3765
+#: sequencer.c:3713
#, c-format
msgid "%s: not a valid OID"
msgstr "%s：不是一个有效的对象 ID"
-#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3718 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "不能分离头指针"
-#: sequencer.c:3785
+#: sequencer.c:3733
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
-#: sequencer.c:3787
+#: sequencer.c:3735
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
-#: sequencer.c:3795
+#: sequencer.c:3743
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3877
+#: sequencer.c:3827
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:3958
+#: sequencer.c:3898
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
-#: sequencer.c:4003
+#: sequencer.c:3957
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
-#: sequencer.c:4008
+#: sequencer.c:3962
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
-#: sequencer.c:4022
+#: sequencer.c:3976
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
-#: sequencer.c:4115
+#: sequencer.c:4069
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
-#: sequencer.c:4124
+#: sequencer.c:4078
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
-#: sequencer.c:4126
+#: sequencer.c:4080
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件：'%s'"
-#: sequencer.c:4128
+#: sequencer.c:4082
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容：'%s'"
-#: sequencer.c:4131
+#: sequencer.c:4085
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: sequencer.c:4167 sequencer.c:4205
+#: sequencer.c:4121 sequencer.c:4159
#, c-format
msgid "could not write file: '%s'"
msgstr "不能写入文件：'%s'"
-#: sequencer.c:4220
+#: sequencer.c:4174
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: sequencer.c:4227
+#: sequencer.c:4181
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: sequencer.c:4328
+#: sequencer.c:4285
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能拣选一个%s"
-#: sequencer.c:4332
+#: sequencer.c:4289
#, c-format
msgid "%s: bad revision"
msgstr "%s：错误的版本"
-#: sequencer.c:4367
+#: sequencer.c:4324
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
-#: sequencer.c:4810
+#: sequencer.c:4774
msgid "make_script: unhandled options"
msgstr "make_script：有未能处理的选项"
-#: sequencer.c:4813
+#: sequencer.c:4777
msgid "make_script: error preparing revisions"
msgstr "make_script：准备版本时错误"
-#: sequencer.c:4971
+#: sequencer.c:4935
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"
"或者您可以用 'git rebase --abort' 终止变基。\n"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5047 sequencer.c:5064
msgid "nothing to do"
msgstr "无事可做"
-#: sequencer.c:5114
+#: sequencer.c:5078
msgid "could not skip unnecessary pick commands"
msgstr "无法跳过不必要的拣选"
-#: sequencer.c:5197
+#: sequencer.c:5166
msgid "the script was already rearranged."
msgstr "脚本已经重新编排。"
-#: setup.c:123
+#: setup.c:124
#, c-format
msgid "'%s' is outside repository"
msgstr "'%s' 在仓库之外"
-#: setup.c:173
+#: setup.c:174
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"%s：工作区中无此路径。\n"
"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
-#: setup.c:186
+#: setup.c:187
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"使用 '--' 来分隔版本和路径，例如：\n"
"'git <命令> [<版本>...] -- [<文件>...]'"
-#: setup.c:235
+#: setup.c:236
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "选项 '%s' 必须在其他非选项参数之前"
-#: setup.c:254
+#: setup.c:255
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"使用 '--' 来分隔版本和路径，例如：\n"
"'git <命令> [<版本>...] -- [<文件>...]'"
-#: setup.c:390
+#: setup.c:391
msgid "unable to set up work tree using invalid config"
msgstr "无法使用无效配置来创建工作区"
-#: setup.c:394
+#: setup.c:395
msgid "this operation must be run in a work tree"
msgstr "该操作必须在一个工作区中运行"
-#: setup.c:540
+#: setup.c:541
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 仓库版本 <= %d，却得到 %d"
-#: setup.c:548
+#: setup.c:549
msgid "unknown repository extensions found:"
msgstr "发现未知的仓库扩展："
-#: setup.c:567
+#: setup.c:568
#, c-format
msgid "error opening '%s'"
msgstr "打开 '%s' 出错"
-#: setup.c:569
+#: setup.c:570
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "文件太大，无法作为 .git 文件：'%s'"
-#: setup.c:571
+#: setup.c:572
#, c-format
msgid "error reading %s"
msgstr "读取 %s 出错"
-#: setup.c:573
+#: setup.c:574
#, c-format
msgid "invalid gitfile format: %s"
msgstr "无效的 gitfile 格式：%s"
-#: setup.c:575
+#: setup.c:576
#, c-format
msgid "no path in gitfile: %s"
msgstr "在 gitfile 中没有路径：%s"
-#: setup.c:577
+#: setup.c:578
#, c-format
msgid "not a git repository: %s"
msgstr "不是一个 git 仓库：%s"
-#: setup.c:676
+#: setup.c:677
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' 太大"
-#: setup.c:690
+#: setup.c:691
#, c-format
msgid "not a git repository: '%s'"
msgstr "不是一个 git 仓库：'%s'"
-#: setup.c:719 setup.c:721 setup.c:752
+#: setup.c:720 setup.c:722 setup.c:753
#, c-format
msgid "cannot chdir to '%s'"
msgstr "不能切换目录到 '%s'"
-#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
msgid "cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: setup.c:851
+#: setup.c:852
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "获取 '%*s%s%s' 状态（stat）失败"
-#: setup.c:1083
+#: setup.c:1090
msgid "Unable to read current working directory"
msgstr "不能读取当前工作目录"
-#: setup.c:1092 setup.c:1098
+#: setup.c:1099 setup.c:1105
#, c-format
msgid "cannot change to '%s'"
msgstr "不能切换到 '%s'"
-#: setup.c:1103
+#: setup.c:1110
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "不是一个 git 仓库（或者任何父目录）：%s"
-#: setup.c:1109
+#: setup.c:1116
#, 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:1220
+#: setup.c:1227
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
"文件属主必须始终拥有读写权限。"
-#: setup.c:1264
+#: setup.c:1271
msgid "open /dev/null or dup failed"
msgstr "不能打开或者复制 /dev/null"
-#: setup.c:1279
+#: setup.c:1286
msgid "fork failed"
msgstr "fork 失败"
-#: setup.c:1284
+#: setup.c:1291
msgid "setsid failed"
msgstr "setsid 失败"
-#: sha1-file.c:453
+#: sha1-file.c:452
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
-#: sha1-file.c:504
+#: sha1-file.c:503
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "无法规范化备用对象路径：%s"
-#: sha1-file.c:576
+#: sha1-file.c:575
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s：忽略备用对象库，嵌套太深"
-#: sha1-file.c:583
+#: sha1-file.c:582
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "无法规范化对象目录: %s"
-#: sha1-file.c:626
+#: sha1-file.c:625
msgid "unable to fdopen alternates lockfile"
msgstr "无法 fdopen 替换锁文件"
-#: sha1-file.c:644
+#: sha1-file.c:643
msgid "unable to read alternates file"
msgstr "无法读取替代文件"
-#: sha1-file.c:651
+#: sha1-file.c:650
msgid "unable to move new alternates file into place"
msgstr "无法将新的替代文件移动到位"
-#: sha1-file.c:686
+#: sha1-file.c:685
#, c-format
msgid "path '%s' does not exist"
msgstr "路径 '%s' 不存在"
-#: sha1-file.c:712
+#: sha1-file.c:711
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
-#: sha1-file.c:718
+#: sha1-file.c:717
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "参考仓库 '%s' 不是一个本地仓库。"
-#: sha1-file.c:724
+#: sha1-file.c:723
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "参考仓库 '%s' 是一个浅克隆"
-#: sha1-file.c:732
+#: sha1-file.c:731
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "参考仓库 '%s' 已被移植"
-#: sha1-file.c:792
+#: sha1-file.c:791
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "解析备用引用时无效的行：%s"
-#: sha1-file.c:944
+#: sha1-file.c:943
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
-#: sha1-file.c:969
+#: sha1-file.c:964
msgid "mmap failed"
msgstr "mmap 失败"
-#: sha1-file.c:1133
+#: sha1-file.c:1128
#, c-format
msgid "object file %s is empty"
msgstr "对象文件 %s 为空"
-#: sha1-file.c:1257 sha1-file.c:2396
+#: sha1-file.c:1252 sha1-file.c:2392
#, c-format
msgid "corrupt loose object '%s'"
msgstr "损坏的松散对象 '%s'"
-#: sha1-file.c:1259 sha1-file.c:2400
+#: sha1-file.c:1254 sha1-file.c:2396
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "松散对象 '%s' 后面有垃圾数据"
-#: sha1-file.c:1301
+#: sha1-file.c:1296
msgid "invalid object type"
msgstr "无效的对象类型"
-#: sha1-file.c:1385
+#: sha1-file.c:1380
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
-#: sha1-file.c:1388
+#: sha1-file.c:1383
#, c-format
msgid "unable to unpack %s header"
msgstr "无法解开 %s 头部"
-#: sha1-file.c:1394
+#: sha1-file.c:1389
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
-#: sha1-file.c:1397
+#: sha1-file.c:1392
#, c-format
msgid "unable to parse %s header"
msgstr "无法解析 %s 头部"
-#: sha1-file.c:1588
+#: sha1-file.c:1584
#, c-format
msgid "failed to read object %s"
msgstr "读取对象 %s 失败"
-#: sha1-file.c:1592
+#: sha1-file.c:1588
#, c-format
msgid "replacement %s not found for %s"
msgstr "找不到 %2$s 的替代 %1$s"
-#: sha1-file.c:1596
+#: sha1-file.c:1592
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "松散对象 %s（保存在 %s）已损坏"
-#: sha1-file.c:1600
+#: sha1-file.c:1596
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "打包对象 %s（保存在 %s）已损坏"
-#: sha1-file.c:1703
+#: sha1-file.c:1699
#, c-format
msgid "unable to write file %s"
msgstr "无法写文件 %s"
-#: sha1-file.c:1710
+#: sha1-file.c:1706
#, c-format
msgid "unable to set permission to '%s'"
msgstr "无法为 '%s' 设置权限"
-#: sha1-file.c:1717
+#: sha1-file.c:1713
msgid "file write error"
msgstr "文件写错误"
-#: sha1-file.c:1736
+#: sha1-file.c:1732
msgid "error when closing loose object file"
msgstr "关闭松散对象文件时出错"
-#: sha1-file.c:1801
+#: sha1-file.c:1797
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
-#: sha1-file.c:1803
+#: sha1-file.c:1799
msgid "unable to create temporary file"
msgstr "无法创建临时文件"
-#: sha1-file.c:1827
+#: sha1-file.c:1823
msgid "unable to write loose object file"
msgstr "不能写松散对象文件"
-#: sha1-file.c:1833
+#: sha1-file.c:1829
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "不能压缩新对象 %s（%d）"
-#: sha1-file.c:1837
+#: sha1-file.c:1833
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
-#: sha1-file.c:1841
+#: sha1-file.c:1837
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "被 %s 的不稳定对象源数据搞糊涂了"
-#: sha1-file.c:1851 builtin/pack-objects.c:925
+#: sha1-file.c:1847 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "在 %s 上调用 utime() 失败"
-#: sha1-file.c:1926
+#: sha1-file.c:1922
#, c-format
msgid "cannot read object for %s"
msgstr "不能读取对象 %s"
-#: sha1-file.c:1966
+#: sha1-file.c:1962
msgid "corrupt commit"
msgstr "损坏的提交"
-#: sha1-file.c:1974
+#: sha1-file.c:1970
msgid "corrupt tag"
msgstr "损坏的标签"
-#: sha1-file.c:2073
+#: sha1-file.c:2069
#, c-format
msgid "read error while indexing %s"
msgstr "索引 %s 时读取错误"
-#: sha1-file.c:2076
+#: sha1-file.c:2072
#, c-format
msgid "short read while indexing %s"
msgstr "索引 %s 时读入不完整"
-#: sha1-file.c:2149 sha1-file.c:2158
+#: sha1-file.c:2145 sha1-file.c:2154
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s：插入数据库失败"
-#: sha1-file.c:2164
+#: sha1-file.c:2160
#, c-format
msgid "%s: unsupported file type"
msgstr "%s：不支持的文件类型"
-#: sha1-file.c:2188
+#: sha1-file.c:2184
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一个有效的对象"
-#: sha1-file.c:2190
+#: sha1-file.c:2186
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一个有效的 '%s' 对象"
-#: sha1-file.c:2217 builtin/index-pack.c:155
+#: sha1-file.c:2213 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "不能打开 %s"
-#: sha1-file.c:2407 sha1-file.c:2459
+#: sha1-file.c:2403 sha1-file.c:2455
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s 的哈希值不匹配（预期 %s）"
-#: sha1-file.c:2431
+#: sha1-file.c:2427
#, c-format
msgid "unable to mmap %s"
msgstr "不能 mmap %s"
-#: sha1-file.c:2436
+#: sha1-file.c:2432
#, c-format
msgid "unable to unpack header of %s"
msgstr "无法解压缩 %s 的头部"
-#: sha1-file.c:2442
+#: sha1-file.c:2438
#, c-format
msgid "unable to parse header of %s"
msgstr "无法解析 %s 的头部"
-#: sha1-file.c:2453
+#: sha1-file.c:2449
#, c-format
msgid "unable to unpack contents of %s"
msgstr "无法解压缩 %s 的内容"
-#: sha1-name.c:490
+#: sha1-name.c:487
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "短 SHA1 %s 存在歧义"
-#: sha1-name.c:501
+#: sha1-name.c:498
msgid "The candidates are:"
msgstr "候选者有："
-#: sha1-name.c:800
+#: sha1-name.c:797
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"
"false\" 命令关闭本消息通知。"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:821
+#: strbuf.c:822
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:823
+#: strbuf.c:824
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr "%u.%2.2u GiB/s"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:831
+#: strbuf.c:832
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:833
+#: strbuf.c:834
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr "%u.%2.2u MiB/s"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:840
+#: strbuf.c:841
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:842
+#: strbuf.c:843
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr "%u.%2.2u KiB/s"
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:848
+#: strbuf.c:849
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[1] "%u 字节"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:850
+#: strbuf.c:851
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
-#: submodule-config.c:232
+#: submodule-config.c:236
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "忽略可疑的子模组名称：%s"
-#: submodule-config.c:299
+#: submodule-config.c:303
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "submodule.fetchjobs 不允许为负值"
-#: submodule-config.c:397
+#: submodule-config.c:401
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr "忽略可能被解析为命令行选项的 '%s'：%s"
-#: submodule-config.c:486
+#: submodule-config.c:490
#, c-format
msgid "invalid value for %s"
msgstr "%s 的值无效"
-#: submodule-config.c:755
+#: submodule-config.c:761
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "不能更新 .gitmodules 条目 %s"
msgid "could not read from stdin"
msgstr "不能自标准输入读取"
-#: trailer.c:1011 wrapper.c:701
+#: trailer.c:1011 wrapper.c:665
#, c-format
msgid "could not stat %s"
msgstr "不能对 %s 调用 stat"
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
-#: transport.c:142
+#: transport.c:145
#, c-format
msgid "could not read bundle '%s'"
msgstr "无法读取 bundle '%s'"
-#: transport.c:208
+#: transport.c:214
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "传输：无效的深度选项 '%s'"
-#: transport.c:259
+#: transport.c:266
msgid "see protocol.version in 'git help config' for more details"
msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
-#: transport.c:260
+#: transport.c:267
msgid "server options require protocol version 2 or later"
msgstr "服务端选项需要版本 2 协议或更高"
-#: transport.c:625
+#: transport.c:632
msgid "could not parse transport.color.* config"
msgstr "不能解析 transport.color.* 配置"
-#: transport.c:698
+#: transport.c:705
msgid "support for protocol v2 not implemented yet"
msgstr "协议 v2 的支持尚未实现"
-#: transport.c:825
+#: transport.c:831
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "配置 '%s' 的取值未知：%s"
-#: transport.c:891
+#: transport.c:897
#, c-format
msgid "transport '%s' not allowed"
msgstr "传输 '%s' 不允许"
-#: transport.c:945
+#: transport.c:949
msgid "git-over-rsync is no longer supported"
msgstr "不再支持 git-over-rsync"
-#: transport.c:1040
+#: transport.c:1044
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
-#: transport.c:1044
+#: transport.c:1048
#, c-format
msgid ""
"\n"
"以推送至远程。\n"
"\n"
-#: transport.c:1052
+#: transport.c:1056
msgid "Aborting."
msgstr "正在终止。"
-#: transport.c:1193
+#: transport.c:1201
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模组"
-#: transport.c:1340 transport-helper.c:645
+#: transport.c:1345 transport-helper.c:655
msgid "operation not supported by protocol"
msgstr "协议不支持该操作"
-#: transport-helper.c:51 transport-helper.c:80
+#: transport-helper.c:61 transport-helper.c:90
msgid "full write to remote helper failed"
msgstr "完整写入远程助手失败"
-#: transport-helper.c:134
+#: transport-helper.c:144
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr "无法为 '%s' 找到远程助手"
-#: transport-helper.c:150 transport-helper.c:559
+#: transport-helper.c:160 transport-helper.c:569
msgid "can't dup helper output fd"
msgstr "无法复制助手输出文件句柄"
-#: transport-helper.c:201
+#: transport-helper.c:211
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
"version of Git"
msgstr "未知的强制能力 %s，该远程助手可能需要新版本的Git"
-#: transport-helper.c:207
+#: transport-helper.c:217
msgid "this remote helper should implement refspec capability"
msgstr "远程助手需要实现 refspec 能力"
-#: transport-helper.c:274 transport-helper.c:414
+#: transport-helper.c:284 transport-helper.c:424
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "%s 意外地说：'%s'"
-#: transport-helper.c:403
+#: transport-helper.c:413
#, c-format
msgid "%s also locked %s"
msgstr "%s 也锁定了 %s"
-#: transport-helper.c:481
+#: transport-helper.c:491
msgid "couldn't run fast-import"
msgstr "不能执行 fast-import"
-#: transport-helper.c:504
+#: transport-helper.c:514
msgid "error while running fast-import"
msgstr "执行 fast-import 出错"
-#: transport-helper.c:533 transport-helper.c:1105
+#: transport-helper.c:543 transport-helper.c:1132
#, c-format
msgid "could not read ref %s"
msgstr "无法读取引用 %s"
-#: transport-helper.c:578
+#: transport-helper.c:588
#, c-format
msgid "unknown response to connect: %s"
msgstr "连接时未知的响应：%s"
-#: transport-helper.c:600
+#: transport-helper.c:610
msgid "setting remote service path not supported by protocol"
msgstr "协议不支持设置远程服务路径"
-#: transport-helper.c:602
+#: transport-helper.c:612
msgid "invalid remote service path"
msgstr "无效的远程服务路径"
-#: transport-helper.c:648
+#: transport-helper.c:658
#, c-format
msgid "can't connect to subservice %s"
msgstr "不能连接到子服务 %s"
-#: transport-helper.c:720
+#: transport-helper.c:734
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "预期 ok/error，助手说 '%s'"
-#: transport-helper.c:773
+#: transport-helper.c:787
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "助手报告 %s 的意外状态"
-#: transport-helper.c:834
+#: transport-helper.c:848
#, c-format
msgid "helper %s does not support dry-run"
msgstr "助手 %s 不支持 dry-run"
-#: transport-helper.c:837
+#: transport-helper.c:851
#, c-format
msgid "helper %s does not support --signed"
msgstr "助手 %s 不支持 --signed"
-#: transport-helper.c:840
+#: transport-helper.c:854
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "助手 %s 不支持 --signed=if-asked"
-#: transport-helper.c:847
+#: transport-helper.c:859
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "助手 %s 不支持 --atomic"
+
+#: transport-helper.c:865
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "助手 %s 不支持 'push-option'"
-#: transport-helper.c:945
+#: transport-helper.c:963
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-heper 不支持 push，需要引用表达式"
-#: transport-helper.c:950
+#: transport-helper.c:968
#, c-format
msgid "helper %s does not support 'force'"
msgstr "助手 %s 不支持 'force'"
-#: transport-helper.c:997
+#: transport-helper.c:1015
msgid "couldn't run fast-export"
msgstr "无法执行 fast-export"
-#: transport-helper.c:1002
+#: transport-helper.c:1020
msgid "error while running fast-export"
msgstr "执行 fast-export 时出错"
-#: transport-helper.c:1027
+#: transport-helper.c:1045
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"没有共同的引用并且也没有指定，什么也不会做。\n"
"可能您应该指定一个分支如 'master'。\n"
-#: transport-helper.c:1091
+#: transport-helper.c:1118
#, c-format
msgid "malformed response in ref list: %s"
msgstr "引用列表中格式错误的响应：%s"
-#: transport-helper.c:1244
+#: transport-helper.c:1270
#, c-format
msgid "read(%s) failed"
msgstr "读取（%s）失败"
-#: transport-helper.c:1271
+#: transport-helper.c:1297
#, c-format
msgid "write(%s) failed"
msgstr "写（%s）失败"
-#: transport-helper.c:1320
+#: transport-helper.c:1346
#, c-format
msgid "%s thread failed"
msgstr "%s 线程失败"
-#: transport-helper.c:1324
+#: transport-helper.c:1350
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s 线程等待失败：%s"
-#: transport-helper.c:1343 transport-helper.c:1347
+#: transport-helper.c:1369 transport-helper.c:1373
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "不能启动线程来拷贝数据：%s"
-#: transport-helper.c:1384
+#: transport-helper.c:1410
#, c-format
msgid "%s process failed to wait"
msgstr "%s 进程等待失败"
-#: transport-helper.c:1388
+#: transport-helper.c:1414
#, c-format
msgid "%s process failed"
msgstr "%s 进程失败"
-#: transport-helper.c:1406 transport-helper.c:1415
+#: transport-helper.c:1432 transport-helper.c:1441
msgid "can't start thread for copying data"
msgstr "不能启动线程来拷贝数据"
msgid "too-short tree file"
msgstr "太短的树文件"
-#: unpack-trees.c:111
+#: unpack-trees.c:110
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"您对下列文件的本地修改将被检出操作覆盖：\n"
"%%s请在切换分支前提交或贮藏您的修改。"
-#: unpack-trees.c:113
+#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"您对下列文件的本地修改将被检出操作覆盖：\n"
"%%s"
-#: unpack-trees.c:116
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s请在合并前提交或贮藏您的修改。"
-#: unpack-trees.c:118
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s"
-#: unpack-trees.c:121
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s请在 %s 之前提交或贮藏您的修改。"
-#: unpack-trees.c:123
+#: unpack-trees.c:122
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s"
-#: unpack-trees.c:128
+#: unpack-trees.c:127
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"更新如下目录将会丢失其中未跟踪的文件：\n"
"%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:131
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s请在切换分支之前移动或删除。"
-#: unpack-trees.c:134
+#: unpack-trees.c:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s"
-#: unpack-trees.c:137
+#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:139
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s"
-#: unpack-trees.c:142
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:144
+#: unpack-trees.c:143
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s"
-#: unpack-trees.c:150
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s请在切换分支前移动或删除。"
-#: unpack-trees.c:152
+#: unpack-trees.c:151
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:155
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:157
+#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:160
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:162
+#: unpack-trees.c:161
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:170
+#: unpack-trees.c:169
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
-#: unpack-trees.c:173
+#: unpack-trees.c:172
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
"无法更新稀疏检出：如下条目不是最新：\n"
"%s"
-#: unpack-trees.c:175
+#: unpack-trees.c:174
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"工作区中下列文件将被稀疏检出更新所覆盖：\n"
"%s"
-#: unpack-trees.c:177
+#: unpack-trees.c:176
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"工作区中下列文件将被稀疏检出更新所删除：\n"
"%s"
-#: unpack-trees.c:179
+#: unpack-trees.c:178
#, c-format
msgid ""
"Cannot update submodule:\n"
"无法更新子模组：\n"
"%s"
-#: unpack-trees.c:256
+#: unpack-trees.c:255
#, c-format
msgid "Aborting\n"
msgstr "正在终止\n"
-#: unpack-trees.c:318
+#: unpack-trees.c:317
msgid "Updating files"
msgstr "正在更新文件"
-#: unpack-trees.c:350
+#: unpack-trees.c:349
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
msgid "invalid '..' path segment"
msgstr "无效的 '..' 路径片段"
-#: worktree.c:258 builtin/am.c:2095
+#: worktree.c:258 builtin/am.c:2084
#, c-format
msgid "failed to read '%s'"
msgstr "读取 '%s' 失败"
msgid "'%s' does not point back to '%s'"
msgstr "'%s' 没有指回到 '%s'"
-#: wrapper.c:223 wrapper.c:393
+#: wrapper.c:186 wrapper.c:356
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "无法打开 '%s' 进行读写"
-#: wrapper.c:424 wrapper.c:624
+#: wrapper.c:387 wrapper.c:588
#, c-format
msgid "unable to access '%s'"
msgstr "不能访问 '%s'"
-#: wrapper.c:632
+#: wrapper.c:596
msgid "unable to get current working directory"
msgstr "不能获取当前工作目录"
# 译者：注意保持前导空格
#: wt-status.c:1437
+msgid " (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr " （使用 \"git cherry-pick --skip\" 跳过此补丁）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1439
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
-#: wt-status.c:1447
+#: wt-status.c:1449
msgid "Revert currently in progress."
msgstr "还原操作正在行中。"
-#: wt-status.c:1450
+#: wt-status.c:1452
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在执行反转提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1456
+#: wt-status.c:1458
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " （解决冲突并执行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1459
+#: wt-status.c:1461
msgid " (run \"git revert --continue\" to continue)"
msgstr " （执行 \"git revert --continue\" 以继续）"
# 译者：注意保持前导空格
-#: wt-status.c:1462
+#: wt-status.c:1464
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " （所有冲突已解决：执行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1464
+#: wt-status.c:1466
+msgid " (use \"git revert --skip\" to skip this patch)"
+msgstr " （使用 \"git revert --skip\" 跳过此补丁）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1468
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
-#: wt-status.c:1474
+#: wt-status.c:1478
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
-#: wt-status.c:1478
+#: wt-status.c:1482
msgid "You are currently bisecting."
msgstr "您在执行二分查找操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1481
+#: wt-status.c:1485
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
-#: wt-status.c:1690
+#: wt-status.c:1694
msgid "On branch "
msgstr "位于分支 "
-#: wt-status.c:1697
+#: wt-status.c:1701
msgid "interactive rebase in progress; onto "
msgstr "交互式变基操作正在进行中；至 "
-#: wt-status.c:1699
+#: wt-status.c:1703
msgid "rebase in progress; onto "
msgstr "变基操作正在进行中；至 "
-#: wt-status.c:1709
+#: wt-status.c:1713
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
-#: wt-status.c:1726
+#: wt-status.c:1730
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1727
+#: wt-status.c:1731
msgid "No commits yet"
msgstr "尚无提交"
-#: wt-status.c:1741
+#: wt-status.c:1745
msgid "Untracked files"
msgstr "未跟踪的文件"
-#: wt-status.c:1743
+#: wt-status.c:1747
msgid "Ignored files"
msgstr "忽略的文件"
-#: wt-status.c:1747
+#: wt-status.c:1751
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
-#: wt-status.c:1753
+#: wt-status.c:1757
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1755
+#: wt-status.c:1759
msgid " (use -u option to show untracked files)"
msgstr "（使用 -u 参数显示未跟踪的文件）"
-#: wt-status.c:1761
+#: wt-status.c:1765
msgid "No changes"
msgstr "没有修改"
-#: wt-status.c:1766
+#: wt-status.c:1770
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
-#: wt-status.c:1769
+#: wt-status.c:1773
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1772
+#: wt-status.c:1776
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1775
+#: wt-status.c:1779
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交为空，但是存在尚未跟踪的文件\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1778
+#: wt-status.c:1782
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1781 wt-status.c:1786
+#: wt-status.c:1785 wt-status.c:1790
#, c-format
msgid "nothing to commit\n"
msgstr "无文件要提交\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1784
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1788
+#: wt-status.c:1792
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "无文件要提交，干净的工作区\n"
-#: wt-status.c:1901
+#: wt-status.c:1905
msgid "No commits yet on "
msgstr "尚无提交在 "
-#: wt-status.c:1905
+#: wt-status.c:1909
msgid "HEAD (no branch)"
msgstr "HEAD（非分支）"
-#: wt-status.c:1936
+#: wt-status.c:1940
msgid "different"
msgstr "不同"
# 译者：注意保持句尾空格
-#: wt-status.c:1938 wt-status.c:1946
+#: wt-status.c:1942 wt-status.c:1950
msgid "behind "
msgstr "落后 "
-#: wt-status.c:1941 wt-status.c:1944
+#: wt-status.c:1945 wt-status.c:1948
msgid "ahead "
msgstr "领先 "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2466
+#: wt-status.c:2470
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "不能%s：您有未暂存的变更。"
-#: wt-status.c:2472
+#: wt-status.c:2476
msgid "additionally, your index contains uncommitted changes."
msgstr "另外，您的索引中包含未提交的变更。"
-#: wt-status.c:2474
+#: wt-status.c:2478
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s：您的索引中包含未提交的变更。"
+#: compat/precompose_utf8.c:58 builtin/clone.c:452
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "删除 '%s' 失败"
+
#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<选项>] [--] <路径规格>..."
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更："
-#: builtin/add.c:234 builtin/rev-parse.c:896
+#: builtin/add.c:234 builtin/rev-parse.c:897
msgid "Could not read the index"
msgstr "不能读取索引"
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
-#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
+#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547
#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "演习"
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
-#: builtin/add.c:309 builtin/update-index.c:1001
+#: builtin/add.c:309 builtin/update-index.c:1002
msgid "override the executable bit of the listed files"
msgstr "覆盖列表里文件的可执行位"
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想要执行 'git add .'？\n"
-#: builtin/am.c:348
+#: builtin/am.c:347
msgid "could not parse author script"
msgstr "不能解析作者脚本"
-#: builtin/am.c:432
+#: builtin/am.c:431
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/am.c:474
+#: builtin/am.c:473
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行：'%s'。"
-#: builtin/am.c:512
+#: builtin/am.c:511
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/am.c:538
+#: builtin/am.c:537
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:726
+#: builtin/am.c:725
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
-#: builtin/am.c:791
+#: builtin/am.c:790
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: builtin/am.c:839
+#: builtin/am.c:838
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:843 builtin/am.c:855
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:851
+#: builtin/am.c:850
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
-#: builtin/am.c:944
+#: builtin/am.c:943
msgid "Patch format detection failed."
msgstr "补丁格式探测失败。"
-#: builtin/am.c:949 builtin/clone.c:407
+#: builtin/am.c:948 builtin/clone.c:406
#, c-format
msgid "failed to create directory '%s'"
msgstr "创建目录 '%s' 失败"
-#: builtin/am.c:954
+#: builtin/am.c:953
msgid "Failed to split patches."
msgstr "拆分补丁失败。"
-#: builtin/am.c:1084 builtin/commit.c:374
-msgid "unable to write index file"
-msgstr "无法写入索引文件"
-
-#: builtin/am.c:1098
+#: builtin/am.c:1084
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题，执行 \"%s --continue\"。"
-#: builtin/am.c:1099
+#: builtin/am.c:1085
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
-#: builtin/am.c:1100
+#: builtin/am.c:1086
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
-#: builtin/am.c:1183
+#: builtin/am.c:1169
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。"
-#: builtin/am.c:1211
+#: builtin/am.c:1197
msgid "Patch is empty."
msgstr "补丁为空。"
-#: builtin/am.c:1277
+#: builtin/am.c:1262
+#, c-format
+msgid "missing author line in commit %s"
+msgstr "在提交 %s 中缺失作者行"
+
+#: builtin/am.c:1265
#, c-format
msgid "invalid ident line: %.*s"
msgstr "无效的身份标识：%.*s"
-#: builtin/am.c:1299
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "不能解析提交 %s"
-
-#: builtin/am.c:1496
+#: builtin/am.c:1484
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/am.c:1498
+#: builtin/am.c:1486
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个（三方合并的）基础目录树..."
-#: builtin/am.c:1517
+#: builtin/am.c:1505
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"您是否曾手动编辑过您的补丁？\n"
"无法应用补丁到索引中的数据对象上。"
-#: builtin/am.c:1523
+#: builtin/am.c:1511
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/am.c:1549
+#: builtin/am.c:1537
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
-#: builtin/am.c:1581
+#: builtin/am.c:1569
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:1628 builtin/am.c:1632
+#: builtin/am.c:1616 builtin/am.c:1620
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续：%s 不存在。"
-#: builtin/am.c:1650
+#: builtin/am.c:1638
msgid "Commit Body is:"
msgstr "提交内容为："
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1660
+#: builtin/am.c:1648
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
-#: builtin/am.c:1710
+#: builtin/am.c:1695 builtin/commit.c:374
+msgid "unable to write index file"
+msgstr "无法写入索引文件"
+
+#: builtin/am.c:1699
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引：不能应用补丁（脏文件：%s）"
-#: builtin/am.c:1750 builtin/am.c:1818
+#: builtin/am.c:1739 builtin/am.c:1807
#, c-format
msgid "Applying: %.*s"
msgstr "应用：%.*s"
-#: builtin/am.c:1767
+#: builtin/am.c:1756
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:1773
+#: builtin/am.c:1762
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:1777
+#: builtin/am.c:1766
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr "用 'git am --show-current-patch' 命令查看失败的补丁"
-#: builtin/am.c:1821
+#: builtin/am.c:1810
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:1828
+#: builtin/am.c:1817
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:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
+#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329
#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:1987
+#: builtin/am.c:1976
msgid "failed to clean index"
msgstr "清空索引失败"
-#: builtin/am.c:2031
+#: builtin/am.c:2020
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:2128
+#: builtin/am.c:2117
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值：%s"
-#: builtin/am.c:2164
+#: builtin/am.c:2153
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2165
+#: builtin/am.c:2154
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2171
+#: builtin/am.c:2160
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:2173
+#: builtin/am.c:2162
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:2175
+#: builtin/am.c:2164
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允许使用三方合并。"
-#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:296 builtin/stash.c:806
+#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:297 builtin/stash.c:812
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:2178
+#: builtin/am.c:2167
msgid "add a Signed-off-by line to the commit message"
msgstr "在提交说明中添加一个 Signed-off-by 签名"
-#: builtin/am.c:2181
+#: builtin/am.c:2170
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集（默认）"
-#: builtin/am.c:2183
+#: builtin/am.c:2172
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:2185
+#: builtin/am.c:2174
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:2187
+#: builtin/am.c:2176
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:2189
+#: builtin/am.c:2178
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:2192
+#: builtin/am.c:2181
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
-#: builtin/am.c:2195
+#: builtin/am.c:2184
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2224
+#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
+#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
+#: builtin/am.c:2213
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
-#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
-#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249
+#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442
+#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314
#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+#: parse-options.h:150 parse-options.h:171 parse-options.h:312
msgid "n"
msgstr "n"
-#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
-#: builtin/am.c:2221
+#: builtin/am.c:2210
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:2227
+#: builtin/am.c:2216
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:2229
+#: builtin/am.c:2218
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:2232
+#: builtin/am.c:2221
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:2235
+#: builtin/am.c:2224
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:2238
+#: builtin/am.c:2227
msgid "restore the original branch and abort the patching operation."
msgstr "恢复原始分支并终止打补丁操作。"
-#: builtin/am.c:2241
+#: builtin/am.c:2230
msgid "abort the patching operation but keep HEAD where it is."
msgstr "终止补丁操作但保持 HEAD 不变。"
-#: builtin/am.c:2244
+#: builtin/am.c:2233
msgid "show the patch being applied."
msgstr "显示正在应用的补丁。"
-#: builtin/am.c:2248
+#: builtin/am.c:2237
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:2250
+#: builtin/am.c:2239
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
-#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490
+#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:2256
+#: builtin/am.c:2245
msgid "(internal use for git-rebase)"
msgstr "（内部使用，用于 git-rebase）"
-#: builtin/am.c:2274
+#: builtin/am.c:2263
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:2281
+#: builtin/am.c:2270
msgid "failed to read the index"
msgstr "读取索引失败"
-#: builtin/am.c:2296
+#: builtin/am.c:2285
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
-#: builtin/am.c:2320
+#: builtin/am.c:2309
#, c-format
msgid ""
"Stray %s directory found.\n"
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2326
+#: builtin/am.c:2315
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
-#: builtin/am.c:2336
+#: builtin/am.c:2325
msgid "interactive mode requires patches on the command line"
msgstr "交互式模式需要命令行上提供补丁"
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms 需要 0 或 1 个参数"
-#: builtin/blame.c:32
+#: builtin/blame.c:31
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
-#: builtin/blame.c:37
+#: builtin/blame.c:36
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
-#: builtin/blame.c:410
+#: builtin/blame.c:409
#, c-format
msgid "expecting a color: %s"
msgstr "期望一个颜色：%s"
-#: builtin/blame.c:417
+#: builtin/blame.c:416
msgid "must end with a color"
msgstr "必须以一个颜色结尾"
-#: builtin/blame.c:730
+#: builtin/blame.c:729
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
-#: builtin/blame.c:748
+#: builtin/blame.c:747
msgid "invalid value for blame.coloring"
msgstr "设置 blame.coloring 中的无效取值"
-#: builtin/blame.c:823
+#: builtin/blame.c:822
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "不能找到要忽略的版本 %s"
-#: builtin/blame.c:845
+#: builtin/blame.c:844
msgid "Show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
-#: builtin/blame.c:846
+#: builtin/blame.c:845
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "边界提交显示空的 SHA-1（默认：关闭）"
-#: builtin/blame.c:847
+#: builtin/blame.c:846
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界（默认：关闭）"
-#: builtin/blame.c:848
+#: builtin/blame.c:847
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
-#: builtin/blame.c:849
+#: builtin/blame.c:848
msgid "Force progress reporting"
msgstr "强制进度显示"
-#: builtin/blame.c:850
+#: builtin/blame.c:849
msgid "Show output score for blame entries"
msgstr "显示判断 blame 条目位移的得分诊断信息"
-#: builtin/blame.c:851
+#: builtin/blame.c:850
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件名（默认：自动）"
-#: builtin/blame.c:852
+#: builtin/blame.c:851
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行号（默认：关闭）"
-#: builtin/blame.c:853
+#: builtin/blame.c:852
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
-#: builtin/blame.c:854
+#: builtin/blame.c:853
msgid "Show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
-#: builtin/blame.c:855
+#: builtin/blame.c:854
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
-#: builtin/blame.c:856
+#: builtin/blame.c:855
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳（默认：关闭）"
-#: builtin/blame.c:857
+#: builtin/blame.c:856
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 提交号（默认：关闭）"
-#: builtin/blame.c:858
+#: builtin/blame.c:857
msgid "Suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳（默认：关闭）"
-#: builtin/blame.c:859
+#: builtin/blame.c:858
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字（默认：关闭）"
-#: builtin/blame.c:860
+#: builtin/blame.c:859
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:861 builtin/log.c:1629
+#: builtin/blame.c:860 builtin/log.c:1630
msgid "rev"
msgstr "版本"
-#: builtin/blame.c:861
+#: builtin/blame.c:860
msgid "Ignore <rev> when blaming"
msgstr "在执行 blame 操作时忽略 <版本>"
-#: builtin/blame.c:862
+#: builtin/blame.c:861
msgid "Ignore revisions from <file>"
msgstr "忽略来自 <文件> 中的版本"
-#: builtin/blame.c:863
+#: builtin/blame.c:862
msgid "color redundant metadata from previous line differently"
msgstr "使用颜色间隔输出与前一行不同的重复元信息"
-#: builtin/blame.c:864
+#: builtin/blame.c:863
msgid "color lines by age"
msgstr "依据时间着色"
-#: builtin/blame.c:871
+#: builtin/blame.c:870
msgid "Use an experimental heuristic to improve diffs"
msgstr "使用一个试验性的启发式算法改进差异显示"
-#: builtin/blame.c:873
+#: builtin/blame.c:872
msgid "Spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
-#: builtin/blame.c:874
+#: builtin/blame.c:873
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
-#: builtin/blame.c:875
+#: builtin/blame.c:874
msgid "Use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的图片"
-#: builtin/blame.c:876 builtin/blame.c:877
+#: builtin/blame.c:875 builtin/blame.c:876
msgid "score"
msgstr "得分"
-#: builtin/blame.c:876
+#: builtin/blame.c:875
msgid "Find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
-#: builtin/blame.c:877
+#: builtin/blame.c:876
msgid "Find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
-#: builtin/blame.c:878
+#: builtin/blame.c:877
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:878
+#: builtin/blame.c:877
msgid "Process only line range n,m, counting from 1"
msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
msgid "do not use"
msgstr "不要使用"
-#: builtin/branch.c:626 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:486
msgid "upstream"
msgstr "上游"
msgid "format to use for the output"
msgstr "输出格式"
-#: builtin/branch.c:684 builtin/clone.c:761
+#: builtin/branch.c:684 builtin/clone.c:760
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
msgid "Need a repository to unbundle."
msgstr "需要一个仓库来解包。"
-#: builtin/cat-file.c:594
+#: builtin/cat-file.c:595
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:595
+#: builtin/cat-file.c:596
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:616
+#: builtin/cat-file.c:617
msgid "only one batch option may be specified"
msgstr "只能指定一个批处理选项"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
msgid "show object type"
msgstr "显示对象类型"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
msgid "show object size"
msgstr "显示对象大小"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
msgid "exit with zero when there's no error"
msgstr "当没有错误时退出并返回零"
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
msgid "pretty-print object's content"
msgstr "美观地打印对象的内容"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:642
msgid "for blob objects, run textconv on object's content"
msgstr "对于数据对象，对其内容做文本转换"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:644
msgid "for blob objects, run filters on object's content"
msgstr "对于数据对象，对其内容做过滤"
-#: builtin/cat-file.c:644 git-submodule.sh:936
+#: builtin/cat-file.c:645 git-submodule.sh:936
msgid "blob"
msgstr "数据对象"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:646
msgid "use a specific path for --textconv/--filters"
msgstr "对于 --textconv/--filters 使用一个特定的路径"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "允许 -s 和 -t 对损坏的对象生效"
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
msgid "buffer --batch output"
msgstr "缓冲 --batch 的输出"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:651
msgid "show info and content of objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息和内容"
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:655
msgid "show info about objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息"
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:659
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:661
msgid "show all objects with --batch or --batch-check"
msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:663
msgid "do not order --batch-all-objects output"
msgstr "不要对 --batch-all-objects 的输出排序"
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
-#: builtin/worktree.c:507
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537
+#: builtin/worktree.c:506
msgid "suppress progress reporting"
msgstr "不显示进度报告"
#: builtin/checkout-index.c:178 builtin/column.c:31
#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:680
+#: builtin/worktree.c:679
msgid "string"
msgstr "字符串"
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
-#: builtin/checkout.c:172 builtin/checkout.c:211
+#: builtin/checkout.c:173 builtin/checkout.c:212
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
-#: builtin/checkout.c:174 builtin/checkout.c:213
+#: builtin/checkout.c:175 builtin/checkout.c:214
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
-#: builtin/checkout.c:190
+#: builtin/checkout.c:191
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必需的版本"
-#: builtin/checkout.c:240
+#: builtin/checkout.c:241
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必需的版本"
-#: builtin/checkout.c:258
+#: builtin/checkout.c:259
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s'：无法合并"
-#: builtin/checkout.c:274
+#: builtin/checkout.c:275
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
-#: builtin/checkout.c:374
+#: builtin/checkout.c:375
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "重新创建了 %d 个合并冲突"
msgstr[1] "重新创建了 %d 个合并冲突"
-#: builtin/checkout.c:379
+#: builtin/checkout.c:380
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "从 %2$s 更新了 %1$d 个路径"
msgstr[1] "从 %2$s 更新了 %1$d 个路径"
-#: builtin/checkout.c:386
+#: builtin/checkout.c:387
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "从索引区更新了 %d 个路径"
msgstr[1] "从索引区更新了 %d 个路径"
-#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
-#: builtin/checkout.c:419
+#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416
+#: builtin/checkout.c:420
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路径时使用"
-#: builtin/checkout.c:422 builtin/checkout.c:425
+#: builtin/checkout.c:423 builtin/checkout.c:426
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 不能和 %s 同时使用"
-#: builtin/checkout.c:429
+#: builtin/checkout.c:430
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同时更新路径并切换到分支'%s'。"
-#: builtin/checkout.c:433
+#: builtin/checkout.c:434
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "'%s' 或 '%s' 都没有指定"
-#: builtin/checkout.c:437
+#: builtin/checkout.c:438
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "未指定 '%2$s' 时，必须使用 '%1$s'"
-#: builtin/checkout.c:442 builtin/checkout.c:447
+#: builtin/checkout.c:443 builtin/checkout.c:448
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
-#: builtin/checkout.c:506 builtin/checkout.c:513
+#: builtin/checkout.c:507 builtin/checkout.c:514
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:680
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:729
+#: builtin/checkout.c:730
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"不能继续，下列文件有暂存的修改：\n"
"%s"
-#: builtin/checkout.c:736
-#, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr "下列文件暂存的修改可能会丢失：%s"
-
#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:879 builtin/clone.c:714
+#: builtin/checkout.c:879 builtin/clone.c:713
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
"'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n"
"请使用 --（和可选的 --no-guess）来消除歧义"
-#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
+#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
msgid "missing branch or commit argument"
msgstr "缺少分支或提交参数"
-#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
-#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
-#: builtin/send-pack.c:174
+#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59
+#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285
+#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174
msgid "force progress reporting"
msgstr "强制显示进度报告"
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方合并"
-#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318
msgid "style"
msgstr "风格"
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格（merge 或 diff3）"
-#: builtin/checkout.c:1452 builtin/worktree.c:504
+#: builtin/checkout.c:1452 builtin/worktree.c:503
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
"如果您总是喜欢使用模糊的简短分支名 <name>，而不喜欢如 'origin' 的远程\n"
"仓库名，可以在配置中设置 checkout.defaultRemote=origin。"
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
-#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742
+#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
msgid "branch"
msgstr "分支"
msgid "use overlay mode (default)"
msgstr "使用叠加模式（默认）"
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1743
msgid "create and switch to a new branch"
msgstr "创建并切换一个新分支"
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1745
msgid "create/reset and switch to a branch"
msgstr "创建/重置并切换一个分支"
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1747
msgid "second guess 'git switch <no-such-branch>'"
msgstr "二次猜测 'git switch <无此分支>'"
-#: builtin/checkout.c:1740
+#: builtin/checkout.c:1749
msgid "throw away local modifications"
msgstr "丢弃本地修改"
-#: builtin/checkout.c:1772
+#: builtin/checkout.c:1781
msgid "which tree-ish to checkout from"
msgstr "要检出哪一个树"
-#: builtin/checkout.c:1774
+#: builtin/checkout.c:1783
msgid "restore the index"
msgstr "恢复索引"
-#: builtin/checkout.c:1776
+#: builtin/checkout.c:1785
msgid "restore the working tree (default)"
msgstr "恢复工作区（默认）"
-#: builtin/checkout.c:1778
+#: builtin/checkout.c:1787
msgid "ignore unmerged entries"
msgstr "忽略未合并条目"
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1788
msgid "use overlay mode"
msgstr "使用叠加模式"
msgid "could not lstat %s\n"
msgstr "不能对 %s 调用 lstat\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:301 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"foo - 通过唯一前缀选择一个选项\n"
" - （空）什么也不选择\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:305 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - 选择所有选项\n"
" - （空）结束选择\n"
-#: builtin/clean.c:520 git-add--interactive.perl:568
+#: builtin/clean.c:521 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "嗯（%s）？\n"
-#: builtin/clean.c:662
+#: builtin/clean.c:663
#, c-format
msgid "Input ignore patterns>> "
msgstr "输入模版以排除条目>> "
-#: builtin/clean.c:699
+#: builtin/clean.c:700
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告：无法找到和 %s 匹配的条目"
-#: builtin/clean.c:720
+#: builtin/clean.c:721
msgid "Select items to delete"
msgstr "选择要删除的条目"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:761
+#: builtin/clean.c:762
#, c-format
msgid "Remove %s [y/N]? "
msgstr "删除 %s [y/N]？"
-#: builtin/clean.c:786 git-add--interactive.perl:1763
+#: builtin/clean.c:787 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
-#: builtin/clean.c:794
+#: builtin/clean.c:795
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - 显示本帮助\n"
"? - 显示如何在提示符下选择的帮助"
-#: builtin/clean.c:821 git-add--interactive.perl:1849
+#: builtin/clean.c:822 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: builtin/clean.c:822 git-add--interactive.perl:1846
+#: builtin/clean.c:823 git-add--interactive.perl:1846
msgid "What now"
msgstr "请选择"
-#: builtin/clean.c:830
+#: builtin/clean.c:831
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "将删除如下条目："
msgstr[1] "将删除如下条目："
-#: builtin/clean.c:846
+#: builtin/clean.c:847
msgid "No more files to clean, exiting."
msgstr "没有要清理的文件，退出。"
-#: builtin/clean.c:908
+#: builtin/clean.c:909
msgid "do not print names of files removed"
msgstr "不打印删除文件的名称"
-#: builtin/clean.c:910
+#: builtin/clean.c:911
msgid "force"
msgstr "强制"
-#: builtin/clean.c:911
+#: builtin/clean.c:912
msgid "interactive cleaning"
msgstr "交互式清除"
-#: builtin/clean.c:913
+#: builtin/clean.c:914
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
+#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "模式"
-#: builtin/clean.c:915
+#: builtin/clean.c:916
msgid "add <pattern> to ignore rules"
msgstr "添加 <模式> 到忽略规则"
-#: builtin/clean.c:916
+#: builtin/clean.c:917
msgid "remove ignored files, too"
msgstr "也删除忽略的文件"
-#: builtin/clean.c:918
+#: builtin/clean.c:919
msgid "remove only ignored files"
msgstr "只删除忽略的文件"
-#: builtin/clean.c:936
+#: builtin/clean.c:937
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同时使用"
-#: builtin/clean.c:940
+#: 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:943
+#: 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:46
+#: builtin/clone.c:45
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-#: builtin/clone.c:93
+#: builtin/clone.c:92
msgid "don't create a checkout"
msgstr "不创建一个检出"
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "创建一个纯仓库"
-#: builtin/clone.c:98
+#: builtin/clone.c:97
msgid "create a mirror repository (implies bare)"
msgstr "创建一个镜像仓库（也是纯仓库）"
-#: builtin/clone.c:100
+#: builtin/clone.c:99
msgid "to clone from a local repository"
msgstr "从本地仓库克隆"
-#: builtin/clone.c:102
+#: builtin/clone.c:101
msgid "don't use local hardlinks, always copy"
msgstr "不使用本地硬链接，始终复制"
-#: builtin/clone.c:104
+#: builtin/clone.c:103
msgid "setup as shared repository"
msgstr "设置为共享仓库"
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "pathspec"
msgstr "路径规格"
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "initialize submodules in the clone"
msgstr "在克隆时初始化子模组"
-#: builtin/clone.c:110
+#: builtin/clone.c:109
msgid "number of submodules cloned in parallel"
msgstr "并发克隆的子模组的数量"
-#: builtin/clone.c:111 builtin/init-db.c:486
+#: builtin/clone.c:110 builtin/init-db.c:486
msgid "template-directory"
msgstr "模板目录"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:111 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380
#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "参考仓库"
-#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/clone.c:117 builtin/submodule--helper.c:1382
#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
-#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3314 builtin/repack.c:319
+#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3294 builtin/repack.c:320
msgid "name"
msgstr "名称"
-#: builtin/clone.c:120
+#: builtin/clone.c:119
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
-#: builtin/clone.c:122
+#: builtin/clone.c:121
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "检出 <分支> 而不是远程 HEAD"
-#: builtin/clone.c:124
+#: builtin/clone.c:123
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
-#: builtin/pull.c:226
+#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840
+#: builtin/pull.c:227
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:126
+#: builtin/clone.c:125
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
+#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283
msgid "time"
msgstr "时间"
-#: builtin/clone.c:128
+#: builtin/clone.c:127
msgid "create a shallow clone since a specific time"
msgstr "从一个特定时间创建一个浅克隆"
-#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
-#: builtin/rebase.c:1395
+#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194
+#: builtin/rebase.c:1417
msgid "revision"
msgstr "版本"
-#: builtin/clone.c:130 builtin/fetch.c:157
+#: builtin/clone.c:129 builtin/fetch.c:172
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化浅克隆的历史，除了特定版本"
-#: builtin/clone.c:132
+#: builtin/clone.c:131
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
-#: builtin/clone.c:134
+#: builtin/clone.c:133
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"
-#: builtin/clone.c:136
+#: builtin/clone.c:135
msgid "any cloned submodules will be shallow"
msgstr "子模组将以浅下载模式克隆"
-#: builtin/clone.c:137 builtin/init-db.c:495
+#: builtin/clone.c:136 builtin/init-db.c:495
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:137 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
-#: builtin/clone.c:139
+#: builtin/clone.c:138
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:140
+#: builtin/clone.c:139
msgid "set config inside the new repository"
msgstr "在新仓库中设置配置信息"
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
+#: builtin/push.c:572 builtin/send-pack.c:172
msgid "server-specific"
msgstr "server-specific"
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
+#: builtin/push.c:572 builtin/send-pack.c:173
msgid "option to transmit"
msgstr "传输选项"
-#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
-#: builtin/push.c:586
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240
+#: builtin/push.c:573
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
-#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
-#: builtin/push.c:588
+#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243
+#: builtin/push.c:575
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
-#: builtin/clone.c:149
+#: builtin/clone.c:148
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
-#: builtin/clone.c:285
+#: builtin/clone.c:284
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"无法猜到目录名。\n"
"请在命令行指定一个目录"
-#: builtin/clone.c:338
+#: builtin/clone.c:337
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
-#: builtin/clone.c:411
+#: builtin/clone.c:410
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:428
+#: builtin/clone.c:427
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "无法在 '%s' 上启动迭代器"
-#: builtin/clone.c:453
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "删除 '%s' 失败"
-
-#: builtin/clone.c:458
+#: builtin/clone.c:457
#, c-format
msgid "failed to create link '%s'"
msgstr "创建链接 '%s' 失败"
-#: builtin/clone.c:462
+#: builtin/clone.c:461
#, c-format
msgid "failed to copy file to '%s'"
msgstr "拷贝文件至 '%s' 失败"
-#: builtin/clone.c:467
+#: builtin/clone.c:466
#, c-format
msgid "failed to iterate over '%s'"
msgstr "无法在 '%s' 上迭代"
-#: builtin/clone.c:492
+#: builtin/clone.c:491
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:506
+#: builtin/clone.c:505
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
"'git restore --source=HEAD :/' 重试\n"
-#: builtin/clone.c:583
+#: builtin/clone.c:582
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:702
+#: builtin/clone.c:701
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:752
+#: builtin/clone.c:751
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/clone.c:783
+#: builtin/clone.c:782
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:833
+#: builtin/clone.c:832
msgid "unable to write parameters to config file"
msgstr "无法将参数写入配置文件"
-#: builtin/clone.c:896
+#: builtin/clone.c:895
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:898
+#: builtin/clone.c:897
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:938 builtin/receive-pack.c:1950
+#: builtin/clone.c:937 builtin/receive-pack.c:1948
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:942
+#: builtin/clone.c:941
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:955
+#: builtin/clone.c:954
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:958
+#: builtin/clone.c:957
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:971
+#: builtin/clone.c:970
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:977 builtin/fetch.c:1660
+#: builtin/clone.c:976 builtin/fetch.c:1790
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:987
+#: builtin/clone.c:986
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:997
+#: builtin/clone.c:996
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
-#: builtin/worktree.c:303 builtin/worktree.c:335
+#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271
+#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:1017
+#: builtin/clone.c:1016
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:1037
+#: builtin/clone.c:1036
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:1039
+#: builtin/clone.c:1038
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:1063
+#: builtin/clone.c:1062
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
-#: builtin/clone.c:1124
+#: builtin/clone.c:1123
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1126
+#: builtin/clone.c:1125
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1128
+#: builtin/clone.c:1127
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1130
+#: builtin/clone.c:1129
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1133
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆，忽略 --local"
-#: builtin/clone.c:1138
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1215 builtin/clone.c:1223
+#: builtin/clone.c:1212 builtin/clone.c:1220
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:1226
+#: builtin/clone.c:1223
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
msgstr "父提交对象 ID"
#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
#: builtin/tag.c:412
msgid "message"
msgstr "说明"
msgstr "从文件中读取提交说明"
#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:194 builtin/revert.c:118
+#: builtin/pull.c:195 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG 提交签名"
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
-#: builtin/worktree.c:651
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548
+#: builtin/worktree.c:650
msgid "machine-readable output"
msgstr "机器可读的输出"
msgstr "条目以 NUL 字符结尾"
#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
-#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
+#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332
msgid "mode"
msgstr "模式"
msgstr ""
"显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）"
-#: builtin/commit.c:1362 parse-options.h:179
+#: builtin/commit.c:1362 parse-options.h:188
msgid "when"
msgstr "何时"
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1499 builtin/gc.c:539
+#: builtin/commit.c:1499 builtin/gc.c:538
msgid "date"
msgstr "日期"
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
-#: builtin/pull.c:163 builtin/revert.c:110
+#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289
+#: builtin/pull.c:164 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: 签名"
msgstr "git commit-graph read [--object-dir <对象目录>]"
#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
-msgstr "git commit-graph verify [--object-dir <对象目录>] [--shallow]"
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"
+"[no-]progress]"
#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <split options>"
-msgstr "git commit-graph write [--object-dir <对象目录>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
+msgstr ""
+"git commit-graph write [--object-dir <对象目录>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
-#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
-#: builtin/log.c:1584
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:107
+#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178
+#: builtin/log.c:1585
msgid "dir"
msgstr "目录"
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
-#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
+#: builtin/commit-graph.c:56 builtin/commit-graph.c:108
+#: builtin/commit-graph.c:171 builtin/commit-graph.c:255
msgid "The object directory to store the graph"
msgstr "保存图形的对象目录"
-#: builtin/commit-graph.c:57
+#: builtin/commit-graph.c:58
msgid "if the commit-graph is split, only verify the tip file"
msgstr "如果提交图形被拆分，只验证头一个文件"
-#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#: builtin/commit-graph.c:80 builtin/commit-graph.c:125
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "无法打开提交图形 '%s'"
-#: builtin/commit-graph.c:164
+#: builtin/commit-graph.c:173
msgid "start walk at all refs"
msgstr "开始遍历所有引用"
-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:175
msgid "scan pack-indexes listed by stdin for commits"
msgstr "从标准输入中的包索引文件列表中扫描提交"
-#: builtin/commit-graph.c:168
+#: builtin/commit-graph.c:177
msgid "start walk at commits listed by stdin"
msgstr "从标准输入中的提交开始扫描"
-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:179
msgid "include all commits already in the commit-graph file"
msgstr "包含 commit-graph 文件中已有所有提交"
-#: builtin/commit-graph.c:172
+#: builtin/commit-graph.c:182
msgid "allow writing an incremental commit-graph file"
msgstr "允许写一个增量提交图形文件"
-#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:184 builtin/commit-graph.c:188
msgid "maximum number of commits in a non-base split commit-graph"
msgstr "在非基本拆分提交图形中的最大提交数"
-#: builtin/commit-graph.c:176
+#: builtin/commit-graph.c:186
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "一个拆分提交图形的两个级别之间的最大比率"
-#: builtin/commit-graph.c:191
+#: builtin/commit-graph.c:204
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
msgid "print sizes in human readable format"
msgstr "以用户可读的格式显示大小"
-#: builtin/describe.c:27
+#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<选项>] [<提交号>...]"
-#: builtin/describe.c:28
+#: builtin/describe.c:27
msgid "git describe [<options>] --dirty"
msgstr "git describe [<选项>] --dirty"
-#: builtin/describe.c:63
+#: builtin/describe.c:62
msgid "head"
msgstr "头"
-#: builtin/describe.c:63
+#: builtin/describe.c:62
msgid "lightweight"
msgstr "轻量级的"
-#: builtin/describe.c:63
+#: builtin/describe.c:62
msgid "annotated"
msgstr "附注的"
-#: builtin/describe.c:273
+#: builtin/describe.c:275
#, c-format
msgid "annotated tag %s not available"
msgstr "附注标签 %s 无效"
-#: builtin/describe.c:277
+#: builtin/describe.c:279
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "附注标签 %s 没有嵌入名称"
-#: builtin/describe.c:279
+#: builtin/describe.c:281
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "标签 '%s' 的确是在 '%s'"
-#: builtin/describe.c:323
+#: builtin/describe.c:325
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "没有标签准确匹配 '%s'"
-#: builtin/describe.c:325
+#: builtin/describe.c:327
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n"
-#: builtin/describe.c:379
+#: builtin/describe.c:381
#, c-format
msgid "finished search at %s\n"
msgstr "完成搜索 %s\n"
-#: builtin/describe.c:405
+#: builtin/describe.c:407
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"没有附注标签能描述 '%s'。\n"
"然而，存在未附注标签：尝试 --tags。"
-#: builtin/describe.c:409
+#: builtin/describe.c:411
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"没有标签能描述 '%s'。\n"
"尝试 --always，或者创建一些标签。"
-#: builtin/describe.c:439
+#: builtin/describe.c:441
#, c-format
msgid "traversed %lu commits\n"
msgstr "已遍历 %lu 个提交\n"
-#: builtin/describe.c:442
+#: builtin/describe.c:444
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"发现多于 %i 个标签，列出最近的 %i 个\n"
"在 %s 放弃搜索\n"
-#: builtin/describe.c:510
+#: builtin/describe.c:512
#, c-format
msgid "describe %s\n"
msgstr "描述 %s\n"
-#: builtin/describe.c:513
+#: builtin/describe.c:515
#, c-format
msgid "Not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
-#: builtin/describe.c:521
+#: builtin/describe.c:523
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s 既不是提交也不是数据对象"
-#: builtin/describe.c:535
+#: builtin/describe.c:537
msgid "find the tag that comes after the commit"
msgstr "寻找该提交之后的标签"
-#: builtin/describe.c:536
+#: builtin/describe.c:538
msgid "debug search strategy on stderr"
msgstr "在标准错误上调试搜索策略"
-#: builtin/describe.c:537
+#: builtin/describe.c:539
msgid "use any ref"
msgstr "使用任意引用"
-#: builtin/describe.c:538
+#: builtin/describe.c:540
msgid "use any tag, even unannotated"
msgstr "使用任意标签，即使未附带注释"
-#: builtin/describe.c:539
+#: builtin/describe.c:541
msgid "always use long format"
msgstr "始终使用长提交号格式"
-#: builtin/describe.c:540
+#: builtin/describe.c:542
msgid "only follow first parent"
msgstr "只跟随第一个父提交"
-#: builtin/describe.c:543
+#: builtin/describe.c:545
msgid "only output exact matches"
msgstr "只输出精确匹配"
-#: builtin/describe.c:545
+#: builtin/describe.c:547
msgid "consider <n> most recent tags (default: 10)"
msgstr "考虑最近 <n> 个标签（默认：10）"
-#: builtin/describe.c:547
+#: builtin/describe.c:549
msgid "only consider tags matching <pattern>"
msgstr "只考虑匹配 <模式> 的标签"
-#: builtin/describe.c:549
+#: builtin/describe.c:551
msgid "do not consider tags matching <pattern>"
msgstr "不考虑匹配 <模式> 的标签"
-#: builtin/describe.c:551 builtin/name-rev.c:422
+#: builtin/describe.c:553 builtin/name-rev.c:426
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的提交号作为后备"
-#: builtin/describe.c:552 builtin/describe.c:555
+#: builtin/describe.c:554 builtin/describe.c:557
msgid "mark"
msgstr "标记"
-#: builtin/describe.c:553
+#: builtin/describe.c:555
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
-#: builtin/describe.c:556
+#: builtin/describe.c:558
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
-#: builtin/describe.c:574
+#: builtin/describe.c:576
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 与 --abbrev=0 不兼容"
-#: builtin/describe.c:603
+#: builtin/describe.c:605
msgid "No names found, cannot describe anything."
msgstr "没有发现名称，无法描述任何东西。"
-#: builtin/describe.c:654
+#: builtin/describe.c:656
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty 与提交号不兼容"
-#: builtin/describe.c:656
+#: builtin/describe.c:658
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken 与提交号不兼容"
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
-#: builtin/difftool.c:253
+#: builtin/difftool.c:260
#, c-format
msgid "failed: %d"
msgstr "失败：%d"
-#: builtin/difftool.c:295
+#: builtin/difftool.c:302
#, c-format
msgid "could not read symlink %s"
msgstr "无法读取符号链接 %s"
-#: builtin/difftool.c:297
+#: builtin/difftool.c:304
#, c-format
msgid "could not read symlink file %s"
msgstr "无法读取符号链接文件 %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:312
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
-#: builtin/difftool.c:406
+#: builtin/difftool.c:413
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:634
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "两个文件都被修改：'%s' 和 '%s'。"
-#: builtin/difftool.c:628
+#: builtin/difftool.c:636
msgid "working tree file has been left."
msgstr "工作区文件被留了下来。"
-#: builtin/difftool.c:639
+#: builtin/difftool.c:647
#, c-format
msgid "temporary files exist in '%s'."
msgstr "临时文件存在于 '%s'。"
-#: builtin/difftool.c:640
+#: builtin/difftool.c:648
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者恢复它们。"
-#: builtin/difftool.c:689
+#: builtin/difftool.c:697
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:699
msgid "perform a full-directory diff"
msgstr "执行一个全目录差异比较"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:701
msgid "do not prompt before launching a diff tool"
msgstr "启动差异比较工具之前不提示"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:706
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符号链接"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:707
msgid "tool"
msgstr "工具"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:708
msgid "use the specified diff tool"
msgstr "使用指定的差异比较工具"
-#: builtin/difftool.c:702
+#: builtin/difftool.c:710
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
-#: builtin/difftool.c:705
+#: 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:716
msgid "specify a custom command for viewing diffs"
msgstr "指定一个用于查看差异的自定义命令"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:717
msgid "passed to `diff`"
msgstr "传递给 `diff`"
-#: builtin/difftool.c:724
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "difftool 要求工作区或者 --no-index"
-#: builtin/difftool.c:731
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff 和 --no-index 不兼容"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui、--tool 和 --extcmd 互斥"
-#: builtin/difftool.c:742
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "没有为 --tool=<工具> 参数提供 <工具>"
-#: builtin/difftool.c:749
+#: builtin/difftool.c:757
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:1124
+#: builtin/fast-export.c:852
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。"
+
+#: builtin/fast-export.c:1152
msgid "show progress after <n> objects"
msgstr "在 <n> 个对象之后显示进度"
-#: builtin/fast-export.c:1126
+#: builtin/fast-export.c:1154
msgid "select handling of signed tags"
msgstr "选择如何处理签名标签"
-#: builtin/fast-export.c:1129
+#: builtin/fast-export.c:1157
msgid "select handling of tags that tag filtered objects"
msgstr "选择当标签指向被过滤对象时该标签的处理方式"
-#: builtin/fast-export.c:1132
+#: builtin/fast-export.c:1160
msgid "select handling of commit messages in an alternate encoding"
msgstr "选择使用备用编码处理提交说明"
-#: builtin/fast-export.c:1135
+#: builtin/fast-export.c:1163
msgid "Dump marks to this file"
msgstr "把标记存储到这个文件"
-#: builtin/fast-export.c:1137
+#: builtin/fast-export.c:1165
msgid "Import marks from this file"
msgstr "从这个文件导入标记"
-#: builtin/fast-export.c:1139
+#: builtin/fast-export.c:1169
+msgid "Import marks from this file if it exists"
+msgstr "从该文件导入标记（如果存在的话）"
+
+#: builtin/fast-export.c:1171
msgid "Fake a tagger when tags lack one"
msgstr "当标签缺少标记者字段时，假装提供一个"
-#: builtin/fast-export.c:1141
+#: builtin/fast-export.c:1173
msgid "Output full tree for each commit"
msgstr "每次提交都输出整个树"
-#: builtin/fast-export.c:1143
+#: builtin/fast-export.c:1175
msgid "Use the done feature to terminate the stream"
msgstr "使用 done 功能来终止流"
-#: builtin/fast-export.c:1144
+#: builtin/fast-export.c:1176
msgid "Skip output of blob data"
msgstr "跳过数据对象的输出"
-#: builtin/fast-export.c:1145 builtin/log.c:1632
+#: builtin/fast-export.c:1177 builtin/log.c:1633
msgid "refspec"
msgstr "引用规格"
-#: builtin/fast-export.c:1146
+#: builtin/fast-export.c:1178
msgid "Apply refspec to exported refs"
msgstr "对导出的引用应用引用规格"
-#: builtin/fast-export.c:1147
+#: builtin/fast-export.c:1179
msgid "anonymize output"
msgstr "匿名输出"
-#: builtin/fast-export.c:1149
+#: builtin/fast-export.c:1181
msgid "Reference parents which are not in fast-export stream by object id"
msgstr "引用父对象 ID 不在 fast-export 流中"
-#: builtin/fast-export.c:1151
+#: builtin/fast-export.c:1183
msgid "Show original object ids of blobs/commits"
msgstr "显示数据对象/提交的原始对象 ID"
-#: builtin/fetch.c:30
+#: builtin/fast-export.c:1185
+msgid "Label tags with mark ids"
+msgstr "对带有标记 ID 的标签做标记"
+
+#: builtin/fast-export.c:1220
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists"
+
+#: builtin/fetch.c:34
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:35
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<选项>] <组>"
-#: builtin/fetch.c:32
+#: builtin/fetch.c:36
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
-#: builtin/fetch.c:33
+#: builtin/fetch.c:37
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<选项>]"
-#: builtin/fetch.c:125 builtin/pull.c:203
+#: builtin/fetch.c:115
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel 不能为负数"
+
+#: builtin/fetch.c:138 builtin/pull.c:204
msgid "fetch from all remotes"
msgstr "从所有的远程抓取"
-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:140 builtin/pull.c:248
+msgid "set upstream for git pull/fetch"
+msgstr "为 git pull/fetch 设置上游"
+
+#: builtin/fetch.c:142 builtin/pull.c:207
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
-#: builtin/fetch.c:129 builtin/pull.c:209
+#: builtin/fetch.c:144 builtin/pull.c:210
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:145
msgid "force overwrite of local reference"
msgstr "强制覆盖本地引用"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:147
msgid "fetch from multiple remotes"
msgstr "从多个远程抓取"
-#: builtin/fetch.c:134 builtin/pull.c:213
+#: builtin/fetch.c:149 builtin/pull.c:214
msgid "fetch all tags and associated objects"
msgstr "抓取所有的标签和关联对象"
-#: builtin/fetch.c:136
+#: builtin/fetch.c:151
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何标签(--no-tags)"
-#: builtin/fetch.c:138
+#: builtin/fetch.c:153
msgid "number of submodules fetched in parallel"
msgstr "子模组获取的并发数"
-#: builtin/fetch.c:140 builtin/pull.c:216
+#: builtin/fetch.c:155 builtin/pull.c:217
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已经不存在的分支的跟踪分支"
-#: builtin/fetch.c:142
+#: builtin/fetch.c:157
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "清除远程不存在的本地标签，并且替换变更标签"
# 译者：可选值，不能翻译
-#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:144
+#: builtin/fetch.c:159
msgid "control recursive fetching of submodules"
msgstr "控制子模组的递归抓取"
-#: builtin/fetch.c:148 builtin/pull.c:224
+#: builtin/fetch.c:163 builtin/pull.c:225
msgid "keep downloaded pack"
msgstr "保持下载包"
-#: builtin/fetch.c:150
+#: builtin/fetch.c:165
msgid "allow updating of HEAD ref"
msgstr "允许更新 HEAD 引用"
-#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历史"
-#: builtin/fetch.c:155
+#: builtin/fetch.c:170
msgid "deepen history of shallow repository based on time"
msgstr "基于时间来深化浅克隆的历史"
-#: builtin/fetch.c:161 builtin/pull.c:230
+#: builtin/fetch.c:176 builtin/pull.c:231
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:179
msgid "prepend this to submodule path output"
msgstr "在子模组路径输出的前面加上此目录"
-#: builtin/fetch.c:167
+#: builtin/fetch.c:182
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
-#: builtin/fetch.c:171 builtin/pull.c:233
+#: builtin/fetch.c:186 builtin/pull.c:234
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:172 builtin/pull.c:235
+#: builtin/fetch.c:187 builtin/pull.c:236
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:173 builtin/pull.c:236
+#: builtin/fetch.c:188 builtin/pull.c:237
msgid "specify fetch refmap"
msgstr "指定获取操作的引用映射"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:195
msgid "report that we have only objects reachable from this object"
msgstr "报告我们只拥有从该对象开始可达的对象"
-#: builtin/fetch.c:183
+#: builtin/fetch.c:198
msgid "run 'gc --auto' after fetching"
msgstr "获取后执行 'gc --auto'"
-#: builtin/fetch.c:185 builtin/pull.c:245
+#: builtin/fetch.c:200 builtin/pull.c:246
msgid "check for forced-updates on all updated branches"
msgstr "在所有更新分支上检查强制更新"
-#: builtin/fetch.c:491
+#: builtin/fetch.c:510
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
-#: builtin/fetch.c:630
+#: builtin/fetch.c:650
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "配置变量 fetch.output 包含无效值 %s"
-#: builtin/fetch.c:728
+#: builtin/fetch.c:748
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"
-#: builtin/fetch.c:732
+#: builtin/fetch.c:752
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
+#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853
msgid "[rejected]"
msgstr "[已拒绝]"
-#: builtin/fetch.c:746
+#: builtin/fetch.c:766
msgid "can't fetch in current branch"
msgstr "当前分支下不能执行获取操作"
-#: builtin/fetch.c:756
+#: builtin/fetch.c:776
msgid "[tag update]"
msgstr "[标签更新]"
-#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
-#: builtin/fetch.c:828
+#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836
+#: builtin/fetch.c:848
msgid "unable to update local ref"
msgstr "不能更新本地引用"
-#: builtin/fetch.c:761
+#: builtin/fetch.c:781
msgid "would clobber existing tag"
msgstr "会破坏现有的标签"
-#: builtin/fetch.c:783
+#: builtin/fetch.c:803
msgid "[new tag]"
msgstr "[新标签]"
-#: builtin/fetch.c:786
+#: builtin/fetch.c:806
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:789
+#: builtin/fetch.c:809
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:828
+#: builtin/fetch.c:848
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:833
+#: builtin/fetch.c:853
msgid "non-fast-forward"
msgstr "非快进"
-#: builtin/fetch.c:854
+#: builtin/fetch.c:874
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
"要重新启用，请使用 '--show-forced-updates' 选项或运行\n"
"'git config fetch.showForcedUpdates true'。"
-#: builtin/fetch.c:858
+#: builtin/fetch.c:878
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
-#: builtin/fetch.c:888
+#: builtin/fetch.c:908
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必需的对象\n"
-#: builtin/fetch.c:909
+#: builtin/fetch.c:929
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆不允许被更新"
-#: builtin/fetch.c:1000 builtin/fetch.c:1131
+#: builtin/fetch.c:1020 builtin/fetch.c:1157
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:1011
+#: builtin/fetch.c:1031
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者：注意保持前导空格
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1127
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 将成为悬空状态）"
# 译者：注意保持前导空格
-#: builtin/fetch.c:1102
+#: builtin/fetch.c:1128
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成为悬空状态）"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1160
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:1135 builtin/remote.c:1036
+#: builtin/fetch.c:1161 builtin/remote.c:1036
msgid "(none)"
msgstr "（无）"
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1184
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非纯仓库的当前分支 %s"
-#: builtin/fetch.c:1177
+#: builtin/fetch.c:1203
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:1180
+#: builtin/fetch.c:1206
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:1484
+#: builtin/fetch.c:1414
+msgid "multiple branch detected, incompatible with --set-upstream"
+msgstr "检测到多分支，和 --set-upstream 不兼容"
+
+#: builtin/fetch.c:1429
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "没有为一个远程跟踪分支设置上游"
+
+#: builtin/fetch.c:1431
+msgid "not setting upstream for a remote tag"
+msgstr "没有为一个远程标签设置上游"
+
+#: builtin/fetch.c:1433
+msgid "unknown branch type"
+msgstr "未知的分支类型"
+
+#: builtin/fetch.c:1435
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"未发现源分支。\n"
+"您需要使用 --set-upstream 选项指定一个分支。"
+
+#: builtin/fetch.c:1561 builtin/fetch.c:1623
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:1486 builtin/remote.c:100
+#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:1532
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialClone"
-msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
+#: builtin/fetch.c:1583
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "无法获取 '%s'（退出码：%d）\n"
-#: builtin/fetch.c:1556
+#: builtin/fetch.c:1685
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:1593
+#: builtin/fetch.c:1722
msgid "You need to specify a tag name."
msgstr "您需要指定一个标签名称。"
-#: builtin/fetch.c:1644
+#: builtin/fetch.c:1774
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 不支持负数深度"
-#: builtin/fetch.c:1646
+#: builtin/fetch.c:1776
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/fetch.c:1651
+#: builtin/fetch.c:1781
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1783
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
-#: builtin/fetch.c:1669
+#: builtin/fetch.c:1799
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/fetch.c:1671
+#: builtin/fetch.c:1801
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/fetch.c:1680
+#: builtin/fetch.c:1810
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组：%s"
-#: builtin/fetch.c:1687
+#: builtin/fetch.c:1817
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
-#: builtin/fetch.c:1703
+#: builtin/fetch.c:1835
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "无效的参数：期望 sha1，得到 '%s'"
-#: builtin/gc.c:34
+#: builtin/gc.c:35
msgid "git gc [<options>]"
msgstr "git gc [<选项>]"
msgid "failed to parse '%s' value '%s'"
msgstr "无法解析 '%s' 值 '%s'"
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/gc.c:492
+#: builtin/gc.c:491
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:540
+#: builtin/gc.c:539
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
-#: builtin/gc.c:542
+#: builtin/gc.c:541
msgid "be more thorough (increased runtime)"
msgstr "更彻底（增加运行时间）"
-#: builtin/gc.c:543
+#: builtin/gc.c:542
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
-#: builtin/gc.c:546
+#: builtin/gc.c:545
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
-#: builtin/gc.c:549
+#: builtin/gc.c:548
msgid "repack all other packs except the largest pack"
msgstr "除了最大的包之外，对所有其它包文件重新打包"
-#: builtin/gc.c:566
+#: builtin/gc.c:565
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "解析 gc.logexpiry 的值 %s 失败"
-#: builtin/gc.c:577
+#: builtin/gc.c:576
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "解析清除期限值 %s 失败"
-#: builtin/gc.c:597
+#: builtin/gc.c:596
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
-#: builtin/gc.c:599
+#: builtin/gc.c:598
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/gc.c:600
+#: builtin/gc.c:599
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护参见 \"git help gc\"。\n"
-#: builtin/gc.c:640
+#: builtin/gc.c:639
#, 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:695
+#: builtin/gc.c:694
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
#. grep.threads
#.
#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2728
+#: builtin/pack-objects.c:2708
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支持，忽略 %s"
-#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
+#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树（%s）"
-#: builtin/grep.c:648
+#: builtin/grep.c:650
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:714
+#: builtin/grep.c:716
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:813
+#: builtin/grep.c:815
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
-#: builtin/grep.c:815
+#: builtin/grep.c:817
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/grep.c:817
+#: builtin/grep.c:819
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/grep.c:819
+#: builtin/grep.c:821
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/grep.c:821
+#: builtin/grep.c:823
msgid "recursively search in each submodule"
msgstr "在每一个子模组中递归搜索"
-#: builtin/grep.c:824
+#: builtin/grep.c:826
msgid "show non-matching lines"
msgstr "显示未匹配的行"
-#: builtin/grep.c:826
+#: builtin/grep.c:828
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
-#: builtin/grep.c:828
+#: builtin/grep.c:830
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
-#: builtin/grep.c:830
+#: builtin/grep.c:832
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
-#: builtin/grep.c:832
+#: builtin/grep.c:834
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
-#: builtin/grep.c:835
+#: builtin/grep.c:837
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/grep.c:837
+#: builtin/grep.c:839
msgid "search in subdirectories (default)"
msgstr "在子目录中寻找（默认）"
-#: builtin/grep.c:839
+#: builtin/grep.c:841
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:843
+#: builtin/grep.c:845
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:846
+#: builtin/grep.c:848
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式（默认）"
-#: builtin/grep.c:849
+#: builtin/grep.c:851
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:852
+#: builtin/grep.c:854
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:855
+#: builtin/grep.c:857
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:856
+#: builtin/grep.c:858
msgid "show column number of first match"
msgstr "显示第一个匹配的列号"
-#: builtin/grep.c:857
+#: builtin/grep.c:859
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:858
+#: builtin/grep.c:860
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:860
+#: builtin/grep.c:862
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:862
+#: builtin/grep.c:864
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:864
+#: builtin/grep.c:866
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:867
+#: builtin/grep.c:869
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:869
+#: builtin/grep.c:871
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:872
+#: builtin/grep.c:874
msgid "show only matching parts of a line"
msgstr "只显示行中的匹配的部分"
-#: builtin/grep.c:874
+#: builtin/grep.c:876
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数，而不显示匹配的行"
-#: builtin/grep.c:875
+#: builtin/grep.c:877
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:877
+#: builtin/grep.c:879
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:879
+#: builtin/grep.c:881
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:882
+#: builtin/grep.c:884
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:885
+#: builtin/grep.c:887
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:887
+#: builtin/grep.c:889
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:889
+#: builtin/grep.c:891
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
-#: builtin/grep.c:890
+#: builtin/grep.c:892
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:893
+#: builtin/grep.c:895
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:895
+#: builtin/grep.c:897
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:898
+#: builtin/grep.c:900
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:900
+#: builtin/grep.c:902
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:902
+#: builtin/grep.c:904
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:914
+#: builtin/grep.c:916
msgid "indicate hit with exit status without output"
msgstr "不输出，而用退出码标识命中状态"
-#: builtin/grep.c:916
+#: builtin/grep.c:918
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:918
+#: builtin/grep.c:920
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达式的解析树"
-#: builtin/grep.c:922
+#: builtin/grep.c:924
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:922
+#: builtin/grep.c:924
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:926
+#: builtin/grep.c:928
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)（本次构建忽略）"
-#: builtin/grep.c:990
+#: builtin/grep.c:992
msgid "no pattern given"
msgstr "未提供匹配模式"
-#: builtin/grep.c:1026
+#: builtin/grep.c:1028
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同时使用"
-#: builtin/grep.c:1034
+#: builtin/grep.c:1036
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本：%s"
-#: builtin/grep.c:1065
+#: builtin/grep.c:1067
msgid "invalid option combination, ignoring --threads"
msgstr "无效的选项组合，忽略 --threads"
-#: builtin/grep.c:1068 builtin/pack-objects.c:3416
+#: builtin/grep.c:1070 builtin/pack-objects.c:3400
msgid "no threads support, ignoring --threads"
msgstr "没有线程支持，忽略 --threads"
-#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
+#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效（%d）"
-#: builtin/grep.c:1094
+#: builtin/grep.c:1096
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:1117
+#: builtin/grep.c:1119
msgid "option not supported with --recurse-submodules"
msgstr "选项不支持和 --recurse-submodules 共用"
-#: builtin/grep.c:1123
+#: builtin/grep.c:1125
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
-#: builtin/grep.c:1129
+#: builtin/grep.c:1131
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
-#: builtin/grep.c:1137
+#: builtin/grep.c:1139
msgid "both --cached and trees are given"
msgstr "同时给出了 --cached 和树对象"
msgid "Resolving deltas"
msgstr "处理 delta 中"
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
#, c-format
msgid "unable to create thread: %s"
msgstr "不能创建线程：%s"
msgid "cannot store index file"
msgstr "无法存储索引文件"
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "坏的 pack.indexversion=%<PRIu32>"
msgid "git show %s: bad file"
msgstr "git show %s: 损坏的文件"
-#: builtin/log.c:549 builtin/log.c:643
+#: builtin/log.c:549 builtin/log.c:644
#, c-format
msgid "could not read object %s"
msgstr "不能读取对象 %s"
-#: builtin/log.c:668
+#: builtin/log.c:669
#, c-format
msgid "unknown type: %d"
msgstr "未知类型：%d"
-#: builtin/log.c:791
+#: builtin/log.c:792
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:908
+#: builtin/log.c:909
msgid "name of output directory is too long"
msgstr "输出目录名太长"
-#: builtin/log.c:924
+#: builtin/log.c:925
#, c-format
msgid "cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:941
+#: builtin/log.c:942
msgid "need exactly one range"
msgstr "只需要一个范围"
-#: builtin/log.c:951
+#: builtin/log.c:952
msgid "not a range"
msgstr "不是一个范围"
-#: builtin/log.c:1074
+#: builtin/log.c:1075
msgid "cover letter needs email format"
msgstr "附函需要邮件地址格式"
-#: builtin/log.c:1080
+#: builtin/log.c:1081
msgid "failed to create cover-letter file"
msgstr "无法创建附函文件"
-#: builtin/log.c:1159
+#: builtin/log.c:1160
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:1186
+#: builtin/log.c:1187
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1244
+#: builtin/log.c:1245
msgid "two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
+#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
#, c-format
msgid "unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1366 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "无法将 '%s' 解析为一个有效引用"
-#: builtin/log.c:1370
+#: builtin/log.c:1371
msgid "could not find exact merge base"
msgstr "不能找到准确的合并基线"
-#: builtin/log.c:1374
+#: builtin/log.c:1375
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=<基线提交> 手动指定一个基线提交"
-#: builtin/log.c:1394
+#: builtin/log.c:1395
msgid "failed to find exact merge base"
msgstr "无法找到准确的合并基线"
-#: builtin/log.c:1405
+#: builtin/log.c:1406
msgid "base commit should be the ancestor of revision list"
msgstr "基线提交应该是版本列表的祖先"
-#: builtin/log.c:1409
+#: builtin/log.c:1410
msgid "base commit shouldn't be in revision list"
msgstr "基线提交不应该出现在版本列表中"
-#: builtin/log.c:1462
+#: builtin/log.c:1463
msgid "cannot get patch id"
msgstr "无法得到补丁 id"
-#: builtin/log.c:1514
+#: builtin/log.c:1515
msgid "failed to infer range-diff ranges"
msgstr "无法推断 range-diff 范围"
-#: builtin/log.c:1559
+#: builtin/log.c:1560
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一个补丁"
-#: builtin/log.c:1562
+#: builtin/log.c:1563
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多个补丁"
-#: builtin/log.c:1566
+#: builtin/log.c:1567
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1568
+#: builtin/log.c:1569
msgid "generate a cover letter"
msgstr "生成一封附函"
-#: builtin/log.c:1570
+#: builtin/log.c:1571
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1571
+#: builtin/log.c:1572
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1572
+#: builtin/log.c:1573
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1574
+#: builtin/log.c:1575
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号，而不是1"
-#: builtin/log.c:1576
+#: builtin/log.c:1577
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1578
+#: builtin/log.c:1579
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1581
+#: builtin/log.c:1582
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1584
+#: builtin/log.c:1585
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1587
+#: builtin/log.c:1588
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1590
+#: builtin/log.c:1591
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1592
+#: builtin/log.c:1593
msgid "output all-zero hash in From header"
msgstr "在 From 头信息中输出全为零的哈希值"
-#: builtin/log.c:1594
+#: builtin/log.c:1595
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1596
+#: builtin/log.c:1597
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的（补丁+状态）"
-#: builtin/log.c:1598
+#: builtin/log.c:1599
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1599
+#: builtin/log.c:1600
msgid "header"
msgstr "header"
-#: builtin/log.c:1600
+#: builtin/log.c:1601
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1601 builtin/log.c:1603
+#: builtin/log.c:1602 builtin/log.c:1604
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1601
+#: builtin/log.c:1602
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1603
+#: builtin/log.c:1604
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1605
+#: builtin/log.c:1606
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1606
+#: builtin/log.c:1607
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
-#: builtin/log.c:1608
+#: builtin/log.c:1609
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1609
+#: builtin/log.c:1610
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
-#: builtin/log.c:1610 builtin/log.c:1613
+#: builtin/log.c:1611 builtin/log.c:1614
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1611
+#: builtin/log.c:1612
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1614
+#: builtin/log.c:1615
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1618
+#: builtin/log.c:1619
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索，风格：浅，深"
-#: builtin/log.c:1620
+#: builtin/log.c:1621
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1621
+#: builtin/log.c:1622
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1622
+#: builtin/log.c:1623
msgid "base-commit"
msgstr "基线提交"
-#: builtin/log.c:1623
+#: builtin/log.c:1624
msgid "add prerequisite tree info to the patch series"
msgstr "为补丁列表添加前置树信息"
-#: builtin/log.c:1625
+#: builtin/log.c:1626
msgid "add a signature from a file"
msgstr "从文件添加一个签名"
-#: builtin/log.c:1626
+#: builtin/log.c:1627
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1628
+#: builtin/log.c:1629
msgid "show progress while generating patches"
msgstr "在生成补丁时显示进度"
-#: builtin/log.c:1630
+#: builtin/log.c:1631
msgid "show changes against <rev> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <rev> 的差异"
-#: builtin/log.c:1633
+#: builtin/log.c:1634
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
-#: builtin/log.c:1635
+#: builtin/log.c:1636
msgid "percentage by which creation is weighted"
msgstr "创建权重的百分比"
-#: builtin/log.c:1710
+#: builtin/log.c:1711
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识：%s"
-#: builtin/log.c:1725
+#: builtin/log.c:1726
msgid "-n and -k are mutually exclusive"
msgstr "-n 和 -k 互斥"
-#: builtin/log.c:1727
+#: builtin/log.c:1728
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc 和 -k 互斥"
-#: builtin/log.c:1735
+#: builtin/log.c:1736
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1737
+#: builtin/log.c:1738
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1739
+#: builtin/log.c:1740
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1771
+#: builtin/log.c:1773
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录，哪一个？"
-#: builtin/log.c:1860
+#: builtin/log.c:1877
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff 需要 --cover-letter 或单一补丁"
-#: builtin/log.c:1864
+#: builtin/log.c:1881
msgid "Interdiff:"
msgstr "版本间差异："
-#: builtin/log.c:1865
+#: builtin/log.c:1882
#, c-format
msgid "Interdiff against v%d:"
msgstr "对 v%d 的版本差异："
-#: builtin/log.c:1871
+#: builtin/log.c:1888
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor 需要 --range-diff"
-#: builtin/log.c:1875
+#: builtin/log.c:1892
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff 需要 --cover-letter 或单一补丁"
-#: builtin/log.c:1883
+#: builtin/log.c:1900
msgid "Range-diff:"
msgstr "范围差异："
-#: builtin/log.c:1884
+#: builtin/log.c:1901
#, c-format
msgid "Range-diff against v%d:"
msgstr "对 v%d 的范围差异："
-#: builtin/log.c:1895
+#: builtin/log.c:1912
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读取签名文件 '%s'"
-#: builtin/log.c:1931
+#: builtin/log.c:1948
msgid "Generating patches"
msgstr "生成补丁"
-#: builtin/log.c:1975
+#: builtin/log.c:1992
msgid "failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:2034
+#: builtin/log.c:2051
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:2088
+#: builtin/log.c:2105
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgid "do not print remote URL"
msgstr "不打印远程 URL"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488
msgid "exec"
msgstr "exec"
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有："
-#: builtin/merge.c:244 builtin/pull.c:151
+#: builtin/merge.c:244 builtin/pull.c:152
msgid "do not show a diffstat at the end of the merge"
msgstr "在合并的最后不显示差异统计"
-#: builtin/merge.c:247 builtin/pull.c:154
+#: builtin/merge.c:247 builtin/pull.c:155
msgid "show a diffstat at the end of the merge"
msgstr "在合并的最后显示差异统计"
-#: builtin/merge.c:248 builtin/pull.c:157
+#: builtin/merge.c:248 builtin/pull.c:158
msgid "(synonym to --stat)"
msgstr "（和 --stat 同义）"
-#: builtin/merge.c:250 builtin/pull.c:160
+#: builtin/merge.c:250 builtin/pull.c:161
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
-#: builtin/merge.c:253 builtin/pull.c:166
+#: builtin/merge.c:253 builtin/pull.c:167
msgid "create a single commit instead of doing a merge"
msgstr "创建一个单独的提交而不是做一次合并"
-#: builtin/merge.c:255 builtin/pull.c:169
+#: builtin/merge.c:255 builtin/pull.c:170
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合并成功，执行一次提交（默认）"
-#: builtin/merge.c:257 builtin/pull.c:172
+#: builtin/merge.c:257 builtin/pull.c:173
msgid "edit message before committing"
msgstr "在提交前编辑提交说明"
msgid "allow fast-forward (default)"
msgstr "允许快进（默认）"
-#: builtin/merge.c:261 builtin/pull.c:179
+#: builtin/merge.c:261 builtin/pull.c:180
msgid "abort if fast-forward is not possible"
msgstr "如果不能快进就放弃合并"
-#: builtin/merge.c:265 builtin/pull.c:182
+#: builtin/merge.c:265 builtin/pull.c:183
msgid "verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
-#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187
+#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:267 builtin/pull.c:187
+#: builtin/merge.c:267 builtin/pull.c:188
msgid "merge strategy to use"
msgstr "要使用的合并策略"
-#: builtin/merge.c:268 builtin/pull.c:190
+#: builtin/merge.c:268 builtin/pull.c:191
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:269 builtin/pull.c:191
+#: builtin/merge.c:269 builtin/pull.c:192
msgid "option for selected merge strategy"
msgstr "所选的合并策略的选项"
msgid "continue the current in-progress merge"
msgstr "继续当前正在进行的合并"
-#: builtin/merge.c:284 builtin/pull.c:198
+#: builtin/merge.c:284 builtin/pull.c:199
msgid "allow merging unrelated histories"
msgstr "允许合并不相关的历史"
#: builtin/merge.c:290
-msgid "verify commit-msg hook"
-msgstr "æ ¡éª\8c commit-msg é\92©å\90"
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "ç»\95è¿\87 pre-merge-commit å\92\8c commit-msg é\92©å\90"
#: builtin/merge.c:307
msgid "could not run stash."
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
-#: builtin/merge.c:708
+#: builtin/merge.c:705
msgid "Not handling anything other than two heads merge."
msgstr "未处理两个头合并之外的任何操作。"
-#: builtin/merge.c:722
+#: builtin/merge.c:719
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive 的未知选项：-X%s"
-#: builtin/merge.c:737
+#: builtin/merge.c:734
#, c-format
msgid "unable to write %s"
msgstr "不能写 %s"
-#: builtin/merge.c:789
+#: builtin/merge.c:786
#, c-format
msgid "Could not read from '%s'"
msgstr "不能从 '%s' 读取"
-#: builtin/merge.c:798
+#: builtin/merge.c:795
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
-#: builtin/merge.c:804
+#: builtin/merge.c:801
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"合并到主题分支。\n"
"\n"
-#: builtin/merge.c:809
+#: builtin/merge.c:806
msgid "An empty message aborts the commit.\n"
msgstr "空的提交说明会终止提交。\n"
-#: builtin/merge.c:812
+#: builtin/merge.c:809
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n"
-#: builtin/merge.c:853
+#: builtin/merge.c:862
msgid "Empty commit message."
msgstr "空提交信息。"
-#: builtin/merge.c:872
+#: builtin/merge.c:877
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:933
+#: builtin/merge.c:938
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
-#: builtin/merge.c:972
+#: builtin/merge.c:977
msgid "No current branch."
msgstr "没有当前分支。"
-#: builtin/merge.c:974
+#: builtin/merge.c:979
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程仓库。"
-#: builtin/merge.c:976
+#: builtin/merge.c:981
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/merge.c:981
+#: builtin/merge.c:986
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/merge.c:1038
+#: builtin/merge.c:1043
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
-#: builtin/merge.c:1141
+#: builtin/merge.c:1146
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合并：%s"
-#: builtin/merge.c:1175
+#: builtin/merge.c:1180
msgid "not something we can merge"
msgstr "不能合并"
-#: builtin/merge.c:1278
+#: builtin/merge.c:1283
msgid "--abort expects no arguments"
msgstr "--abort 不带参数"
-#: builtin/merge.c:1282
+#: builtin/merge.c:1287
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1291
+#: builtin/merge.c:1296
msgid "--quit expects no arguments"
msgstr "--quit 不带参数"
-#: builtin/merge.c:1304
+#: builtin/merge.c:1309
msgid "--continue expects no arguments"
msgstr "--continue 不带参数"
-#: builtin/merge.c:1308
+#: builtin/merge.c:1313
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1324
+#: builtin/merge.c:1329
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1331
+#: builtin/merge.c:1336
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:1334
+#: builtin/merge.c:1339
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
-#: builtin/merge.c:1348
+#: builtin/merge.c:1353
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 和 --no-ff 组合使用。"
-#: builtin/merge.c:1350
+#: builtin/merge.c:1355
msgid "You cannot combine --squash with --commit."
msgstr "您不能将 --squash 和 --commit 组合使用。"
-#: builtin/merge.c:1366
+#: builtin/merge.c:1371
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1383
+#: builtin/merge.c:1388
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
-#: builtin/merge.c:1385
+#: builtin/merge.c:1390
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
-#: builtin/merge.c:1390
+#: builtin/merge.c:1395
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
-#: builtin/merge.c:1392
+#: builtin/merge.c:1397
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
-#: builtin/merge.c:1471
+#: builtin/merge.c:1476
msgid "refusing to merge unrelated histories"
msgstr "拒绝合并无关的历史"
-#: builtin/merge.c:1480
+#: builtin/merge.c:1485
msgid "Already up to date."
msgstr "已经是最新的。"
-#: builtin/merge.c:1490
+#: builtin/merge.c:1495
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1532
+#: builtin/merge.c:1537
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1539
+#: builtin/merge.c:1544
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1564
+#: builtin/merge.c:1569
msgid "Already up to date. Yeeah!"
msgstr "已经是最新的。耶！"
-#: builtin/merge.c:1570
+#: builtin/merge.c:1575
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进，终止。"
-#: builtin/merge.c:1593 builtin/merge.c:1658
+#: builtin/merge.c:1598 builtin/merge.c:1663
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1597
+#: builtin/merge.c:1602
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1649
+#: builtin/merge.c:1654
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1651
+#: builtin/merge.c:1656
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1660
+#: builtin/merge.c:1665
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1672
+#: builtin/merge.c:1677
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n"
msgid "set labels for file1/orig-file/file2"
msgstr "为 文件1/初始文件/文件2 设置标签"
-#: builtin/merge-recursive.c:46
+#: builtin/merge-recursive.c:47
#, c-format
msgid "unknown option %s"
msgstr "未知选项 %s"
-#: builtin/merge-recursive.c:52
+#: builtin/merge-recursive.c:53
#, c-format
msgid "could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: builtin/merge-recursive.c:56
+#: builtin/merge-recursive.c:57
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
-#: builtin/merge-recursive.c:64
+#: builtin/merge-recursive.c:65
msgid "not handling anything other than two heads merge."
msgstr "不能处理两个头合并之外的任何操作。"
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
#, c-format
msgid "could not resolve ref '%s'"
msgstr "无法解析引用 '%s'"
-#: builtin/merge-recursive.c:78
+#: builtin/merge-recursive.c:82
#, c-format
msgid "Merging %s with %s\n"
msgstr "合并 %s 和 %s\n"
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
-#: builtin/name-rev.c:352
+#: builtin/name-rev.c:356
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<选项>] <提交>..."
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:357
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<选项>] --all"
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:358
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<选项>] --stdin"
-#: builtin/name-rev.c:411
+#: builtin/name-rev.c:415
msgid "print only names (no SHA-1)"
msgstr "只打印名称（无 SHA-1）"
-#: builtin/name-rev.c:412
+#: builtin/name-rev.c:416
msgid "only use tags to name the commits"
msgstr "只使用标签来命名提交"
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:418
msgid "only use refs matching <pattern>"
msgstr "只使用和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:420
msgid "ignore refs matching <pattern>"
msgstr "忽略和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:422
msgid "list all commits reachable from all refs"
msgstr "列出可以从所有引用访问的提交"
-#: builtin/name-rev.c:419
+#: builtin/name-rev.c:423
msgid "read from stdin"
msgstr "从标准输入读取"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:424
msgid "allow to print `undefined` names (default)"
msgstr "允许打印 `未定义` 的名称（默认）"
-#: builtin/name-rev.c:426
+#: builtin/name-rev.c:430
msgid "dereference tags in the input (internal use)"
msgstr "反向解析输入中的标签（内部使用）"
msgid "read object names from the standard input"
msgstr "从标准输入读取对象名称"
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
msgid "do not remove, show only"
msgstr "不删除，只显示"
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1034 builtin/stash.c:1598
+#: builtin/notes.c:1034 builtin/stash.c:1607
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子命令：%s"
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
-#: builtin/pack-objects.c:1166
+#: builtin/pack-objects.c:1164
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
-#: builtin/pack-objects.c:1597
+#: builtin/pack-objects.c:1592
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s 压缩中 delta 基准偏移越界"
-#: builtin/pack-objects.c:1606
+#: builtin/pack-objects.c:1601
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s 的 delta 基准偏移越界"
-#: builtin/pack-objects.c:1875
+#: builtin/pack-objects.c:1870
msgid "Counting objects"
msgstr "对象计数中"
-#: builtin/pack-objects.c:2005
+#: builtin/pack-objects.c:2000
#, c-format
msgid "unable to get size of %s"
msgstr "不能得到 %s 的大小"
-#: builtin/pack-objects.c:2020
+#: builtin/pack-objects.c:2015
#, c-format
msgid "unable to parse object header of %s"
msgstr "无法解析对象 %s 头信息"
-#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
-#: builtin/pack-objects.c:2116
+#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101
+#: builtin/pack-objects.c:2111
#, c-format
msgid "object %s cannot be read"
msgstr "对象 %s 无法读取"
-#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
+#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "对象 %s 不一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）"
-#: builtin/pack-objects.c:2130
+#: builtin/pack-objects.c:2125
msgid "suboptimal pack - out of memory"
msgstr "次优（suboptimal）打包 - 内存不足"
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2440
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "使用 %d 个线程进行压缩"
-#: builtin/pack-objects.c:2588
+#: builtin/pack-objects.c:2572
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "无法为标签 %s 压缩对象"
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2659
msgid "Compressing objects"
msgstr "压缩对象中"
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2665
msgid "inconsistency with delta count"
msgstr "不一致的差异计数"
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:2742
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
"预期边界对象（edge object）ID，却得到垃圾数据：\n"
" %s"
-#: builtin/pack-objects.c:2768
+#: builtin/pack-objects.c:2748
#, c-format
msgid ""
"expected object ID, got garbage:\n"
"预期对象 ID，却得到垃圾数据：\n"
" %s"
-#: builtin/pack-objects.c:2866
+#: builtin/pack-objects.c:2846
msgid "invalid value for --missing"
msgstr "选项 --missing 的值无效"
-#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
msgid "cannot open pack index"
msgstr "无法打开包文件索引"
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:2936
#, c-format
msgid "loose object at %s could not be examined"
msgstr "无法检查 %s 处的松散对象"
-#: builtin/pack-objects.c:3041
+#: builtin/pack-objects.c:3021
msgid "unable to force loose object"
msgstr "无法强制松散对象"
-#: builtin/pack-objects.c:3133
+#: builtin/pack-objects.c:3113
#, c-format
msgid "not a rev '%s'"
msgstr "不是一个版本 '%s'"
-#: builtin/pack-objects.c:3136
+#: builtin/pack-objects.c:3116
#, c-format
msgid "bad revision '%s'"
msgstr "坏的版本 '%s'"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3141
msgid "unable to add recent objects"
msgstr "无法添加最近的对象"
-#: builtin/pack-objects.c:3214
+#: builtin/pack-objects.c:3194
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3198
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3228
msgid "do not show progress meter"
msgstr "不显示进度表"
-#: builtin/pack-objects.c:3250
+#: builtin/pack-objects.c:3230
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3232
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/pack-objects.c:3255
+#: builtin/pack-objects.c:3235
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3236
msgid "<version>[,<offset>]"
msgstr "<版本>[,<偏移>]"
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3237
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3240
msgid "maximum size of each output pack file"
msgstr "每个输出包的最大尺寸"
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3242
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3244
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3246
msgid "limit pack window by objects"
msgstr "限制打包窗口的对象数"
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3248
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数量限制外设置打包窗口的内存限制"
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3250
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允许的 delta 链的最大长度"
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3252
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3254
msgid "reuse existing objects"
msgstr "重用已存在的对象"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3256
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3258
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹配"
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3260
msgid "do not create an empty pack output"
msgstr "不创建空的包输出"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3262
msgid "read revision arguments from standard input"
msgstr "从标准输入读取版本号参数"
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3264
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的对象"
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3267
msgid "include objects reachable from any reference"
msgstr "包括可以从任何引用访问到的对象"
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3270
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3273
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3276
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3278
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3280
msgid "keep unreachable objects"
msgstr "维持不可达的对象"
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3282
msgid "pack loose unreachable objects"
msgstr "打包松散的不可达对象"
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3284
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3287
msgid "use the sparse reachability algorithm"
msgstr "使用稀疏可达性算法"
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3289
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3291
msgid "create packs suitable for shallow fetches"
msgstr "创建适合浅克隆仓库获取的包"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3293
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 文件的包"
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3295
msgid "ignore this pack"
msgstr "忽略该 pack"
-#: builtin/pack-objects.c:3317
+#: builtin/pack-objects.c:3297
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:3319
+#: builtin/pack-objects.c:3299
msgid "do not hide commits by grafts"
msgstr "显示被移植隐藏的提交"
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3301
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3303
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同时创建 bitmap 索引"
-#: builtin/pack-objects.c:3327
+#: builtin/pack-objects.c:3307
msgid "write a bitmap index if possible"
msgstr "如果可能，写 bitmap 索引"
-#: builtin/pack-objects.c:3331
+#: builtin/pack-objects.c:3311
msgid "handling for missing objects"
msgstr "处理丢失的对象"
-#: builtin/pack-objects.c:3334
+#: builtin/pack-objects.c:3314
msgid "do not pack objects in promisor packfiles"
msgstr "不要打包 promisor 包文件中的对象"
-#: builtin/pack-objects.c:3336
+#: builtin/pack-objects.c:3316
msgid "respect islands during delta compression"
msgstr "在增量压缩时参考数据岛"
-#: builtin/pack-objects.c:3361
+#: builtin/pack-objects.c:3345
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "增量链深度 %d 太深了，强制为 %d"
-#: builtin/pack-objects.c:3366
+#: builtin/pack-objects.c:3350
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3404
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
-#: builtin/pack-objects.c:3422
+#: builtin/pack-objects.c:3406
msgid "minimum pack size limit is 1 MiB"
msgstr "最小的包文件大小是 1 MiB"
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3411
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin 不能用于创建一个可索引包"
-#: builtin/pack-objects.c:3430
+#: builtin/pack-objects.c:3414
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3420
msgid "cannot use --filter without --stdout"
msgstr "不能在没有 --stdout 的情况下使用 --filter"
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3481
msgid "Enumerating objects"
msgstr "枚举对象"
-#: builtin/pack-objects.c:3527
+#: builtin/pack-objects.c:3511
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr "总共 %<PRIu32> （差异 %<PRIu32>），复用 %<PRIu32> （差异 %<PRIu32>）"
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/pull.c:141
+#: builtin/pull.c:142
msgid "control for recursive fetching of submodules"
msgstr "控制子模组的递归获取"
-#: builtin/pull.c:145
+#: builtin/pull.c:146
msgid "Options related to merging"
msgstr "和合并相关的选项"
-#: builtin/pull.c:148
+#: builtin/pull.c:149
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用变基操作取代合并操作以合入修改"
-#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "允许快进式"
-#: builtin/pull.c:185
+#: builtin/pull.c:186
msgid "automatically stash/stash pop before and after rebase"
msgstr "变基操作前后执行自动贮藏和弹出贮藏"
-#: builtin/pull.c:201
+#: builtin/pull.c:202
msgid "Options related to fetching"
msgstr "和获取相关的参数"
-#: builtin/pull.c:211
+#: builtin/pull.c:212
msgid "force overwrite of local branch"
msgstr "强制覆盖本地分支"
-#: builtin/pull.c:219
+#: builtin/pull.c:220
msgid "number of submodules pulled in parallel"
msgstr "并发拉取的子模组的数量"
-#: builtin/pull.c:316
+#: builtin/pull.c:320
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff 的取值无效：%s"
-#: builtin/pull.c:433
+#: builtin/pull.c:437
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
-#: builtin/pull.c:435
+#: builtin/pull.c:439
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
-#: builtin/pull.c:436
+#: builtin/pull.c:440
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
-#: builtin/pull.c:439
+#: builtin/pull.c:443
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
"分支默认的远程仓库，您必须在命令行中指定一个分支名。"
-#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "您当前不在一个分支上。"
-#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "请指定您要变基到哪一个分支。"
-#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "请指定您要合并哪一个分支。"
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:453 builtin/pull.c:468
msgid "See git-pull(1) for details."
msgstr "详见 git-pull(1)。"
-#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
-#: builtin/rebase.c:1332 git-parse-remote.sh:64
+#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
+#: builtin/rebase.c:1353 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<远程>"
-#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "当前分支没有跟踪信息。"
-#: builtin/pull.c:468 git-parse-remote.sh:95
+#: builtin/pull.c:472 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:473
+#: builtin/pull.c:477
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"您的配置中指定要合并远程的引用 '%s'，\n"
"但是没有获取到这个引用。"
-#: builtin/pull.c:581
+#: builtin/pull.c:587
#, c-format
msgid "unable to access commit %s"
msgstr "无法访问提交 %s"
-#: builtin/pull.c:861
+#: builtin/pull.c:867
msgid "ignoring --verify-signatures for rebase"
msgstr "为变基操作忽略 --verify-signatures"
-#: builtin/pull.c:916
+#: builtin/pull.c:922
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
-#: builtin/pull.c:924
+#: builtin/pull.c:930
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支，变更添加至索引。"
-#: builtin/pull.c:928
+#: builtin/pull.c:934
msgid "pull with rebase"
msgstr "变基式拉取"
-#: builtin/pull.c:929
+#: builtin/pull.c:935
msgid "please commit or stash them."
msgstr "请提交或贮藏它们。"
-#: builtin/pull.c:954
+#: builtin/pull.c:960
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fetch 更新了当前的分支。快进您的工作区\n"
"至提交 %s。"
-#: builtin/pull.c:960
+#: builtin/pull.c:966
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"恢复之前的状态。"
-#: builtin/pull.c:975
+#: builtin/pull.c:981
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支合并到空分支。"
-#: builtin/pull.c:979
+#: builtin/pull.c:985
msgid "Cannot rebase onto multiple branches."
msgstr "无法变基到多个分支。"
-#: builtin/pull.c:986
+#: builtin/pull.c:992
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本地子模组中有修改，无法变基"
msgid "Pushing to %s\n"
msgstr "推送到 %s\n"
-#: builtin/push.c:364
+#: builtin/push.c:366
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "推送一些引用到 '%s' 失败"
-#: builtin/push.c:398
-#, c-format
-msgid "bad repository '%s'"
-msgstr "坏的仓库 '%s'"
-
-#: builtin/push.c:399
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-" git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-" git push <name>\n"
-msgstr ""
-"没有配置推送目标。\n"
-"或通过命令行指定 URL，或用下面命令配置一个远程仓库\n"
-"\n"
-" git remote add <名称> <地址>\n"
-"\n"
-"然后使用该远程仓库名执行推送\n"
-"\n"
-" git push <名称>\n"
-
-#: builtin/push.c:554
+#: builtin/push.c:541
msgid "repository"
msgstr "仓库"
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:542 builtin/send-pack.c:164
msgid "push all refs"
msgstr "推送所有引用"
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr "镜像所有引用"
-#: builtin/push.c:558
+#: builtin/push.c:545
msgid "delete refs"
msgstr "删除引用"
-#: builtin/push.c:559
+#: builtin/push.c:546
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推送标签（不能使用 --all or --mirror）"
-#: builtin/push.c:562 builtin/send-pack.c:167
+#: builtin/push.c:549 builtin/send-pack.c:167
msgid "force updates"
msgstr "强制更新"
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:551 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr "<引用名>:<期望值>"
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:552 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr "要求引用旧的取值为设定值"
-#: builtin/push.c:568
+#: builtin/push.c:555
msgid "control recursive pushing of submodules"
msgstr "控制子模组的递归推送"
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:557 builtin/send-pack.c:175
msgid "use thin pack"
msgstr "使用精简打包"
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "接收包程序"
-#: builtin/push.c:573
+#: builtin/push.c:560
msgid "set upstream for git pull/status"
msgstr "设置 git pull/status 的上游"
-#: builtin/push.c:576
+#: builtin/push.c:563
msgid "prune locally removed refs"
msgstr "清除本地删除的引用"
-#: builtin/push.c:578
+#: builtin/push.c:565
msgid "bypass pre-push hook"
msgstr "绕过 pre-push 钩子"
-#: builtin/push.c:579
+#: builtin/push.c:566
msgid "push missing but relevant tags"
msgstr "推送缺失但有关的标签"
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:569 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr "用 GPG 为推送签名"
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:571 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr "需要远端支持原子事务"
-#: builtin/push.c:602
+#: builtin/push.c:589
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
-#: builtin/push.c:604
+#: builtin/push.c:591
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有意义"
-#: builtin/push.c:607
+#: builtin/push.c:611
+#, c-format
+msgid "bad repository '%s'"
+msgstr "坏的仓库 '%s'"
+
+#: builtin/push.c:612
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+" git push <name>\n"
+msgstr ""
+"没有配置推送目标。\n"
+"或通过命令行指定 URL，或用下面命令配置一个远程仓库\n"
+"\n"
+" git remote add <名称> <地址>\n"
+"\n"
+"然后使用该远程仓库名执行推送\n"
+"\n"
+" git push <名称>\n"
+
+#: builtin/push.c:627
msgid "--all and --tags are incompatible"
msgstr "--all 和 --tags 不兼容"
-#: builtin/push.c:609
+#: builtin/push.c:629
msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用规格同时使用"
-#: builtin/push.c:613
+#: builtin/push.c:633
msgid "--mirror and --tags are incompatible"
msgstr "--mirror 和 --tags 不兼容"
-#: builtin/push.c:615
+#: builtin/push.c:635
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用规格同时使用"
-#: builtin/push.c:618
+#: builtin/push.c:638
msgid "--all and --mirror are incompatible"
msgstr "--all 和 --mirror 不兼容"
-#: builtin/push.c:637
+#: builtin/push.c:642
msgid "push options must not have new line characters"
msgstr "推送选项不能有换行符"
#: builtin/rebase.c:32
msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
-msgstr ""
-"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] [<上游>] [<分支>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
+msgstr "git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<上游> [<分支>]]"
#: builtin/rebase.c:34
msgid ""
msgid "could not generate todo list"
msgstr "无法生成待办列表"
-#: builtin/rebase.c:382
+#: builtin/rebase.c:383
msgid "a base commit must be provided with --upstream or --onto"
msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
-#: builtin/rebase.c:437
+#: builtin/rebase.c:438
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<选项>]"
-#: builtin/rebase.c:449
+#: builtin/rebase.c:450
msgid "keep empty commits"
msgstr "保持空提交"
-#: builtin/rebase.c:451 builtin/revert.c:128
+#: builtin/rebase.c:452 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "允许提交说明为空"
-#: builtin/rebase.c:452
+#: builtin/rebase.c:453
msgid "rebase merge commits"
msgstr "对合并提交变基"
-#: builtin/rebase.c:454
+#: builtin/rebase.c:455
msgid "keep original branch points of cousins"
msgstr "保持兄弟提交的原始分支点"
-#: builtin/rebase.c:456
+#: builtin/rebase.c:457
msgid "move commits that begin with squash!/fixup!"
msgstr "移动以 squash!/fixup! 开头的提交"
-#: builtin/rebase.c:457
+#: builtin/rebase.c:458
msgid "sign commits"
msgstr "签名提交"
-#: builtin/rebase.c:459 builtin/rebase.c:1403
+#: builtin/rebase.c:460 builtin/rebase.c:1427
msgid "display a diffstat of what changed upstream"
msgstr "显示上游变化的差异统计"
-#: builtin/rebase.c:461
+#: builtin/rebase.c:462
msgid "continue rebase"
msgstr "继续变基"
-#: builtin/rebase.c:463
+#: builtin/rebase.c:464
msgid "skip commit"
msgstr "跳过提交"
-#: builtin/rebase.c:464
+#: builtin/rebase.c:465
msgid "edit the todo list"
msgstr "变基待办列表"
-#: builtin/rebase.c:466
+#: builtin/rebase.c:467
msgid "show the current patch"
msgstr "显示当前补丁"
-#: builtin/rebase.c:469
+#: builtin/rebase.c:470
msgid "shorten commit ids in the todo list"
msgstr "缩短待办列表中的提交号"
-#: builtin/rebase.c:471
+#: builtin/rebase.c:472
msgid "expand commit ids in the todo list"
msgstr "扩展待办列表中的提交号"
-#: builtin/rebase.c:473
+#: builtin/rebase.c:474
msgid "check the todo list"
msgstr "检查待办列表"
-#: builtin/rebase.c:475
+#: builtin/rebase.c:476
msgid "rearrange fixup/squash lines"
msgstr "重新排列 fixup/squash 行"
-#: builtin/rebase.c:477
+#: builtin/rebase.c:478
msgid "insert exec commands in todo list"
msgstr "在待办列表中插入 exec 执行命令"
-#: builtin/rebase.c:478
+#: builtin/rebase.c:479
msgid "onto"
msgstr "onto"
-#: builtin/rebase.c:481
+#: builtin/rebase.c:482
msgid "restrict-revision"
msgstr "restrict-revision"
-#: builtin/rebase.c:481
+#: builtin/rebase.c:482
msgid "restrict revision"
msgstr "限制版本"
-#: builtin/rebase.c:483
+#: builtin/rebase.c:484
msgid "squash-onto"
msgstr "squash-onto"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:485
msgid "squash onto"
msgstr "squash onto"
-#: builtin/rebase.c:486
+#: builtin/rebase.c:487
msgid "the upstream commit"
msgstr "上游提交"
-#: builtin/rebase.c:488
+#: builtin/rebase.c:489
msgid "head-name"
msgstr "head-name"
-#: builtin/rebase.c:488
+#: builtin/rebase.c:489
msgid "head name"
msgstr "head 名称"
-#: builtin/rebase.c:493
+#: builtin/rebase.c:494
msgid "rebase strategy"
msgstr "变基策略"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:495
msgid "strategy-opts"
msgstr "strategy-opts"
-#: builtin/rebase.c:495
+#: builtin/rebase.c:496
msgid "strategy options"
msgstr "策略选项"
-#: builtin/rebase.c:496
+#: builtin/rebase.c:497
msgid "switch-to"
msgstr "切换到"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:498
msgid "the branch or commit to checkout"
msgstr "要检出的分支或提交"
-#: builtin/rebase.c:498
+#: builtin/rebase.c:499
msgid "onto-name"
msgstr "onto-name"
-#: builtin/rebase.c:498
+#: builtin/rebase.c:499
msgid "onto name"
msgstr "onto name"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:500
msgid "cmd"
msgstr "cmd"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:500
msgid "the command to run"
msgstr "要执行的命令"
-#: builtin/rebase.c:502 builtin/rebase.c:1486
+#: builtin/rebase.c:503 builtin/rebase.c:1510
msgid "automatically re-schedule any `exec` that fails"
msgstr "自动重新安排任何失败的 `exec`"
-#: builtin/rebase.c:518
+#: builtin/rebase.c:519
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果"
-#: builtin/rebase.c:534
+#: builtin/rebase.c:535
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s 需要交互式变基"
-#: builtin/rebase.c:586
+#: builtin/rebase.c:587
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "无法获取 'onto'：'%s'"
-#: builtin/rebase.c:601
+#: builtin/rebase.c:602
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "无效的原始 head：'%s'"
-#: builtin/rebase.c:626
+#: builtin/rebase.c:627
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "忽略无效的 allow_rerere_autoupdate：'%s'"
-#: builtin/rebase.c:702
+#: builtin/rebase.c:703
#, c-format
msgid "Could not read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/rebase.c:720
+#: builtin/rebase.c:721
#, c-format
msgid "Cannot store %s"
msgstr "不能存储 %s"
-#: builtin/rebase.c:827
+#: builtin/rebase.c:828
msgid "could not determine HEAD revision"
msgstr "不能确定 HEAD 版本"
-#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
-#: builtin/rebase.c:1031
+#: builtin/rebase.c:1032
#, c-format
msgid ""
"\n"
"\n"
"因此 git 无法对其变基。"
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1339
#, c-format
msgid ""
"%s\n"
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1355
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1385
msgid "exec commands cannot contain newlines"
msgstr "exec 命令不能包含换行符"
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1389
msgid "empty exec command"
msgstr "空的 exec 命令"
-#: builtin/rebase.c:1396
+#: builtin/rebase.c:1418
msgid "rebase onto given branch instead of upstream"
msgstr "变基到给定的分支而非上游"
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1420
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "使用上游和分支的合并基线做为当前基线"
+
+#: builtin/rebase.c:1422
msgid "allow pre-rebase hook to run"
msgstr "允许执行 pre-rebase 钩子"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1424
msgid "be quiet. implies --no-stat"
msgstr "安静。暗示 --no-stat"
-#: builtin/rebase.c:1406
+#: builtin/rebase.c:1430
msgid "do not show diffstat of what changed upstream"
msgstr "不显示上游变化的差异统计"
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1433
msgid "add a Signed-off-by: line to each commit"
msgstr "为每一个提交添加一个 Signed-off-by: 签名"
-#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
+#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441
msgid "passed to 'git am'"
msgstr "传递给 'git am'"
-#: builtin/rebase.c:1419 builtin/rebase.c:1421
+#: builtin/rebase.c:1443 builtin/rebase.c:1445
msgid "passed to 'git apply'"
msgstr "传递给 'git apply'"
-#: builtin/rebase.c:1423 builtin/rebase.c:1426
+#: builtin/rebase.c:1447 builtin/rebase.c:1450
msgid "cherry-pick all commits, even if unchanged"
msgstr "拣选所有提交，即使未修改"
-#: builtin/rebase.c:1428
+#: builtin/rebase.c:1452
msgid "continue"
msgstr "继续"
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1455
msgid "skip current patch and continue"
msgstr "跳过当前补丁并继续"
# 译者：注意保持前导空格
-#: builtin/rebase.c:1433
+#: builtin/rebase.c:1457
msgid "abort and check out the original branch"
msgstr "终止并检出原有分支"
-#: builtin/rebase.c:1436
+#: builtin/rebase.c:1460
msgid "abort but keep HEAD where it is"
msgstr "终止但保持 HEAD 不变"
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1461
msgid "edit the todo list during an interactive rebase"
msgstr "在交互式变基中编辑待办列表"
-#: builtin/rebase.c:1440
+#: builtin/rebase.c:1464
msgid "show the patch file being applied or merged"
msgstr "显示正在应用或合并的补丁文件"
-#: builtin/rebase.c:1443
+#: builtin/rebase.c:1467
msgid "use merging strategies to rebase"
msgstr "使用合并策略进行变基"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1471
msgid "let the user edit the list of commits to rebase"
msgstr "让用户编辑要变基的提交列表"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1475
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "（已弃用）尝试重建合并提交而非忽略它们"
-#: builtin/rebase.c:1455
+#: builtin/rebase.c:1479
msgid "preserve empty commits during rebase"
msgstr "变基时保留空提交"
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1481
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交"
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1487
msgid "automatically stash/stash pop before and after"
msgstr "在操作前后执行自动贮藏和弹出贮藏"
-#: builtin/rebase.c:1465
+#: builtin/rebase.c:1489
msgid "add exec lines after each commit of the editable list"
msgstr "可编辑列表的每一个提交下面增加一行 exec"
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1493
msgid "allow rebasing commits with empty messages"
msgstr "允许针对空提交说明的提交变基"
-#: builtin/rebase.c:1472
+#: builtin/rebase.c:1496
msgid "try to rebase merges instead of skipping them"
msgstr "尝试对合并提交变基而不是忽略它们"
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1499
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "使用 'merge-base --fork-point' 来优化上游"
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1501
msgid "use the given merge strategy"
msgstr "使用给定的合并策略"
-#: builtin/rebase.c:1479 builtin/revert.c:115
+#: builtin/rebase.c:1503 builtin/revert.c:115
msgid "option"
msgstr "选项"
-#: builtin/rebase.c:1480
+#: builtin/rebase.c:1504
msgid "pass the argument through to the merge strategy"
msgstr "将参数传递给合并策略"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1507
msgid "rebase all reachable commits up to the root(s)"
msgstr "将所有可达的提交变基到根提交"
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1524
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
"对 rebase.useBuiltin 的支持已被删除！\n"
"详见 'git help config' 中的条目。"
-#: builtin/rebase.c:1506
+#: builtin/rebase.c:1530
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "看起来 'git-am' 正在执行中。无法变基。"
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1571
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
-#: builtin/rebase.c:1551
+#: builtin/rebase.c:1576
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "不能将 '--keep-base' 和 '--onto' 组合使用"
+
+#: builtin/rebase.c:1578
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "不能将 '--keep-base' 和 '--root' 组合使用"
+
+#: builtin/rebase.c:1582
msgid "No rebase in progress?"
msgstr "没有正在进行的变基？"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1586
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1609
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: builtin/rebase.c:1590
+#: builtin/rebase.c:1621
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"您必须编辑所有的合并冲突，然后通过 git add\n"
"命令将它们标记为已解决"
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1640
msgid "could not discard worktree changes"
msgstr "无法丢弃工作区变更"
-#: builtin/rebase.c:1628
+#: builtin/rebase.c:1659
#, c-format
msgid "could not move back to %s"
msgstr "无法移回 %s"
-#: builtin/rebase.c:1673
+#: builtin/rebase.c:1704
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"\t%s\n"
"然后再重新执行。 为避免丢失重要数据，我已经停止当前操作。\n"
-#: builtin/rebase.c:1694
+#: builtin/rebase.c:1725
msgid "switch `C' expects a numerical value"
msgstr "开关 `C' 期望一个数字值"
-#: builtin/rebase.c:1735
+#: builtin/rebase.c:1766
#, c-format
msgid "Unknown mode: %s"
msgstr "未知模式：%s"
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1788
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
-#: builtin/rebase.c:1797
+#: builtin/rebase.c:1828
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
-#: builtin/rebase.c:1809
+#: builtin/rebase.c:1840
msgid "cannot combine am options with either interactive or merge options"
msgstr "不能将 am 选项与交互或合并选项同时使用"
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1859
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
-#: builtin/rebase.c:1832
+#: builtin/rebase.c:1863
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
-#: builtin/rebase.c:1838
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "不能将 '--rebase-merges' 和 '--strategy-option' 同时使用"
-
-#: builtin/rebase.c:1841
-msgid "cannot combine '--rebase-merges' with '--strategy'"
-msgstr "不能将 '--rebase-merges' 和 '--strategy' 同时使用"
-
-#: builtin/rebase.c:1865
+#: builtin/rebase.c:1887
#, c-format
msgid "invalid upstream '%s'"
msgstr "无效的上游 '%s'"
-#: builtin/rebase.c:1871
+#: builtin/rebase.c:1893
msgid "Could not create new root commit"
msgstr "不能创建新的根提交"
-#: builtin/rebase.c:1889
+#: builtin/rebase.c:1919
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "'%s'：只需要与分支的一个合并基线"
+
+#: builtin/rebase.c:1922
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s'：只需要一个合并基线"
-#: builtin/rebase.c:1896
+#: builtin/rebase.c:1930
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "没有指向一个有效的提交 '%s'"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1955
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "致命错误：无此分支/提交 '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/rebase.c:1963 builtin/submodule--helper.c:38
#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用：%s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1974
msgid "Could not resolve HEAD to a revision"
msgstr "无法将 HEAD 解析为一个版本"
-#: builtin/rebase.c:1981
+#: builtin/rebase.c:2012
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: builtin/rebase.c:1984
+#: builtin/rebase.c:2015
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "意外的 stash 响应：'%s'"
-#: builtin/rebase.c:1990
+#: builtin/rebase.c:2021
#, c-format
msgid "Could not create directory for '%s'"
msgstr "不能为 '%s' 创建目录"
-#: builtin/rebase.c:1993
+#: builtin/rebase.c:2024
#, c-format
msgid "Created autostash: %s\n"
msgstr "创建了 autostash：%s\n"
-#: builtin/rebase.c:1996
+#: builtin/rebase.c:2027
msgid "could not reset --hard"
msgstr "无法 reset --hard"
-#: builtin/rebase.c:1997 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD 现在位于 %s"
-
-#: builtin/rebase.c:2013
+#: builtin/rebase.c:2036
msgid "Please commit or stash them."
msgstr "请提交或贮藏修改。"
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:2063
#, c-format
msgid "could not parse '%s'"
msgstr "无法解析 '%s'"
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2076
#, c-format
msgid "could not switch to %s"
msgstr "无法切换到 %s"
-#: builtin/rebase.c:2064
+#: builtin/rebase.c:2087
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
-#: builtin/rebase.c:2066
+#: builtin/rebase.c:2089
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "当前分支 %s 是最新的。\n"
-#: builtin/rebase.c:2074
+#: builtin/rebase.c:2097
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD 是最新的，强制变基。"
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:2099
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "当前分支 %s 是最新的，强制变基。\n"
-#: builtin/rebase.c:2084
+#: builtin/rebase.c:2107
msgid "The pre-rebase hook refused to rebase."
msgstr "pre-rebase 钩子拒绝了变基操作。"
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:2114
#, c-format
msgid "Changes to %s:\n"
msgstr "到 %s 的变更：\n"
-#: builtin/rebase.c:2094
+#: builtin/rebase.c:2117
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "从 %s 到 %s 的变更：\n"
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2142
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "首先，回退头指针以便在其上重放您的工作...\n"
-#: builtin/rebase.c:2128
+#: builtin/rebase.c:2151
msgid "Could not detach HEAD"
msgstr "无法分离头指针"
-#: builtin/rebase.c:2137
+#: builtin/rebase.c:2160
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "快进 %s 到 %s。\n"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <仓库目录>"
-#: builtin/receive-pack.c:832
+#: builtin/receive-pack.c:830
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:852
+#: builtin/receive-pack.c:850
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:1938
+#: builtin/receive-pack.c:1936
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:1950
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
msgid "Unknown subcommand: %s"
msgstr "未知子命令：%s"
-#: builtin/repack.c:22
+#: builtin/repack.c:23
msgid "git repack [<options>]"
msgstr "git repack [<选项>]"
-#: builtin/repack.c:27
+#: builtin/repack.c:28
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
"或禁用 pack.writebitmaps 配置。"
-#: builtin/repack.c:190
+#: builtin/repack.c:191
msgid "could not start pack-objects to repack promisor objects"
msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
-#: builtin/repack.c:229 builtin/repack.c:408
+#: builtin/repack.c:230 builtin/repack.c:409
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。"
-#: builtin/repack.c:246
+#: builtin/repack.c:247
msgid "could not finish pack-objects to repack promisor objects"
msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
-#: builtin/repack.c:284
+#: builtin/repack.c:285
msgid "pack everything in a single pack"
msgstr "所有内容打包到一个包文件中"
-#: builtin/repack.c:286
+#: builtin/repack.c:287
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同，并将不可达的对象设为松散对象"
-#: builtin/repack.c:289
+#: builtin/repack.c:290
msgid "remove redundant packs, and run git-prune-packed"
msgstr "删除多余的包，运行 git-prune-packed"
-#: builtin/repack.c:291
+#: builtin/repack.c:292
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
-#: builtin/repack.c:293
+#: builtin/repack.c:294
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
-#: builtin/repack.c:295
+#: builtin/repack.c:296
msgid "do not run git-update-server-info"
msgstr "不运行 git-update-server-info"
-#: builtin/repack.c:298
+#: builtin/repack.c:299
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --local"
-#: builtin/repack.c:300
+#: builtin/repack.c:301
msgid "write bitmap index"
msgstr "写 bitmap 索引"
-#: builtin/repack.c:302
+#: builtin/repack.c:303
msgid "pass --delta-islands to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --delta-islands"
-#: builtin/repack.c:303
+#: builtin/repack.c:304
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:304
+#: builtin/repack.c:305
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A，不要将早于给定时间的对象过期"
-#: builtin/repack.c:306
+#: builtin/repack.c:307
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ，重新对不可达对象打包"
-#: builtin/repack.c:308
+#: builtin/repack.c:309
msgid "size of the window used for delta compression"
msgstr "用于增量压缩的窗口值"
-#: builtin/repack.c:309 builtin/repack.c:315
+#: builtin/repack.c:310 builtin/repack.c:316
msgid "bytes"
msgstr "字节"
-#: builtin/repack.c:310
+#: builtin/repack.c:311
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似，但限制内存大小而非条目数"
-#: builtin/repack.c:312
+#: builtin/repack.c:313
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
-#: builtin/repack.c:314
+#: builtin/repack.c:315
msgid "limits the maximum number of threads"
msgstr "限制最大线程数"
-#: builtin/repack.c:316
+#: builtin/repack.c:317
msgid "maximum size of each packfile"
msgstr "每个包文件的最大尺寸"
-#: builtin/repack.c:318
+#: builtin/repack.c:319
msgid "repack objects in packs marked with .keep"
msgstr "对标记为 .keep 的包中的对象重新打包"
-#: builtin/repack.c:320
+#: builtin/repack.c:321
msgid "do not repack this pack"
msgstr "不要对该包文件重新打包"
-#: builtin/repack.c:330
+#: builtin/repack.c:331
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能删除珍品仓库中的打包文件"
-#: builtin/repack.c:334
+#: builtin/repack.c:335
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 和 -A 不兼容"
-#: builtin/repack.c:417
+#: builtin/repack.c:418
msgid "Nothing new to pack."
msgstr "没有新的要打包。"
-#: builtin/repack.c:478
+#: builtin/repack.c:479
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"警告：并且尝试重命名改回原有文件名的操作也失败。\n"
"警告：请手动将 %s 下的这些文件重命名：\n"
-#: builtin/repack.c:526
+#: builtin/repack.c:527
#, c-format
msgid "failed to remove '%s'"
msgstr "删除 '%s' 失败"
msgid "unable to write object to database"
msgstr "无法向数据库写入对象"
-#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
-#: builtin/replace.c:452
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423
+#: builtin/replace.c:453
#, c-format
msgid "not a valid object name: '%s'"
msgstr "不是一个有效的对象名：'%s'"
msgid "new object is the same as the old one: '%s'"
msgstr "新对象和旧对象相同：'%s'"
-#: builtin/replace.c:383
+#: builtin/replace.c:384
#, c-format
msgid "could not parse %s as a commit"
msgstr "无法将 %s 解析为一个提交"
-#: builtin/replace.c:414
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "提交 '%s' 中含有损坏的合并标签"
-#: builtin/replace.c:416
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "提交 '%s' 中含有格式错误的合并标签"
-#: builtin/replace.c:428
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft"
-#: builtin/replace.c:467
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "原始提交 '%s' 中有一个 gpg 签名"
-#: builtin/replace.c:468
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "在替换的提交中签名将被移除！"
-#: builtin/replace.c:478
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "不能为 '%s' 写替换提交"
-#: builtin/replace.c:486
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "对 '%s' 移植没有必要"
-#: builtin/replace.c:490
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "新提交和旧的一样：'%s'"
-#: builtin/replace.c:525
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"不能转换下列移植：\n"
"%s"
-#: builtin/replace.c:546
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr "列出替换的引用"
-#: builtin/replace.c:547
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "删除替换的引用"
-#: builtin/replace.c:548
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "编辑现存的对象"
-#: builtin/replace.c:549
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr "修改一个提交的父提交"
-#: builtin/replace.c:550
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr "转换现存的移植文件"
-#: builtin/replace.c:551
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr "如果存在则替换引用"
-#: builtin/replace.c:553
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "不要为 --edit 操作美观显示内容"
-#: builtin/replace.c:554
+#: builtin/replace.c:555
msgid "use this format"
msgstr "使用此格式"
-#: builtin/replace.c:567
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr "不列出时不能使用 --format"
-#: builtin/replace.c:575
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "只有写一个替换时 -f 才有意义"
-#: builtin/replace.c:579
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "--raw 只有和 --edit 共用才有意义"
-#: builtin/replace.c:585
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "-d 需要至少一个参数"
-#: builtin/replace.c:591
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "错误的参数个数"
-#: builtin/replace.c:597
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "-e 需要且仅需要一个参数"
-#: builtin/replace.c:603
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "-g 需要至少一个参数"
-#: builtin/replace.c:609
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file 不带参数"
-#: builtin/replace.c:615
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "只能为 -l 提供一个模式"
msgid "Failed to find tree of %s."
msgstr "无法找到 %s 指向的树。"
+#: builtin/reset.c:114
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD 现在位于 %s"
+
# 译者：汉字之间无空格，故删除%s前后空格
#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
-#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
-#: builtin/stash.c:613
+#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
msgid "be quiet, only report errors"
msgstr "安静模式，只报告错误"
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"
-#: builtin/rev-list.c:412
+#: builtin/rev-list.c:411
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
-#: builtin/rev-list.c:473
+#: builtin/rev-list.c:472
msgid "object filtering requires --objects"
msgstr "对象过滤需要 --objects"
-#: builtin/rev-list.c:476
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr "无效的稀疏值 '%s'"
-
-#: builtin/rev-list.c:527
+#: builtin/rev-list.c:522
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支持显示注解"
-#: builtin/rev-list.c:530
+#: builtin/rev-list.c:525
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "不能将 --use-bitmap-index 和对象过滤组合使用"
msgid "could not save index tree"
msgstr "不能保存索引树"
-#: builtin/stash.c:434
+#: builtin/stash.c:436
msgid "could not restore untracked files from stash"
msgstr "无法从贮藏条目中恢复未跟踪文件"
-#: builtin/stash.c:448
+#: builtin/stash.c:450
#, c-format
msgid "Merging %s with %s"
msgstr "正在合并 %s 和 %s"
-#: builtin/stash.c:458 git-legacy-stash.sh:680
+#: builtin/stash.c:460 git-legacy-stash.sh:680
msgid "Index was not unstashed."
msgstr "索引未从贮藏中恢复。"
-#: builtin/stash.c:516 builtin/stash.c:615
+#: builtin/stash.c:522 builtin/stash.c:621
msgid "attempt to recreate the index"
msgstr "尝试重建索引"
-#: builtin/stash.c:549
+#: builtin/stash.c:555
#, c-format
msgid "Dropped %s (%s)"
msgstr "丢弃了 %s（%s）"
-#: builtin/stash.c:552
+#: builtin/stash.c:558
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s：无法丢弃贮藏条目"
-#: builtin/stash.c:577
+#: builtin/stash.c:583
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' 不是一个贮藏引用"
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:633 git-legacy-stash.sh:694
msgid "The stash entry is kept in case you need it again."
msgstr "贮藏条目被保留以备您再次需要。"
-#: builtin/stash.c:650 git-legacy-stash.sh:712
+#: builtin/stash.c:656 git-legacy-stash.sh:712
msgid "No branch name specified"
msgstr "未指定分支名"
-#: builtin/stash.c:790 builtin/stash.c:827
+#: builtin/stash.c:796 builtin/stash.c:833
#, c-format
msgid "Cannot update %s with %s"
msgstr "无法用 %2$s 更新 %1$s"
-#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506
msgid "stash message"
msgstr "贮藏说明"
-#: builtin/stash.c:818
+#: builtin/stash.c:824
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" 需要一个 <提交> 参数"
-#: builtin/stash.c:1040 git-legacy-stash.sh:217
+#: builtin/stash.c:1046 git-legacy-stash.sh:217
msgid "No changes selected"
msgstr "没有选择变更"
-#: builtin/stash.c:1136 git-legacy-stash.sh:150
+#: builtin/stash.c:1145 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: builtin/stash.c:1163 git-legacy-stash.sh:165
+#: builtin/stash.c:1172 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
-#: builtin/stash.c:1172 git-legacy-stash.sh:180
+#: builtin/stash.c:1181 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr "无法保存未跟踪文件"
-#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
+#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200
#: git-legacy-stash.sh:213
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
-#: builtin/stash.c:1220 git-legacy-stash.sh:233
+#: builtin/stash.c:1229 git-legacy-stash.sh:233
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
-#: builtin/stash.c:1269 git-legacy-stash.sh:337
+#: builtin/stash.c:1278 git-legacy-stash.sh:337
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-#: builtin/stash.c:1285
+#: builtin/stash.c:1294
msgid "Did you forget to 'git add'?"
msgstr "您是否忘了执行 'git add'？"
-#: builtin/stash.c:1300 git-legacy-stash.sh:345
+#: builtin/stash.c:1309 git-legacy-stash.sh:345
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
-#: builtin/stash.c:1307 git-legacy-stash.sh:350
+#: builtin/stash.c:1316 git-legacy-stash.sh:350
msgid "Cannot initialize stash"
msgstr "无法初始化贮藏"
-#: builtin/stash.c:1322 git-legacy-stash.sh:354
+#: builtin/stash.c:1331 git-legacy-stash.sh:354
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
-#: builtin/stash.c:1327
+#: builtin/stash.c:1336
#, c-format
msgid "Saved working directory and index state %s"
msgstr "保存工作目录和索引状态 %s"
-#: builtin/stash.c:1417 git-legacy-stash.sh:384
+#: builtin/stash.c:1426 git-legacy-stash.sh:384
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: builtin/stash.c:1452 builtin/stash.c:1488
+#: builtin/stash.c:1461 builtin/stash.c:1497
msgid "keep index"
msgstr "保持索引"
-#: builtin/stash.c:1454 builtin/stash.c:1490
+#: builtin/stash.c:1463 builtin/stash.c:1499
msgid "stash in patch mode"
msgstr "以补丁模式贮藏"
-#: builtin/stash.c:1455 builtin/stash.c:1491
+#: builtin/stash.c:1464 builtin/stash.c:1500
msgid "quiet mode"
msgstr "静默模式"
-#: builtin/stash.c:1457 builtin/stash.c:1493
+#: builtin/stash.c:1466 builtin/stash.c:1502
msgid "include untracked files in stash"
msgstr "贮藏中包含未跟踪文件"
-#: builtin/stash.c:1459 builtin/stash.c:1495
+#: builtin/stash.c:1468 builtin/stash.c:1504
msgid "include ignore files"
msgstr "包含忽略的文件"
-#: builtin/stash.c:1555
+#: builtin/stash.c:1564
#, c-format
msgid "could not exec %s"
msgstr "不能执行 %s"
msgstr "不要输出克隆进度"
#: builtin/submodule--helper.c:1877
-msgid "git submodule--helper update
_clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
+msgid "git submodule--helper update
-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "请确认 .gitmodules 文件在工作区里"
-#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#: builtin/submodule--helper.c:2235 git.c:433 git.c:683
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<选项>] [--] [<文件>...]"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:972
msgid "continue refresh even when index needs update"
msgstr "当索引需要更新时继续刷新"
-#: builtin/update-index.c:974
+#: builtin/update-index.c:975
msgid "refresh: ignore submodules"
msgstr "刷新：忽略子模组"
-#: builtin/update-index.c:977
+#: builtin/update-index.c:978
msgid "do not ignore new files"
msgstr "不忽略新的文件"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:980
msgid "let files replace directories and vice-versa"
msgstr "让文件替换目录（反之亦然）"
-#: builtin/update-index.c:981
+#: builtin/update-index.c:982
msgid "notice files missing from worktree"
msgstr "通知文件从工作区丢失"
-#: builtin/update-index.c:983
+#: builtin/update-index.c:984
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引区包含未合并的条目也执行刷新"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:987
msgid "refresh stat information"
msgstr "刷新统计信息"
-#: builtin/update-index.c:990
+#: builtin/update-index.c:991
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:995
msgid "<mode>,<object>,<path>"
msgstr "<存取模式>,<对象>,<路径>"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:996
msgid "add the specified entry to the index"
msgstr "添加指定的条目到索引区"
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1006
msgid "mark files as \"not changing\""
msgstr "把文件标记为 \"没有变更\""
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1009
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1012
msgid "mark files as \"index-only\""
msgstr "把文件标记为 \"仅索引\""
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1015
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1018
msgid "add to index only; do not add content to object database"
msgstr "只添加到索引区；不添加对象到对象库"
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1020
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作区里，也删除路径"
-#: builtin/update-index.c:1021
+#: builtin/update-index.c:1022
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "携带 --stdin：输入的行以 null 字符终止"
-#: builtin/update-index.c:1023
+#: builtin/update-index.c:1024
msgid "read list of paths to be updated from standard input"
msgstr "从标准输入中读取需要更新的路径列表"
-#: builtin/update-index.c:1027
+#: builtin/update-index.c:1028
msgid "add entries from standard input to the index"
msgstr "从标准输入添加条目到索引区"
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1032
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "为指定文件重新生成第2和第3暂存区"
-#: builtin/update-index.c:1035
+#: builtin/update-index.c:1036
msgid "only update entries that differ from HEAD"
msgstr "只更新与 HEAD 不同的条目"
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1040
msgid "ignore files missing from worktree"
msgstr "忽略工作区丢失的文件"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1043
msgid "report actions to standard output"
msgstr "在标准输出显示操作"
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1045
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘记保存的未解决的冲突"
-#: builtin/update-index.c:1048
+#: builtin/update-index.c:1049
msgid "write index in this format"
msgstr "以这种格式写入索引区"
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1051
msgid "enable or disable split index"
msgstr "启用或禁用索引拆分"
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1053
msgid "enable/disable untracked cache"
msgstr "启用/禁用对未跟踪文件的缓存"
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1055
msgid "test if the filesystem supports untracked cache"
msgstr "测试文件系统是否支持未跟踪文件缓存"
-#: builtin/update-index.c:1056
+#: builtin/update-index.c:1057
msgid "enable untracked cache without testing the filesystem"
msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
-#: builtin/update-index.c:1058
+#: builtin/update-index.c:1059
msgid "write out the index even if is not flagged as changed"
msgstr "即使没有被标记为已更改，也要写出索引"
-#: builtin/update-index.c:1060
+#: builtin/update-index.c:1061
msgid "enable or disable file system monitor"
msgstr "启用或禁用文件系统监控"
-#: builtin/update-index.c:1062
+#: builtin/update-index.c:1063
msgid "mark files as fsmonitor valid"
msgstr "标记文件为 fsmonitor 有效"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1066
msgid "clear fsmonitor valid bit"
msgstr "清除 fsmonitor 有效位"
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1169
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:1177
+#: builtin/update-index.c:1178
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:1188
+#: builtin/update-index.c:1190
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:1192
+#: builtin/update-index.c:1194
msgid "Untracked cache disabled"
msgstr "缓存未跟踪文件被禁用"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1202
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:1204
+#: builtin/update-index.c:1206
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "缓存未跟踪文件在 '%s' 启用"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1214
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr "core.fsmonitor 未设置；如果想要启用 fsmonitor 请设置该选项"
-#: builtin/update-index.c:1216
+#: builtin/update-index.c:1218
msgid "fsmonitor enabled"
msgstr "fsmonitor 被启用"
-#: builtin/update-index.c:1219
+#: builtin/update-index.c:1221
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr "core.fsmonitor 已设置；如果想要禁用 fsmonitor 请移除该选项"
-#: builtin/update-index.c:1223
+#: builtin/update-index.c:1225
msgid "fsmonitor disabled"
msgstr "fsmonitor 被禁用"
msgid "print tag contents"
msgstr "打印标签内容"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:17
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<选项>] <路径> [<提交>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:18
msgid "git worktree list [<options>]"
msgstr "git worktree list [<选项>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:19
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<选项>] <路径>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:20
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <工作区> <新路径>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:21
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<选项>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:22
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<选项>] <工作区>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:23
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:61 builtin/worktree.c:899
+#: builtin/worktree.c:60 builtin/worktree.c:898
#, c-format
msgid "failed to delete '%s'"
msgstr "删除 '%s' 失败"
-#: builtin/worktree.c:80
+#: builtin/worktree.c:79
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "删除工作区/%s：不是一个有效的目录"
-#: builtin/worktree.c:86
+#: builtin/worktree.c:85
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "删除 worktrees/%s：gitdir 文件不存在"
-#: builtin/worktree.c:91 builtin/worktree.c:100
+#: builtin/worktree.c:90 builtin/worktree.c:99
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
-#: builtin/worktree.c:110
+#: builtin/worktree.c:109
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"%<PRIuMAX>)"
msgstr "删除工作树/%s：读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）"
-#: builtin/worktree.c:118
+#: builtin/worktree.c:117
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "删除 worktrees/%s：无效的 gitdir 文件"
-#: builtin/worktree.c:127
+#: builtin/worktree.c:126
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
-#: builtin/worktree.c:166
+#: builtin/worktree.c:165
msgid "report pruned working trees"
msgstr "报告清除的工作区"
-#: builtin/worktree.c:168
+#: builtin/worktree.c:167
msgid "expire working trees older than <time>"
msgstr "将早于 <时间> 的工作区过期"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已经存在"
-#: builtin/worktree.c:252
+#: builtin/worktree.c:251
#, c-format
msgid "unable to re-add worktree '%s'"
msgstr "无法再次添加工作区 '%s'"
-#: builtin/worktree.c:257
+#: builtin/worktree.c:256
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"'%s' 是一个丢失但锁定的工作区，使用\n"
"'add -f -f' 覆盖，或 'unlock' 和 'prune' 或 'remove' 清除"
-#: builtin/worktree.c:259
+#: builtin/worktree.c:258
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
"'%s' 是一个丢失但已经注册的工作区，使用\n"
"'add -f' 覆盖，或 'prune' 或 'remove' 清除"
-#: builtin/worktree.c:309
+#: builtin/worktree.c:308
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/worktree.c:440 builtin/worktree.c:446
+#: builtin/worktree.c:439 builtin/worktree.c:445
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "准备工作区（新分支 '%s'）"
-#: builtin/worktree.c:442
+#: builtin/worktree.c:441
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "准备工作区（重置分支 '%s'，之前为 %s）"
-#: builtin/worktree.c:451
+#: builtin/worktree.c:450
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "准备工作区（检出 '%s'）"
-#: builtin/worktree.c:457
+#: builtin/worktree.c:456
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "准备工作区（分离头指针 %s）"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:497
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出 <分支>，即使已经被检出到其它工作区"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:500
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:503
+#: builtin/worktree.c:502
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:505
+#: builtin/worktree.c:504
msgid "populate the new working tree"
msgstr "生成新的工作区"
-#: builtin/worktree.c:506
+#: builtin/worktree.c:505
msgid "keep the new working tree locked"
msgstr "锁定新工作区"
-#: builtin/worktree.c:509
+#: builtin/worktree.c:508
msgid "set up tracking mode (see git-branch(1))"
msgstr "设置跟踪模式（参见 git-branch(1)）"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:511
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "尝试为新分支名匹配一个远程跟踪分支"
-#: builtin/worktree.c:520
+#: builtin/worktree.c:519
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:581
+#: builtin/worktree.c:580
msgid "--[no-]track can only be used if a new branch is created"
msgstr "只能在创建新分支时使用选项 --[no-]track "
-#: builtin/worktree.c:681
+#: builtin/worktree.c:680
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
-#: builtin/worktree.c:927
+#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799
+#: builtin/worktree.c:926
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:695 builtin/worktree.c:728
+#: builtin/worktree.c:694 builtin/worktree.c:727
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:700
+#: builtin/worktree.c:699
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定，原因：%s"
-#: builtin/worktree.c:702
+#: builtin/worktree.c:701
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:730
+#: builtin/worktree.c:729
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:770
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移动或删除包含子模组的工作区"
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
msgid "force move even if worktree is dirty or locked"
msgstr "强制移动，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:802 builtin/worktree.c:929
+#: builtin/worktree.c:801 builtin/worktree.c:928
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一个主工作区"
-#: builtin/worktree.c:807
+#: builtin/worktree.c:806
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "无法从 '%s' 算出目标名称"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:812
#, c-format
msgid "target '%s' already exists"
msgstr "目标 '%s' 已存在"
-#: builtin/worktree.c:821
+#: builtin/worktree.c:820
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"无法移动一个锁定的工作区，锁定原因：%s\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:822
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"无法移动一个锁定的工作区，\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:826
+#: builtin/worktree.c:825
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "验证失败，无法移动工作区：%s"
-#: builtin/worktree.c:831
+#: builtin/worktree.c:830
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "移动 '%s' 到 '%s' 失败"
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "在 '%s' 中执行 'git status' 失败"
-#: builtin/worktree.c:883
+#: builtin/worktree.c:882
#, c-format
-msgid "'%s' is dirty, use --force to delete it"
-msgstr "'%s' 是脏的，使用 --force 删除"
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr "'%s' 包含修改或未跟踪的文件，使用 --force 删除"
-#: builtin/worktree.c:888
+#: builtin/worktree.c:887
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d"
-#: builtin/worktree.c:911
+#: builtin/worktree.c:910
msgid "force removal even if worktree is dirty or locked"
msgstr "强制删除，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"无法删除一个锁定的工作区，锁定原因：%s\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:936
+#: builtin/worktree.c:935
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"无法删除一个锁定的工作区，\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:939
+#: builtin/worktree.c:938
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "验证失败，无法删除工作区：%s"
msgid "only useful for debugging"
msgstr "只对调试有用"
+#: fast-import.c:3118
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "预期 'mark' 命令，得到 %s"
+
+#: fast-import.c:3123
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "预期 'to' 命令，得到 %s"
+
#: credential-cache--daemon.c:223
#, c-format
msgid ""
"别名 '%s' 修改环境变量。您可以使用在别名中\n"
"使用 '!git'"
-#: git.c:377
+#: git.c:376
#, c-format
msgid "empty alias for %s"
msgstr "%s 的空别名"
-#: git.c:380
+#: git.c:379
#, c-format
msgid "recursive alias: %s"
msgstr "递归的别名：%s"
-#: git.c:460
+#: git.c:459
msgid "write failure on standard output"
msgstr "在标准输出写入失败"
-#: git.c:462
+#: git.c:461
msgid "unknown write failure on standard output"
msgstr "到标准输出的未知写入错误"
-#: git.c:464
+#: git.c:463
msgid "close failed on standard output"
msgstr "标准输出关闭失败"
-#: git.c:793
+#: git.c:792
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "检测到别名循环：'%s'的扩展未终止：%s"
-#: git.c:843
+#: git.c:842
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "不能作为内置命令处理 %s"
-#: git.c:856
+#: git.c:855
#, c-format
msgid ""
"usage: %s\n"
"用法：%s\n"
"\n"
-#: git.c:876
+#: git.c:875
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n"
-#: git.c:888
+#: git.c:887
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "运行命令 '%s' 失败：%s\n"
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
-#: http.c:876
+#: http.c:878
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "不支持 CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0"
-#: http.c:949
+#: http.c:951
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "不支持协议限制，因为 cURL < 7.19.4"
-#: http.c:1085
+#: http.c:1088
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端："
-#: http.c:1092
+#: http.c:1095
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr "无法设置 SSL 后端为 '%s'：cURL: cURL 没有使用 SSL 后端构建"
-#: http.c:1096
+#: http.c:1099
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "无法将 SSL 后端设置为 '%s'：已经设置"
-#: http.c:1965
+#: http.c:1968
#, c-format
msgid ""
"unable to update url base from redirection:\n"
" 请求：%s\n"
" 重定向：%s"
-#: remote-curl.c:157
+#: remote-curl.c:166
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "在 push-option 取值中无效的引号：'%s'"
-#: remote-curl.c:254
+#: remote-curl.c:263
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs 无效：这是一个 git 仓库么？"
-#: remote-curl.c:355
+#: remote-curl.c:364
msgid "invalid server response; expected service, got flush packet"
msgstr "无效的服务端响应。预期服务，得到 flush 包"
-#: remote-curl.c:386
+#: remote-curl.c:395
#, c-format
msgid "invalid server response; got '%s'"
msgstr "无效的服务端响应，得到 '%s'"
-#: remote-curl.c:446
+#: remote-curl.c:455
#, c-format
msgid "repository '%s' not found"
msgstr "仓库 '%s' 未找到"
-#: remote-curl.c:450
+#: remote-curl.c:459
#, c-format
msgid "Authentication failed for '%s'"
msgstr "'%s' 鉴权失败"
-#: remote-curl.c:454
+#: remote-curl.c:463
#, c-format
msgid "unable to access '%s': %s"
msgstr "无法访问 '%s'：%s"
-#: remote-curl.c:460
+#: remote-curl.c:469
#, c-format
msgid "redirecting to %s"
msgstr "重定向到 %s"
-#: remote-curl.c:584
+#: remote-curl.c:593
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符"
-#: remote-curl.c:664
+#: remote-curl.c:673
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
-#: remote-curl.c:724
+#: remote-curl.c:733
#, c-format
msgid "RPC failed; %s"
msgstr "RPC 失败。%s"
-#: remote-curl.c:764
+#: remote-curl.c:773
msgid "cannot handle pushes this big"
msgstr "不能处理这么大的推送"
-#: remote-curl.c:879
+#: remote-curl.c:888
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "不能压缩请求，zlib 压缩错误 %d"
-#: remote-curl.c:883
+#: remote-curl.c:892
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "不能压缩请求，zlib 结束错误 %d"
-#: remote-curl.c:1014
+#: remote-curl.c:1023
msgid "dumb http transport does not support shallow capabilities"
msgstr "哑 http 传输不支持 shalllow 能力"
-#: remote-curl.c:1028
+#: remote-curl.c:1037
msgid "fetch failed."
msgstr "获取失败。"
-#: remote-curl.c:1076
+#: remote-curl.c:1085
msgid "cannot fetch by sha1 over smart http"
msgstr "无法通过智能 HTTP 获取 sha1"
-#: remote-curl.c:1120 remote-curl.c:1126
+#: remote-curl.c:1129 remote-curl.c:1135
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "协议错误：期望 sha/ref，却得到 '%s'"
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1147 remote-curl.c:1261
#, c-format
msgid "http transport does not support %s"
msgstr "http 传输协议不支持 %s"
-#: remote-curl.c:1174
+#: remote-curl.c:1183
msgid "git-http-push failed"
msgstr "git-http-push 失败"
-#: remote-curl.c:1360
+#: remote-curl.c:1367
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl：用法：git remote-curl <远程> [<url>]"
-#: remote-curl.c:1392
+#: remote-curl.c:1399
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl：错误读取来自 git 的命令流"
-#: remote-curl.c:1399
+#: remote-curl.c:1406
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl：尝试没有本地仓库下获取"
-#: remote-curl.c:1439
+#: remote-curl.c:1446
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl：未知的来自 git 的命令 '%s'"
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:85
msgid "args"
msgstr "参数"
-#: list-objects-filter-options.h:62
+#: list-objects-filter-options.h:86
msgid "object filtering"
msgstr "对象过滤"
-#: parse-options.h:170
+#: parse-options.h:179
msgid "expiry-date"
msgstr "到期时间"
-#: parse-options.h:184
+#: parse-options.h:193
msgid "no-op (backward compatibility)"
msgstr "空操作（向后兼容）"
projects / thirdparty / git.git / blobdiff