summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po4569
1 files changed, 2466 insertions, 2103 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 622b61c95a..22d9961948 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -135,8 +135,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-02-18 01:00+0800\n"
-"PO-Revision-Date: 2017-02-25 00:10+0800\n"
+"POT-Creation-Date: 2017-05-05 09:35+0800\n"
+"PO-Revision-Date: 2017-05-09 21:54+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
@@ -187,7 +187,7 @@ msgstr ""
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
-#: advice.c:114 builtin/merge.c:1206
+#: advice.c:114 builtin/merge.c:1185
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
@@ -447,7 +447,7 @@ msgstr "打补丁失败:%s:%ld"
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248
+#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
@@ -570,7 +570,7 @@ msgstr "%s 的模式被改变,但它不在当前 HEAD 中"
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效(%s)。"
-#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135
+#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
@@ -598,7 +598,7 @@ msgstr "子模组 %s 损坏的补丁"
#: apply.c:4274
#, c-format
msgid "unable to stat newly created file '%s'"
-msgstr "不能枚举新建文件 '%s' 的状态"
+msgstr "不能对新建文件 '%s' 调用 stat"
#: apply.c:4282
#, c-format
@@ -646,7 +646,7 @@ msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986
+#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
@@ -674,160 +674,160 @@ msgstr "未能识别的输入"
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: apply.c:4824
+#: apply.c:4823
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s':%s"
-#: apply.c:4849
+#: apply.c:4850
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: apply.c:4855 apply.c:4870
+#: apply.c:4856 apply.c:4871
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行有空白字符误用。"
msgstr[1] "%d 行有空白字符误用。"
-#: apply.c:4863
+#: apply.c:4864
#, 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:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
-#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
-#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
-#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104
+#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279
+#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
+#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
#: git-add--interactive.perl:239
msgid "path"
msgstr "路径"
-#: apply.c:4911
+#: apply.c:4912
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: apply.c:4914
+#: apply.c:4915
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:4916 builtin/am.c:2286
+#: apply.c:4917 builtin/am.c:2285
msgid "num"
msgstr "数字"
-#: apply.c:4917
+#: apply.c:4918
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: apply.c:4920
+#: apply.c:4921
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: apply.c:4922
+#: apply.c:4923
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
-#: apply.c:4926
+#: apply.c:4927
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
-#: apply.c:4928
+#: apply.c:4929
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁,而是显示输入的概要"
-#: apply.c:4930
+#: apply.c:4931
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁,而是查看补丁是否可应用"
-#: apply.c:4932
+#: apply.c:4933
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: apply.c:4934
+#: apply.c:4935
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: apply.c:4936
+#: apply.c:4937
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
-#: apply.c:4938
+#: apply.c:4939
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
-#: apply.c:4940
+#: apply.c:4941
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三方合并"
-#: apply.c:4942
+#: apply.c:4943
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507
+#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: apply.c:4947
+#: apply.c:4948
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:4948 builtin/am.c:2265
+#: apply.c:4949 builtin/am.c:2264
msgid "action"
msgstr "动作"
-#: apply.c:4949
+#: apply.c:4950
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: apply.c:4952 apply.c:4955
+#: apply.c:4953 apply.c:4956
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: apply.c:4958
+#: apply.c:4959
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: apply.c:4960
+#: apply.c:4961
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: apply.c:4962
+#: apply.c:4963
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: apply.c:4964
+#: apply.c:4965
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19
+#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19
#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
-#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114
+#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
msgid "be verbose"
msgstr "冗长输出"
-#: apply.c:4967
+#: apply.c:4968
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
-#: apply.c:4970
+#: apply.c:4971
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:4972 builtin/am.c:2274
+#: apply.c:4973 builtin/am.c:2273
msgid "root"
msgstr "根目录"
-#: apply.c:4973
+#: apply.c:4974
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
@@ -849,103 +849,108 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹配任何文件"
-#: archive.c:429
+#: archive.c:417
msgid "fmt"
msgstr "格式"
-#: archive.c:429
+#: archive.c:417
msgid "archive format"
msgstr "归档格式"
-#: archive.c:430 builtin/log.c:1429
+#: archive.c:418 builtin/log.c:1436
msgid "prefix"
msgstr "前缀"
-#: archive.c:431
+#: archive.c:419
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
-#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
-#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60
+#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
+#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552
+#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
#: parse-options.h:153
msgid "file"
msgstr "文件"
-#: archive.c:433 builtin/archive.c:89
+#: archive.c:421 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "归档写入此文件"
-#: archive.c:435
+#: archive.c:423
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
-#: archive.c:436
+#: archive.c:424
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
-#: archive.c:437
+#: archive.c:425
msgid "store only"
msgstr "只存储"
-#: archive.c:438
+#: archive.c:426
msgid "compress faster"
msgstr "压缩速度更快"
-#: archive.c:446
+#: archive.c:434
msgid "compress better"
msgstr "压缩效果更好"
-#: archive.c:449
+#: archive.c:437
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
-#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969
+#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
msgid "repo"
msgstr "仓库"
-#: archive.c:452 builtin/archive.c:91
+#: archive.c:440 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库(<仓库>)提取归档文件"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr "命令"
-#: archive.c:454 builtin/archive.c:93
+#: archive.c:442 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
-#: archive.c:461
+#: archive.c:449
msgid "Unexpected option --remote"
msgstr "未知参数 --remote"
-#: archive.c:463
+#: archive.c:451
msgid "Option --exec can only be used together with --remote"
msgstr "选项 --exec 只能和 --remote 同时使用"
-#: archive.c:465
+#: archive.c:453
msgid "Unexpected option --output"
msgstr "未知参数 --output"
-#: archive.c:487
+#: archive.c:475
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知归档格式 '%s'"
-#: archive.c:494
+#: archive.c:482
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "参数不支持此格式 '%s':-%d"
-#: attr.c:263
+#: attr.c:212
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s 不是一个有效的属性名"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -953,27 +958,27 @@ msgstr ""
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时,使用 '\\!'。"
-#: bisect.c:441
+#: bisect.c:444
#, c-format
msgid "Could not open file '%s'"
msgstr "不能打开文件 '%s'"
-#: bisect.c:446
+#: bisect.c:449
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "文件 '%s' 包含错误的引用格式:%s"
-#: bisect.c:655
+#: bisect.c:657
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找!\n"
-#: bisect.c:708
+#: bisect.c:710
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"
-#: bisect.c:732
+#: bisect.c:734
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -982,7 +987,7 @@ msgstr ""
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
-#: bisect.c:737
+#: bisect.c:739
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -991,7 +996,7 @@ msgstr ""
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
-#: bisect.c:742
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1000,7 +1005,7 @@ msgstr ""
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
-#: bisect.c:750
+#: bisect.c:752
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1011,7 +1016,7 @@ msgstr ""
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本?\n"
-#: bisect.c:763
+#: bisect.c:765
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1022,36 +1027,36 @@ msgstr ""
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"
-#: bisect.c:798
+#: bisect.c:800
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中:合并基线必须是经过测试的\n"
-#: bisect.c:849
+#: bisect.c:851
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262
+#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
-#: bisect.c:917
+#: bisect.c:919
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
-#: bisect.c:947
+#: bisect.c:949
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"
-#: bisect.c:967
+#: bisect.c:969
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"
-#: bisect.c:975
+#: bisect.c:977
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1060,7 +1065,7 @@ msgstr ""
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数?\n"
-#: bisect.c:994
+#: bisect.c:996
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1069,7 +1074,7 @@ msgstr[1] "(大概 %d 步)"
#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: bisect.c:1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1204,7 +1209,7 @@ msgstr "无效的分支点:'%s'。"
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已经检出到 '%s'"
-#: branch.c:363
+#: branch.c:364
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "工作区 %s 的 HEAD 指向没有被更新"
@@ -1219,7 +1224,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头:%s%s (%d)"
-#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777
+#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
@@ -1228,10 +1233,10 @@ msgstr "不能打开 '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的提交:"
-#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290
-#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
-#: builtin/merge.c:360 builtin/shortlog.c:177
+#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321
+#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
+#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
+#: builtin/merge.c:359 builtin/shortlog.c:176
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
@@ -1270,7 +1275,7 @@ msgstr "rev-list 终止"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282
+#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数:%s"
@@ -1293,8 +1298,8 @@ msgstr "index-pack 终止"
msgid "invalid color value: %.*s"
msgstr "无效的颜色值:%.*s"
-#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:1493 builtin/am.c:2127
+#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
+#: builtin/am.c:1489 builtin/am.c:2126
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
@@ -1304,7 +1309,7 @@ msgstr "不能解析 %s"
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交!"
-#: commit.c:1514
+#: commit.c:1511
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"
@@ -1318,133 +1323,152 @@ msgstr ""
msgid "memory exhausted"
msgstr "内存耗尽"
-#: config.c:518
+#: config.c:191
+msgid "relative config include conditionals must come from files"
+msgstr "包含相对路径的条件引用必须来自于文件"
+
+#: config.c:711
#, c-format
msgid "bad config line %d in blob %s"
msgstr "数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:522
+#: config.c:715
#, c-format
msgid "bad config line %d in file %s"
msgstr "文件 %2$s 中错误的配置行 %1$d"
-#: config.c:526
+#: config.c:719
#, c-format
msgid "bad config line %d in standard input"
msgstr "标准输入中错误的配置行 %d"
-#: config.c:530
+#: config.c:723
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:534
+#: config.c:727
#, c-format
msgid "bad config line %d in command line %s"
msgstr "命令行 %2$s 中错误的配置行 %1$d"
-#: config.c:538
+#: config.c:731
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中错误的配置行 %1$d"
-#: config.c:657
+#: config.c:859
msgid "out of range"
msgstr "超出范围"
-#: config.c:657
+#: config.c:859
msgid "invalid unit"
msgstr "无效的单位"
-#: config.c:663
+#: config.c:865
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
-#: config.c:668
+#: config.c:870
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
-#: config.c:671
+#: config.c:873
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
-#: config.c:674
+#: config.c:876
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
-#: config.c:677
+#: config.c:879
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
-#: config.c:680
+#: config.c:882
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
-#: config.c:683
+#: config.c:885
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
-#: config.c:770
+#: config.c:980
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展 '%s' 中的用户目录"
-#: config.c:865 config.c:876
+#: config.c:1075 config.c:1086
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
-#: config.c:993
+#: config.c:1203
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式:%s"
-#: config.c:1149
+#: config.c:1359
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
-#: config.c:1339
+#: config.c:1557
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
-#: config.c:1389
+#: config.c:1611
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
-#: config.c:1743
+#: config.c:1970
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "无效 %s:'%s'"
+
+#: config.c:1991
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'"
+
+#: config.c:2017
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
+
+#: config.c:2028
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
-#: config.c:1745
+#: config.c:2030
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:1804
+#: config.c:2089
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2225 config.c:2450
+#: config.c:2423 config.c:2648
#, c-format
msgid "fstat on %s failed"
-msgstr "在 %s 上执行 fstat 失败"
+msgstr "对 %s 调用 fstat 失败"
-#: config.c:2343
+#: config.c:2541
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:2345
+#: config.c:2543 builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
@@ -1583,7 +1607,7 @@ msgstr "无法读取排序文件 '%s'"
#: diffcore-rename.c:536
msgid "Performing inexact rename detection"
-msgstr "正在进行非精确的重命名检测"
+msgstr "正在进行非精确的重命名探测"
#: diff.c:62
#, c-format
@@ -1616,20 +1640,20 @@ msgstr ""
"发现配置变量 'diff.dirstat' 中的错误:\n"
"%s"
-#: diff.c:3085
+#: diff.c:3102
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出,停止在 %s"
-#: diff.c:3411
+#: diff.c:3428
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: diff.c:3501
+#: diff.c:3518
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
-#: diff.c:3664
+#: diff.c:3681
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1638,205 +1662,230 @@ msgstr ""
"无法解析 --dirstat/-X 选项的参数:\n"
"%s"
-#: diff.c:3678
+#: diff.c:3695
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数:'%s'"
-#: diff.c:4696
+#: diff.c:4719
msgid "inexact rename detection was skipped due to too many files."
msgstr "因为文件太多,略过不严格的重命名检查。"
-#: diff.c:4699
+#: diff.c:4722
msgid "only found copies from modified paths due to too many files."
msgstr "因为文件太多,只在修改的路径中查找拷贝。"
-#: diff.c:4702
+#: diff.c:4725
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
-#: dir.c:1862
+#: dir.c:1899
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"
-#: dir.c:1981
+#: dir.c:2018
msgid "Untracked cache is disabled on this system or location."
msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
-#: dir.c:2759
+#: dir.c:2776 dir.c:2781
+#, c-format
+msgid "could not create directories for %s"
+msgstr "不能为 %s 创建目录"
+
+#: dir.c:2806
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
-#: fetch-pack.c:213
+#: entry.c:280
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "不能对文件 '%s' 调用 stat"
+
+#: fetch-pack.c:249
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack:应为 shallow 列表"
-#: fetch-pack.c:225
+#: fetch-pack.c:261
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF"
-#: fetch-pack.c:243
+#: fetch-pack.c:280 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "远程错误:%s"
+
+#: fetch-pack.c:281
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
-#: fetch-pack.c:295
+#: fetch-pack.c:333
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: fetch-pack.c:381
+#: fetch-pack.c:419
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息:%s"
-#: fetch-pack.c:387
+#: fetch-pack.c:425
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息:%s"
-#: fetch-pack.c:389
+#: fetch-pack.c:427
#, c-format
msgid "object not found: %s"
msgstr "对象未找到:%s"
-#: fetch-pack.c:392
+#: fetch-pack.c:430
#, c-format
msgid "error in object: %s"
msgstr "对象中出错:%s"
-#: fetch-pack.c:394
+#: fetch-pack.c:432
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow:%s"
-#: fetch-pack.c:397
+#: fetch-pack.c:435
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow,却得到 %s"
-#: fetch-pack.c:436
+#: fetch-pack.c:474
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:450
+#: fetch-pack.c:488
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
-#: fetch-pack.c:483
+#: fetch-pack.c:521
msgid "giving up"
msgstr "放弃"
-#: fetch-pack.c:493 progress.c:235
+#: fetch-pack.c:531 progress.c:235
msgid "done"
msgstr "完成"
-#: fetch-pack.c:505
+#: fetch-pack.c:543
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:551
+#: fetch-pack.c:589
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
-#: fetch-pack.c:697
+#: fetch-pack.c:737
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s(%s)"
-#: fetch-pack.c:735
+#: fetch-pack.c:775
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack:无法派生 sideband 多路输出"
-#: fetch-pack.c:743
+#: fetch-pack.c:783
msgid "protocol error: bad pack header"
msgstr "协议错误:坏的包头"
-#: fetch-pack.c:799
+#: fetch-pack.c:839
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack:无法派生进程 %s"
-#: fetch-pack.c:815
+#: fetch-pack.c:855
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: fetch-pack.c:817
+#: fetch-pack.c:857
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
-#: fetch-pack.c:844
+#: fetch-pack.c:884
msgid "Server does not support shallow clients"
msgstr "服务器不支持 shalllow 客户端"
-#: fetch-pack.c:848
+#: fetch-pack.c:888
msgid "Server supports multi_ack_detailed"
msgstr "服务器支持 multi_ack_detailed"
-#: fetch-pack.c:851
+#: fetch-pack.c:891
msgid "Server supports no-done"
msgstr "服务器支持 no-done"
-#: fetch-pack.c:857
+#: fetch-pack.c:897
msgid "Server supports multi_ack"
msgstr "服务器支持 multi_ack"
-#: fetch-pack.c:861
+#: fetch-pack.c:901
msgid "Server supports side-band-64k"
msgstr "服务器支持 side-band-64k"
-#: fetch-pack.c:865
+#: fetch-pack.c:905
msgid "Server supports side-band"
msgstr "服务器支持 side-band"
-#: fetch-pack.c:869
+#: fetch-pack.c:909
msgid "Server supports allow-tip-sha1-in-want"
msgstr "服务器支持 allow-tip-sha1-in-want"
-#: fetch-pack.c:873
+#: fetch-pack.c:913
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "服务器支持 allow-reachable-sha1-in-want"
-#: fetch-pack.c:883
+#: fetch-pack.c:923
msgid "Server supports ofs-delta"
msgstr "服务器支持 ofs-delta"
-#: fetch-pack.c:890
+#: fetch-pack.c:930
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
-#: fetch-pack.c:896
+#: fetch-pack.c:936
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
-#: fetch-pack.c:900
+#: fetch-pack.c:940
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
-#: fetch-pack.c:902
+#: fetch-pack.c:942
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
-#: fetch-pack.c:913
+#: fetch-pack.c:953
msgid "no common commits"
msgstr "没有共同的提交"
-#: fetch-pack.c:925
+#: fetch-pack.c:965
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack:获取失败。"
-#: fetch-pack.c:1087
+#: fetch-pack.c:1127
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
+#: fetch-pack.c:1149
+#, c-format
+msgid "no such remote ref %s"
+msgstr "没有这样的远程引用 %s"
+
+#: fetch-pack.c:1152
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "服务器不允许请求未公开的对象 %s"
+
#: gpg-interface.c:185
msgid "gpg failed to sign the data"
msgstr "gpg 无法为数据签名"
@@ -1855,17 +1904,17 @@ msgstr "无法将分离式签名写入 '%s'"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
-#: grep.c:1794
+#: grep.c:1796
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s':无法读取 %s"
-#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
#, c-format
msgid "failed to stat '%s'"
-msgstr "无法枚举 '%s' 状态"
+msgstr "对 '%s' 调用 stat 失败"
-#: grep.c:1822
+#: grep.c:1824
#, c-format
msgid "'%s': short read"
msgstr "'%s':读取不完整"
@@ -1934,7 +1983,7 @@ msgstr[1] ""
msgid "%s: %s - %s"
msgstr "%s:%s - %s"
-#: ident.c:334
+#: ident.c:343
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -1959,6 +2008,39 @@ msgstr ""
"来设置您账号的缺省身份标识。\n"
"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
+#: ident.c:367
+msgid "no email was given and auto-detection is disabled"
+msgstr "未提供邮件地址且自动探测被禁用"
+
+#: ident.c:372
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "无法自动探测邮件地址(得到 '%s')"
+
+#: ident.c:382
+msgid "no name was given and auto-detection is disabled"
+msgstr "未提供姓名且自动探测被禁用"
+
+#: ident.c:388
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "无法自动探测姓名(得到 '%s')"
+
+#: ident.c:396
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "不允许空的姓名(对于 <%s>)"
+
+#: ident.c:402
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "姓名中仅包含禁用字符:%s"
+
+#: ident.c:417 builtin/commit.c:611
+#, c-format
+msgid "invalid date format: %s"
+msgstr "无效的日期格式:%s"
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -1986,8 +2068,8 @@ msgstr "不能创建 '%s.lock':%s"
msgid "failed to read the cache"
msgstr "无法读取缓存"
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
-#: builtin/checkout.c:588 builtin/clone.c:731
+#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
+#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
@@ -2057,38 +2139,56 @@ msgstr "无法执行内部合并"
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
-#: merge-recursive.c:1088 merge-recursive.c:1102
+#: merge-recursive.c:1092
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
-"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
-"的版本被保留。"
+"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
+"本被保留。"
+
+#: merge-recursive.c:1097
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
+"%7$s 版本被保留。"
-#: merge-recursive.c:1094 merge-recursive.c:1107
+#: merge-recursive.c:1104
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
-"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
-"的版本保留于 %8$s 中。"
+"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
+"本保留在 %8$s 中。"
+
+#: merge-recursive.c:1109
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree at %s."
+msgstr ""
+"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
+"%7$s 版本保留在 %9$s 中。"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1143
msgid "rename"
msgstr "重命名"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "重命名"
-#: merge-recursive.c:1207
+#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: merge-recursive.c:1232
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2097,135 +2197,135 @@ msgstr ""
"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1237
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr "(留下未解决)"
-#: merge-recursive.c:1299
+#: merge-recursive.c:1292
#, 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:1332
+#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
-#: merge-recursive.c:1535
+#: merge-recursive.c:1528
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
-#: merge-recursive.c:1550
+#: merge-recursive.c:1543
#, c-format
msgid "Adding merged %s"
msgstr "添加合并后的 %s"
-#: merge-recursive.c:1557 merge-recursive.c:1771
+#: merge-recursive.c:1550 merge-recursive.c:1780
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
-#: merge-recursive.c:1614
+#: merge-recursive.c:1607
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
-#: merge-recursive.c:1617
+#: merge-recursive.c:1610
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1689
msgid "content"
msgstr "内容"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1696
msgid "add/add"
msgstr "添加/添加"
-#: merge-recursive.c:1723
+#: merge-recursive.c:1732
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s(已经做过相同合并)"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1746
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
-#: merge-recursive.c:1741 git-submodule.sh:930
+#: merge-recursive.c:1750 git-submodule.sh:944
msgid "submodule"
msgstr "子模组"
-#: merge-recursive.c:1742
+#: merge-recursive.c:1751
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突(%s):合并冲突于 %s"
-#: merge-recursive.c:1836
+#: merge-recursive.c:1845
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:1862
+#: merge-recursive.c:1871
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:1868
+#: merge-recursive.c:1877
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:1874
+#: merge-recursive.c:1883
#, 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:1883
+#: merge-recursive.c:1892
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:1920
+#: merge-recursive.c:1929
msgid "Already up-to-date!"
msgstr "已经是最新的!"
-#: merge-recursive.c:1929
+#: merge-recursive.c:1938
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
-#: merge-recursive.c:2012
+#: merge-recursive.c:2021
msgid "Merging:"
msgstr "合并:"
-#: merge-recursive.c:2025
+#: merge-recursive.c:2034
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先:"
msgstr[1] "发现 %u 个共同祖先:"
-#: merge-recursive.c:2064
+#: merge-recursive.c:2073
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:2127
+#: merge-recursive.c:2136
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
msgid "Unable to write index."
msgstr "不能写入索引。"
@@ -2302,66 +2402,83 @@ msgstr "-数字"
msgid "malformed object name '%s'"
msgstr "非法的对象名 '%s'"
-#: path.c:826
+#: path.c:810
#, c-format
msgid "Could not make %s writable by group"
msgstr "不能设置 %s 为组可写"
-#: pathspec.c:142
+#: pathspec.c:125
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
+
+#: pathspec.c:143
+msgid "Only one 'attr:' specification is allowed."
+msgstr "只允许一个 'attr:' 规格。"
+
+#: pathspec.c:146
+msgid "attr spec must not be empty"
+msgstr "属性规格不能为空"
+
+#: pathspec.c:189
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "无效的属性名 %s"
+
+#: pathspec.c:254
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
-#: pathspec.c:149
+#: pathspec.c:261
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
-#: pathspec.c:188
+#: pathspec.c:301
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "路径规格包含无效的神奇前缀"
-#: pathspec.c:201
+#: pathspec.c:322
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
-#: pathspec.c:206
+#: pathspec.c:327
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
-#: pathspec.c:238
+#: pathspec.c:365
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
-#: pathspec.c:293 pathspec.c:315
+#: pathspec.c:421 pathspec.c:443
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
-#: pathspec.c:350
+#: pathspec.c:483
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s:'literal' 和 'glob' 不兼容"
-#: pathspec.c:363
+#: pathspec.c:496
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s:'%s' 在仓库之外"
-#: pathspec.c:451
+#: pathspec.c:584
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s'(助记符:'%c')"
-#: pathspec.c:461
+#: pathspec.c:594
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
-#: pathspec.c:511
+#: pathspec.c:644
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
@@ -2369,24 +2486,16 @@ msgstr ""
"在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路径,\n"
"请代之以 ."
-#: pathspec.c:535
+#: pathspec.c:668
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路径规格 '%s' 位于符号链接中"
-#: pathspec.c:544
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
-"添加 ':/' 或 '.' ?"
-
#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
-#: read-cache.c:1307
+#: read-cache.c:1442
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2395,7 +2504,7 @@ msgstr ""
"设置了 index.version,但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1317
+#: read-cache.c:1452
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2404,161 +2513,268 @@ msgstr ""
"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
"使用版本 %i"
-#: refs.c:576 builtin/merge.c:844
+#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
+#, c-format
+msgid "could not stat '%s'"
+msgstr "不能对 '%s' 调用 stat"
+
+#: read-cache.c:2388
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "不能打开 git 目录:%s"
+
+#: read-cache.c:2400
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "无法删除:%s"
+
+#: refs.c:620 builtin/merge.c:844
#, c-format
msgid "Could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: refs/files-backend.c:2481
+#: refs.c:1667
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "在隔离环境中禁止更新引用"
+
+#: refs/files-backend.c:1631
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s:%s"
-#: refs/files-backend.c:2484
+#: refs/files-backend.c:1634
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用:%s"
-#: refs/files-backend.c:2493
+#: refs/files-backend.c:1643
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
-#: ref-filter.c:56
+#: ref-filter.c:35 wt-status.c:1780
+msgid "gone"
+msgstr "丢失"
+
+#: ref-filter.c:36
+#, c-format
+msgid "ahead %d"
+msgstr "领先 %d"
+
+#: ref-filter.c:37
+#, c-format
+msgid "behind %d"
+msgstr "落后 %d"
+
+#: ref-filter.c:38
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "领先 %d,落后 %d"
+
+#: ref-filter.c:104
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "期望的格式:%%(color:<color>)"
-#: ref-filter.c:58
+#: ref-filter.c:106
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "未能识别的颜色:%%(color:%s)"
-#: ref-filter.c:72
+#: ref-filter.c:120
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "未能识别的格式:%%(%s)"
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "期望整数值 refname:lstrip=%s"
-#: ref-filter.c:78
+#: ref-filter.c:124
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "期望整数值 refname:rstrip=%s"
+
+#: ref-filter.c:126
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "未能识别的 %%(%s) 参数:%s"
+
+#: ref-filter.c:166
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不带参数"
-#: ref-filter.c:85
+#: ref-filter.c:173
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) 不带参数"
-#: ref-filter.c:92
+#: ref-filter.c:180
#, c-format
msgid "%%(trailers) does not take arguments"
msgstr "%%(trailers) 不带参数"
-#: ref-filter.c:111
+#: ref-filter.c:199
#, c-format
msgid "positive value expected contents:lines=%s"
-msgstr "要为 contents:lines=%s 提供一个正数"
+msgstr "期望一个正数 contents:lines=%s"
-#: ref-filter.c:113
+#: ref-filter.c:201
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "未能识别的 %%(contents) 参数:%s"
-#: ref-filter.c:123
+#: ref-filter.c:214
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "期望一个正数 objectname:short=%s"
+
+#: ref-filter.c:218
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "未能识别的 %%(objectname) 参数:%s"
-#: ref-filter.c:145
+#: ref-filter.c:245
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "期望的格式:%%(align:<width>,<position>)"
-#: ref-filter.c:157
+#: ref-filter.c:257
#, c-format
msgid "unrecognized position:%s"
msgstr "未能识别的位置:%s"
-#: ref-filter.c:161
+#: ref-filter.c:261
#, c-format
msgid "unrecognized width:%s"
msgstr "未能识别的宽度:%s"
-#: ref-filter.c:167
+#: ref-filter.c:267
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "未能识别的 %%(align) 参数:%s"
-#: ref-filter.c:171
+#: ref-filter.c:271
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一个正数的宽度"
-#: ref-filter.c:255
+#: ref-filter.c:286
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "未能识别的 %%(if) 参数:%s"
+
+#: ref-filter.c:371
#, c-format
msgid "malformed field name: %.*s"
msgstr "非法的字段名:%.*s"
-#: ref-filter.c:281
+#: ref-filter.c:397
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的字段名:%.*s"
-#: ref-filter.c:383
+#: ref-filter.c:501
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
+
+#: ref-filter.c:561
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
+
+#: ref-filter.c:563
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "格式:%%(then) 元素用了多次"
+
+#: ref-filter.c:565
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
+
+#: ref-filter.c:591
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
+
+#: ref-filter.c:593
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
+
+#: ref-filter.c:595
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "格式:%%(else) 元素用了多次"
+
+#: ref-filter.c:608
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
-#: ref-filter.c:435
+#: ref-filter.c:663
#, c-format
msgid "malformed format string %s"
msgstr "非法的格式化字符串 %s"
-#: ref-filter.c:898
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= 需要一个正整型参数"
+#: ref-filter.c:1247
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(非分支,正变基 %s)"
-#: ref-filter.c:903
+#: ref-filter.c:1250
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
+msgid "(no branch, bisect started on %s)"
+msgstr "(非分支,二分查找开始于 %s)"
-#: ref-filter.c:1066
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: ref-filter.c:1256
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(头指针分离于 %s)"
+
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: ref-filter.c:1261
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "未知的 %.*s 格式 %s"
+msgid "(HEAD detached from %s)"
+msgstr "(头指针分离自 %s)"
+
+#: ref-filter.c:1265
+msgid "(no branch)"
+msgstr "(非分支)"
-#: ref-filter.c:1086 ref-filter.c:1117
+#: ref-filter.c:1420 ref-filter.c:1451
#, c-format
msgid "missing object %s for %s"
msgstr "缺失 %2$s 的对象 %1$s"
-#: ref-filter.c:1089 ref-filter.c:1120
+#: ref-filter.c:1423 ref-filter.c:1454
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-#: ref-filter.c:1343
+#: ref-filter.c:1692
#, c-format
msgid "malformed object at '%s'"
msgstr "非法的对象于 '%s'"
-#: ref-filter.c:1410
+#: ref-filter.c:1759
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略带有错误名称 %s 的引用"
-#: ref-filter.c:1415
+#: ref-filter.c:1764
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略损坏的引用 %s"
-#: ref-filter.c:1670
+#: ref-filter.c:2028
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式:缺少 %%(end) 元素"
-#: ref-filter.c:1734
+#: ref-filter.c:2109
#, c-format
msgid "malformed object name %s"
msgstr "非法的对象名 %s"
@@ -2704,25 +2920,35 @@ msgstr "不能打开 /dev/null"
msgid "dup2(%d,%d) failed"
msgstr "不能调用 dup2(%d,%d)"
-#: send-pack.c:297
+#: send-pack.c:150
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "不能解析远程解包状态:%s"
+
+#: send-pack.c:152
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "远程解包失败:%s"
+
+#: send-pack.c:315
msgid "failed to sign the push certificate"
msgstr "无法为推送证书签名"
-#: send-pack.c:410
+#: send-pack.c:428
msgid "the receiving end does not support --signed push"
msgstr "接收端不支持签名推送"
-#: send-pack.c:412
+#: send-pack.c:430
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未发送推送证书,因为接收端不支持签名推送"
-#: send-pack.c:424
+#: send-pack.c:442
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支持原子推送"
-#: send-pack.c:429
+#: send-pack.c:447
msgid "the receiving end does not support push options"
msgstr "接收端不支持推送选项"
@@ -2760,12 +2986,12 @@ msgstr ""
"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
"对修正后的文件做标记,然后用 'git commit' 提交"
-#: sequencer.c:294 sequencer.c:1667
+#: sequencer.c:294 sequencer.c:1682
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
-#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686
+#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
@@ -2775,13 +3001,13 @@ msgstr "不能写入 '%s'"
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
-#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674
+#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
#, c-format
msgid "failed to finalize '%s'."
msgstr "无法完成 '%s'。"
-#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259
-#: builtin/commit.c:749 builtin/merge.c:1036
+#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
+#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
@@ -2845,17 +3071,17 @@ msgstr ""
"\n"
" git rebase --continue\n"
-#: sequencer.c:688
+#: sequencer.c:694
#, c-format
msgid "could not parse commit %s\n"
msgstr "不能解析提交 %s\n"
-#: sequencer.c:693
+#: sequencer.c:699
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "不能解析父提交 %s\n"
-#: sequencer.c:815
+#: sequencer.c:821
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -2866,7 +3092,7 @@ msgstr ""
"\n"
"\t%.*s"
-#: sequencer.c:821
+#: sequencer.c:827
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -2877,230 +3103,230 @@ msgstr ""
"\n"
"\t%.*s"
-#: sequencer.c:827 sequencer.c:852
+#: sequencer.c:833 sequencer.c:858
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
-#: sequencer.c:836
+#: sequencer.c:842
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
-#: sequencer.c:838
+#: sequencer.c:844
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:840
+#: sequencer.c:846
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
-#: sequencer.c:846
+#: sequencer.c:852
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
-#: sequencer.c:855 git-rebase--interactive.sh:445
+#: sequencer.c:861 git-rebase--interactive.sh:445
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明:"
-#: sequencer.c:863
+#: sequencer.c:869
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
-#: sequencer.c:870
+#: sequencer.c:876
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d:"
-#: sequencer.c:875
+#: sequencer.c:881
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过:"
-#: sequencer.c:880
+#: sequencer.c:886
#, c-format
msgid "unknown command: %d"
msgstr "未知命令:%d"
-#: sequencer.c:946
+#: sequencer.c:952
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
-#: sequencer.c:964
+#: sequencer.c:970
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: sequencer.c:972
+#: sequencer.c:978
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
-#: sequencer.c:976
+#: sequencer.c:982
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "指定了主线,但是提交 %s 不是一个合并提交。"
-#: sequencer.c:982
+#: sequencer.c:988
#, 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:1001
+#: sequencer.c:1009
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s:不能解析父提交 %s"
-#: sequencer.c:1063 sequencer.c:1812
+#: sequencer.c:1071 sequencer.c:1827
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
-#: sequencer.c:1114
+#: sequencer.c:1122
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
-#: sequencer.c:1115
+#: sequencer.c:1123
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
-#: sequencer.c:1157
+#: sequencer.c:1165
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:1167
+#: sequencer.c:1175
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s:无法读取索引"
-#: sequencer.c:1174
+#: sequencer.c:1182
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s:无法刷新索引"
-#: sequencer.c:1294
+#: sequencer.c:1303
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d:%.*s"
-#: sequencer.c:1302
+#: sequencer.c:1311
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
-#: sequencer.c:1334
+#: sequencer.c:1344
#, c-format
msgid "could not read '%s'."
msgstr "不能读取 '%s'。"
-#: sequencer.c:1341
+#: sequencer.c:1356
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: sequencer.c:1343
+#: sequencer.c:1358
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单:'%s'"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "no commits parsed."
msgstr "没有解析提交。"
-#: sequencer.c:1359
+#: sequencer.c:1374
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
-#: sequencer.c:1361
+#: sequencer.c:1376
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
-#: sequencer.c:1424
+#: sequencer.c:1439
#, c-format
msgid "invalid key: %s"
msgstr "无效键名:%s"
-#: sequencer.c:1427
+#: sequencer.c:1442
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效:%s"
-#: sequencer.c:1484
+#: sequencer.c:1499
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "非法的选项清单:'%s'"
-#: sequencer.c:1522
+#: sequencer.c:1537
msgid "a cherry-pick or revert is already in progress"
msgstr "一个拣选或还原操作已在进行"
-#: sequencer.c:1523
+#: sequencer.c:1538
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1526
+#: sequencer.c:1541
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
-#: sequencer.c:1596 sequencer.c:2150
+#: sequencer.c:1611 sequencer.c:2181
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:1598
+#: sequencer.c:1613
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1600 sequencer.c:1634
+#: sequencer.c:1615 sequencer.c:1649
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:1620 builtin/grep.c:904
+#: sequencer.c:1635 builtin/grep.c:910
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: sequencer.c:1622
+#: sequencer.c:1637
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s':%s"
-#: sequencer.c:1623
+#: sequencer.c:1638
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:1629
+#: sequencer.c:1644
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:1640
+#: sequencer.c:1655
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
-#: sequencer.c:1777 sequencer.c:2049
+#: sequencer.c:1792 sequencer.c:2080
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:1817 builtin/difftool.c:574
+#: sequencer.c:1832 builtin/difftool.c:616
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
-#: sequencer.c:1833
+#: sequencer.c:1848
msgid "could not read index"
msgstr "不能读取索引"
# 译者:注意保持前导空格
-#: sequencer.c:1838
+#: sequencer.c:1853
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3115,11 +3341,11 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: sequencer.c:1844
+#: sequencer.c:1859
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
-#: sequencer.c:1850
+#: sequencer.c:1865
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3136,17 +3362,17 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: sequencer.c:1905 git-rebase.sh:168
+#: sequencer.c:1920 git-rebase.sh:169
#, c-format
msgid "Applied autostash."
msgstr "成功应用 autostash。"
-#: sequencer.c:1917
+#: sequencer.c:1932
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
-#: sequencer.c:1919 git-rebase.sh:172
+#: sequencer.c:1934 git-rebase.sh:173
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3157,82 +3383,84 @@ msgstr ""
"您的修改安全地保存在 stash 中。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:2000
+#: sequencer.c:2016
#, c-format
-msgid "stopped at %s... %.*s"
-msgstr "停止在 %s... %.*s"
+msgid "Stopped at %s... %.*s\n"
+msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:2027
+#: sequencer.c:2058
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
-#: sequencer.c:2057
+#: sequencer.c:2088
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
-#: sequencer.c:2061
+#: sequencer.c:2092
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
-#: sequencer.c:2068
+#: sequencer.c:2099
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:2075
+#: sequencer.c:2106
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
-#: sequencer.c:2159
+#: sequencer.c:2190
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基:您有未暂存的变更。"
-#: sequencer.c:2164
+#: sequencer.c:2195
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: sequencer.c:2173
+#: sequencer.c:2204
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
-#: sequencer.c:2175
+#: sequencer.c:2206
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件:'%s'"
-#: sequencer.c:2177
+#: sequencer.c:2208
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容:'%s'"
-#: sequencer.c:2180
+#: sequencer.c:2211
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
-msgstr "\n您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
+msgstr ""
+"\n"
+"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: sequencer.c:2190
+#: sequencer.c:2221
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: sequencer.c:2270
+#: sequencer.c:2301
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s:不能拣选一个%s"
-#: sequencer.c:2274
+#: sequencer.c:2305
#, c-format
msgid "%s: bad revision"
msgstr "%s:错误的版本"
-#: sequencer.c:2307
+#: sequencer.c:2338
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
-#: setup.c:160
+#: setup.c:165
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -3241,7 +3469,7 @@ msgstr ""
"%s:工作区中无此路径。\n"
"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
-#: setup.c:173
+#: setup.c:178
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3252,7 +3480,7 @@ msgstr ""
"使用 '--' 来分隔版本和路径,例如:\n"
"'git <command> [<revision>...] -- [<file>...]'"
-#: setup.c:223
+#: setup.c:228
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -3263,29 +3491,34 @@ msgstr ""
"使用 '--' 来分隔版本和路径,例如:\n"
"'git <command> [<revision>...] -- [<file>...]'"
-#: setup.c:470
+#: setup.c:475
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 仓库版本 <= %d,却得到 %d"
-#: setup.c:478
+#: setup.c:483
msgid "unknown repository extensions found:"
msgstr "发现未知的仓库扩展:"
-#: setup.c:768
+#: setup.c:776
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "不是一个 git 仓库(或者任何父目录):%s"
-#: setup.c:770 setup.c:922 builtin/index-pack.c:1643
+#: setup.c:778 builtin/index-pack.c:1646
msgid "Cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: setup.c:852
+#: setup.c:1010
msgid "Unable to read current working directory"
msgstr "不能读取当前工作目录"
-#: setup.c:927
+#: setup.c:1022 setup.c:1028
+#, c-format
+msgid "Cannot change to '%s'"
+msgstr "不能切换到 '%s'"
+
+#: setup.c:1041
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3294,12 +3527,7 @@ msgstr ""
"不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n"
"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
-#: setup.c:934
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "不能切换到 '%s/..'"
-
-#: setup.c:996
+#: setup.c:1106
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3308,55 +3536,55 @@ msgstr ""
"参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"
"文件属主必须始终拥有读写权限。"
-#: sha1_file.c:490
+#: sha1_file.c:559
#, c-format
msgid "path '%s' does not exist"
msgstr "路径 '%s' 不存在"
-#: sha1_file.c:516
+#: sha1_file.c:585
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
-#: sha1_file.c:522
+#: sha1_file.c:591
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "参考仓库 '%s' 不是一个本地仓库。"
-#: sha1_file.c:528
+#: sha1_file.c:597
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "参考仓库 '%s' 是一个浅克隆"
-#: sha1_file.c:536
+#: sha1_file.c:605
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "参考仓库 '%s' 已被嫁接"
-#: sha1_file.c:1176
+#: sha1_file.c:1245
msgid "offset before end of packfile (broken .idx?)"
msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
-#: sha1_file.c:2637
+#: sha1_file.c:2721
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
-#: sha1_file.c:2641
+#: sha1_file.c:2725
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
-#: sha1_name.c:407
+#: sha1_name.c:409
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "短 SHA1 %s 存在歧义"
-#: sha1_name.c:418
+#: sha1_name.c:420
msgid "The candidates are:"
msgstr "候选者有:"
-#: sha1_name.c:578
+#: sha1_name.c:580
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"
@@ -3377,61 +3605,71 @@ msgstr ""
"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
"命令关闭本消息通知。"
-#: submodule.c:65 submodule.c:99
+#: submodule.c:67 submodule.c:101
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
-#: submodule.c:69 submodule.c:103
+#: submodule.c:71 submodule.c:105
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
-#: submodule.c:77
+#: submodule.c:79
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "不能更新 .gitmodules 条目 %s"
-#: submodule.c:110
+#: submodule.c:112
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "无法移除 %s 的 .gitmodules 条目"
-#: submodule.c:121
+#: submodule.c:123
msgid "staging updated .gitmodules failed"
msgstr "将更新后 .gitmodules 添加暂存区失败"
-#: submodule.c:159
+#: submodule.c:161
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "submodule.fetchJobs 不允许为负值"
-#: submodule.c:1184
+#: submodule.c:1194
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "无法将 '%s' 识别为一个 git 仓库"
+
+#: submodule.c:1332
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "无法在子模组 '%s' 中启动 'git status'"
+
+#: submodule.c:1345
#, c-format
-msgid "could not start 'git status in submodule '%s'"
-msgstr "无法在子模组 '%s' 中启动 git status"
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "无法在子模组 '%s' 中执行 'git status'"
-#: submodule.c:1197
+#: submodule.c:1421
#, c-format
-msgid "could not run 'git status in submodule '%s'"
-msgstr "无法在子模组 '%s' 中执行 git status"
+msgid "submodule '%s' has dirty index"
+msgstr "子模组 '%s' 中有脏索引"
-#: submodule.c:1398
+#: submodule.c:1678
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
-#: submodule.c:1410 submodule.c:1471
+#: submodule.c:1690 submodule.c:1746
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查询子模组 '%s' 的名称"
-#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640
-#: builtin/submodule--helper.c:650
+#: submodule.c:1694 builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:688
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: submodule.c:1420
+#: submodule.c:1697
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3442,12 +3680,25 @@ msgstr ""
"'%s' 迁移至\n"
"'%s'\n"
-#: submodule.c:1512
+#: submodule.c:1781
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "无法递归进子模组路径 '%s'"
-#: submodule-config.c:360
+#: submodule.c:1825
+msgid "could not start ls-files in .."
+msgstr "无法在 .. 中启动 ls-files"
+
+#: submodule.c:1845
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr "BUG:返回的路径和当前路径不匹配?"
+
+#: submodule.c:1864
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree 返回未知返回值 %d"
+
+#: submodule-config.c:380
#, c-format
msgid "invalid value for %s"
msgstr "%s 的值无效"
@@ -3485,7 +3736,7 @@ msgstr "不能自标准输入读取"
#: trailer.c:949 builtin/am.c:44
#, c-format
msgid "could not stat %s"
-msgstr "不能获取 %s 的文件状态"
+msgstr "不能对 %s 调用 stat"
#: trailer.c:951
#, c-format
@@ -3516,14 +3767,14 @@ msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
msgid "transport: invalid depth option '%s'"
msgstr "传输:无效的深度选项 '%s'"
-#: transport.c:885
+#: transport.c:889
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
-#: transport.c:889
+#: transport.c:893
#, c-format
msgid ""
"\n"
@@ -3550,11 +3801,11 @@ msgstr ""
"以推送至远程。\n"
"\n"
-#: transport.c:897
+#: transport.c:901
msgid "Aborting."
msgstr "正在终止。"
-#: transport-helper.c:1082
+#: transport-helper.c:1080
#, c-format
msgid "Could not read ref %s"
msgstr "不能读取引用 %s"
@@ -3575,7 +3826,7 @@ msgstr "树对象条目中空的文件名"
msgid "too-short tree file"
msgstr "太短的树文件"
-#: unpack-trees.c:99
+#: unpack-trees.c:104
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3584,7 +3835,7 @@ msgstr ""
"您对下列文件的本地修改将被检出操作覆盖:\n"
"%%s请在切换分支前提交您的修改或者保存进度。"
-#: unpack-trees.c:101
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3593,7 +3844,7 @@ msgstr ""
"您对下列文件的本地修改将被检出操作覆盖:\n"
"%%s"
-#: unpack-trees.c:104
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3602,7 +3853,7 @@ msgstr ""
"您对下列文件的本地修改将被合并操作覆盖:\n"
"%%s请在合并前提交您的修改或者保存进度。"
-#: unpack-trees.c:106
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3611,7 +3862,7 @@ msgstr ""
"您对下列文件的本地修改将被合并操作覆盖:\n"
"%%s"
-#: unpack-trees.c:109
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3620,7 +3871,7 @@ msgstr ""
"您对下列文件的本地修改将被 %s 覆盖:\n"
"%%s请在 %s 之前提交您的修改或者保存进度。"
-#: unpack-trees.c:111
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3629,7 +3880,7 @@ msgstr ""
"您对下列文件的本地修改将被 %s 覆盖:\n"
"%%s"
-#: unpack-trees.c:116
+#: unpack-trees.c:121
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3638,7 +3889,7 @@ msgstr ""
"更新如下目录将会丢失其中未跟踪的文件:\n"
"%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:125
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3647,7 +3898,7 @@ msgstr ""
"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
"%%s请在切换分支之前移动或删除。"
-#: unpack-trees.c:122
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3656,7 +3907,7 @@ msgstr ""
"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3665,7 +3916,7 @@ msgstr ""
"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:127
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3674,7 +3925,7 @@ msgstr ""
"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
"%%s"
-#: unpack-trees.c:130
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3683,7 +3934,7 @@ msgstr ""
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:132
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3692,7 +3943,7 @@ msgstr ""
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
"%%s"
-#: unpack-trees.c:137
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3702,7 +3953,7 @@ msgstr ""
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
"%%s请在切换分支前移动或删除。"
-#: unpack-trees.c:139
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3712,7 +3963,7 @@ msgstr ""
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
"%%s"
-#: unpack-trees.c:142
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3721,7 +3972,7 @@ msgstr ""
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:144
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3730,7 +3981,7 @@ msgstr ""
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
"%%s"
-#: unpack-trees.c:147
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3739,7 +3990,7 @@ msgstr ""
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:149
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3748,12 +3999,12 @@ msgstr ""
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:161
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
-#: unpack-trees.c:159
+#: unpack-trees.c:164
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
@@ -3762,7 +4013,7 @@ msgstr ""
"无法更新稀疏检出:如下条目不是最新:\n"
"%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:166
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -3772,7 +4023,7 @@ msgstr ""
"工作区中下列文件将被稀疏检出更新所覆盖:\n"
"%s"
-#: unpack-trees.c:163
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -3782,45 +4033,59 @@ msgstr ""
"工作区中下列文件将被稀疏检出更新所删除:\n"
"%s"
-#: unpack-trees.c:240
+#: unpack-trees.c:170
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"无法更新子模组:\n"
+"%s"
+
+#: unpack-trees.c:247
#, c-format
msgid "Aborting\n"
msgstr "终止中\n"
-#: unpack-trees.c:270
+#: unpack-trees.c:272
+#, c-format
+msgid "submodule update strategy not supported for submodule '%s'"
+msgstr "子模组 %s 不支持子模组更新策略"
+
+#: unpack-trees.c:340
msgid "Checking out files"
msgstr "正在检出文件"
-#: urlmatch.c:120
+#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr "无效的 %XX 转义序列"
-#: urlmatch.c:172
+#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr "缺失主机名且 URL 方案不是 'file:'"
-#: urlmatch.c:189
+#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr "一个 'file:' URL 不应该包含端口号"
-#: urlmatch.c:199
+#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr "主机名中包含无效的字符"
-#: urlmatch.c:244 urlmatch.c:255
+#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr "无效的端口号"
-#: urlmatch.c:322
+#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr "无效的 '..' 路径片段"
-#: worktree.c:282
+#: worktree.c:285
#, c-format
msgid "failed to read '%s'"
msgstr "无法读取 '%s'"
@@ -3835,28 +4100,28 @@ msgstr "无法打开 '%s' 进行读写"
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757
+#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015
#: builtin/pull.c:341
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
-#: wrapper.c:605 wrapper.c:626
+#: wrapper.c:581 wrapper.c:602
#, c-format
msgid "unable to access '%s'"
msgstr "不能访问 '%s'"
-#: wrapper.c:634
+#: wrapper.c:610
msgid "unable to get current working directory"
msgstr "不能获取当前工作目录"
-#: wrapper.c:658
+#: wrapper.c:634
#, c-format
msgid "could not write to %s"
msgstr "不能写入 %s"
-#: wrapper.c:660
+#: wrapper.c:636
#, c-format
msgid "could not close %s"
msgstr "不能关闭 %s"
@@ -3891,11 +4156,11 @@ msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
-#: wt-status.c:199 wt-status.c:945
+#: wt-status.c:199 wt-status.c:958
msgid "Changes to be committed:"
msgstr "要提交的变更:"
-#: wt-status.c:217 wt-status.c:954
+#: wt-status.c:217 wt-status.c:967
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备提交的变更:"
@@ -4001,15 +4266,15 @@ msgstr "修改的内容, "
msgid "untracked content, "
msgstr "未跟踪的内容, "
-#: wt-status.c:818
+#: wt-status.c:831
msgid "Submodules changed but not updated:"
msgstr "子模组已修改但尚未更新:"
-#: wt-status.c:820
+#: wt-status.c:833
msgid "Submodule changes to be committed:"
msgstr "要提交的子模组变更:"
-#: wt-status.c:901
+#: wt-status.c:914
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -4017,77 +4282,77 @@ msgstr ""
"不要改动上面的一行。\n"
"下面的所有内容均将被删除。"
-#: wt-status.c:1013
+#: wt-status.c:1026
msgid "You have unmerged paths."
msgstr "您有尚未合并的路径。"
# 译者:注意保持前导空格
-#: wt-status.c:1016
+#: wt-status.c:1029
msgid " (fix conflicts and run \"git commit\")"
msgstr " (解决冲突并运行 \"git commit\")"
# 译者:注意保持前导空格
-#: wt-status.c:1018
+#: wt-status.c:1031
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (使用 \"git merge --abort\" 终止合并)"
-#: wt-status.c:1023
+#: wt-status.c:1036
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲突已解决但您仍处于合并中。"
# 译者:注意保持前导空格
-#: wt-status.c:1026
+#: wt-status.c:1039
msgid " (use \"git commit\" to conclude merge)"
msgstr " (使用 \"git commit\" 结束合并)"
-#: wt-status.c:1036
+#: wt-status.c:1049
msgid "You are in the middle of an am session."
msgstr "您正处于 am 操作过程中。"
-#: wt-status.c:1039
+#: wt-status.c:1052
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
# 译者:注意保持前导空格
-#: wt-status.c:1043
+#: wt-status.c:1056
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (解决冲突,然后运行 \"git am --continue\")"
# 译者:注意保持前导空格
-#: wt-status.c:1045
+#: wt-status.c:1058
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (使用 \"git am --skip\" 跳过此补丁)"
# 译者:注意保持前导空格
-#: wt-status.c:1047
+#: wt-status.c:1060
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (使用 \"git am --abort\" 恢复原有分支)"
-#: wt-status.c:1176
+#: wt-status.c:1189
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo 丢失。"
-#: wt-status.c:1178
+#: wt-status.c:1191
msgid "No commands done."
msgstr "没有命令被执行。"
-#: wt-status.c:1181
+#: wt-status.c:1194
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
msgstr[1] "最后的命令已完成(%d 条命令被执行):"
-#: wt-status.c:1192
+#: wt-status.c:1205
#, c-format
msgid " (see more in file %s)"
msgstr " (更多参见文件 %s)"
-#: wt-status.c:1197
+#: wt-status.c:1210
msgid "No commands remaining."
msgstr "未剩下任何命令。"
-#: wt-status.c:1200
+#: wt-status.c:1213
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
@@ -4095,165 +4360,165 @@ msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
# 译者:注意保持前导空格
-#: wt-status.c:1208
+#: wt-status.c:1221
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
-#: wt-status.c:1221
+#: wt-status.c:1234
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
-#: wt-status.c:1226
+#: wt-status.c:1239
msgid "You are currently rebasing."
msgstr "您在执行变基操作。"
# 译者:注意保持前导空格
-#: wt-status.c:1240
+#: wt-status.c:1253
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
# 译者:注意保持前导空格
-#: wt-status.c:1242
+#: wt-status.c:1255
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
# 译者:注意保持前导空格
-#: wt-status.c:1244
+#: wt-status.c:1257
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
# 译者:注意保持前导空格
-#: wt-status.c:1250
+#: wt-status.c:1263
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
-#: wt-status.c:1254
+#: wt-status.c:1267
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
-#: wt-status.c:1259
+#: wt-status.c:1272
msgid "You are currently splitting a commit during a rebase."
msgstr "您在执行变基操作时拆分提交。"
# 译者:注意保持前导空格
-#: wt-status.c:1262
+#: wt-status.c:1275
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
-#: wt-status.c:1266
+#: wt-status.c:1279
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
-#: wt-status.c:1271
+#: wt-status.c:1284
msgid "You are currently editing a commit during a rebase."
msgstr "您在执行变基操作时编辑提交。"
# 译者:注意保持前导空格
-#: wt-status.c:1274
+#: wt-status.c:1287
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (使用 \"git commit --amend\" 修补当前提交)"
# 译者:注意保持前导空格
-#: wt-status.c:1276
+#: wt-status.c:1289
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
-#: wt-status.c:1286
+#: wt-status.c:1299
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在执行拣选提交 %s 的操作。"
# 译者:注意保持前导空格
-#: wt-status.c:1291
+#: wt-status.c:1304
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
# 译者:注意保持前导空格
-#: wt-status.c:1294
+#: wt-status.c:1307
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
# 译者:注意保持前导空格
-#: wt-status.c:1296
+#: wt-status.c:1309
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
-#: wt-status.c:1305
+#: wt-status.c:1318
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在执行反转提交 %s 的操作。"
# 译者:注意保持前导空格
-#: wt-status.c:1310
+#: wt-status.c:1323
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (解决冲突并运行 \"git revert --continue\")"
# 译者:注意保持前导空格
-#: wt-status.c:1313
+#: wt-status.c:1326
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
# 译者:注意保持前导空格
-#: wt-status.c:1315
+#: wt-status.c:1328
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
-#: wt-status.c:1326
+#: wt-status.c:1339
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
-#: wt-status.c:1330
+#: wt-status.c:1343
msgid "You are currently bisecting."
msgstr "您在执行二分查找操作。"
# 译者:注意保持前导空格
-#: wt-status.c:1333
+#: wt-status.c:1346
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
-#: wt-status.c:1530
+#: wt-status.c:1543
msgid "On branch "
msgstr "位于分支 "
-#: wt-status.c:1536
+#: wt-status.c:1549
msgid "interactive rebase in progress; onto "
msgstr "交互式变基操作正在进行中;至 "
-#: wt-status.c:1538
+#: wt-status.c:1551
msgid "rebase in progress; onto "
msgstr "变基操作正在进行中;至 "
-#: wt-status.c:1543
+#: wt-status.c:1556
msgid "HEAD detached at "
msgstr "头指针分离于 "
-#: wt-status.c:1545
+#: wt-status.c:1558
msgid "HEAD detached from "
msgstr "头指针分离自 "
-#: wt-status.c:1548
+#: wt-status.c:1561
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
-#: wt-status.c:1566
+#: wt-status.c:1579
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1580
+#: wt-status.c:1593
msgid "Untracked files"
msgstr "未跟踪的文件"
-#: wt-status.c:1582
+#: wt-status.c:1595
msgid "Ignored files"
msgstr "忽略的文件"
-#: wt-status.c:1586
+#: wt-status.c:1599
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4263,103 +4528,99 @@ msgstr ""
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
"但您需要小心不要忘了添加新文件(参见 'git help status')。"
-#: wt-status.c:1592
+#: wt-status.c:1605
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者:中文字符串拼接,可删除前导空格
-#: wt-status.c:1594
+#: wt-status.c:1607
msgid " (use -u option to show untracked files)"
msgstr "(使用 -u 参数显示未跟踪的文件)"
-#: wt-status.c:1600
+#: wt-status.c:1613
msgid "No changes"
msgstr "没有修改"
-#: wt-status.c:1605
+#: wt-status.c:1618
#, 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:1608
+#: wt-status.c:1621
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1611
+#: wt-status.c:1624
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
-#: wt-status.c:1614
+#: wt-status.c:1627
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交为空,但是存在尚未跟踪的文件\n"
# 译者:中文字符串拼接,可删除前导空格
-#: wt-status.c:1617
+#: wt-status.c:1630
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
-#: wt-status.c:1620 wt-status.c:1625
+#: wt-status.c:1633 wt-status.c:1638
#, c-format
msgid "nothing to commit\n"
msgstr "无文件要提交\n"
# 译者:中文字符串拼接,可删除前导空格
-#: wt-status.c:1623
+#: wt-status.c:1636
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
# 译者:中文字符串拼接,可删除前导空格
-#: wt-status.c:1627
+#: wt-status.c:1640
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "无文件要提交,干净的工作区\n"
# 译者:注意保持句尾空格
-#: wt-status.c:1734
+#: wt-status.c:1749
msgid "Initial commit on "
msgstr "初始提交于 "
-#: wt-status.c:1738
+#: wt-status.c:1753
msgid "HEAD (no branch)"
msgstr "HEAD(非分支)"
-#: wt-status.c:1767
-msgid "gone"
-msgstr "丢失"
-
# 译者:注意保持句尾空格
-#: wt-status.c:1769 wt-status.c:1777
+#: wt-status.c:1782 wt-status.c:1790
msgid "behind "
msgstr "落后 "
-#: wt-status.c:1772 wt-status.c:1775
+#: wt-status.c:1785 wt-status.c:1788
msgid "ahead "
msgstr "领先 "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2277
+#: wt-status.c:2280
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "不能%s:您有未暂存的变更。"
-#: wt-status.c:2283
+#: wt-status.c:2286
msgid "additionally, your index contains uncommitted changes."
msgstr "另外,您的索引中包含未提交的变更。"
-#: wt-status.c:2285
+#: wt-status.c:2288
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s:您的索引中包含未提交的变更。"
-#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#: compat/precompose_utf8.c:57 builtin/clone.c:432
#, c-format
msgid "failed to unlink '%s'"
msgstr "无法删除 '%s'"
@@ -4386,7 +4647,7 @@ msgstr "删除 '%s'\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更:"
-#: builtin/add.c:209 builtin/rev-parse.c:845
+#: builtin/add.c:209 builtin/rev-parse.c:872
msgid "Could not read the index"
msgstr "不能读取索引"
@@ -4406,7 +4667,7 @@ msgstr "编辑补丁失败"
#: builtin/add.c:230
#, c-format
msgid "Could not stat '%s'"
-msgstr "不能查看文件状态 '%s'"
+msgstr "不能对 '%s' 调用 stat"
#: builtin/add.c:232
msgid "Empty patch. Aborted."
@@ -4421,9 +4682,9 @@ msgstr "不能应用 '%s'"
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
-#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123
+#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123
#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
-#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162
+#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
msgid "dry run"
msgstr "演习"
@@ -4431,7 +4692,7 @@ msgstr "演习"
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
@@ -4471,11 +4732,11 @@ msgstr "跳过因出错不能添加的文件"
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
-#: builtin/add.c:283 builtin/update-index.c:947
+#: builtin/add.c:283 builtin/update-index.c:951
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:283 builtin/update-index.c:948
+#: builtin/add.c:283 builtin/update-index.c:952
msgid "override the executable bit of the listed files"
msgstr "覆盖列表里文件的可执行位"
@@ -4511,112 +4772,112 @@ msgstr "没有指定文件,也没有文件被添加。\n"
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想要执行 'git add .'?\n"
-#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298
+#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350
#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
#: builtin/submodule--helper.c:244
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: builtin/am.c:414
+#: builtin/am.c:412
msgid "could not parse author script"
msgstr "不能解析作者脚本"
-#: builtin/am.c:491
+#: builtin/am.c:489
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/am.c:532
+#: builtin/am.c:530
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行:'%s'。"
-#: builtin/am.c:569
+#: builtin/am.c:567
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/am.c:595
+#: builtin/am.c:593
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:775
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
-#: builtin/am.c:840
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: builtin/am.c:887
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:892 builtin/am.c:900
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:895
+#: builtin/am.c:897
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
-#: builtin/am.c:984
+#: builtin/am.c:986
msgid "Patch format detection failed."
-msgstr "补丁格式检测失败。"
+msgstr "补丁格式探测失败。"
-#: builtin/am.c:989 builtin/clone.c:379
+#: builtin/am.c:991 builtin/clone.c:397
#, c-format
msgid "failed to create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: builtin/am.c:993
+#: builtin/am.c:995
msgid "Failed to split patches."
msgstr "无法拆分补丁。"
-#: builtin/am.c:1125 builtin/commit.c:376
+#: builtin/am.c:1127 builtin/commit.c:376
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1176
+#: builtin/am.c:1178
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题,执行 \"%s --continue\"。"
-#: builtin/am.c:1177
+#: builtin/am.c:1179
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
-#: builtin/am.c:1178
+#: builtin/am.c:1180
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
-#: builtin/am.c:1316
+#: builtin/am.c:1315
msgid "Patch is empty. Was it split wrong?"
msgstr "补丁为空。是不是切分错误?"
-#: builtin/am.c:1390 builtin/log.c:1550
+#: builtin/am.c:1386 builtin/log.c:1557
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识:%s"
-#: builtin/am.c:1417
+#: builtin/am.c:1413
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: builtin/am.c:1610
+#: builtin/am.c:1606
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/am.c:1612
+#: builtin/am.c:1608
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个(三方合并的)基础目录树..."
-#: builtin/am.c:1631
+#: builtin/am.c:1627
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4624,37 +4885,37 @@ msgstr ""
"您是否曾手动编辑过您的补丁?\n"
"无法应用补丁到索引中的数据对象上。"
-#: builtin/am.c:1637
+#: builtin/am.c:1633
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/am.c:1662
+#: builtin/am.c:1658
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
-#: builtin/am.c:1686 builtin/merge.c:632
+#: builtin/am.c:1682 builtin/merge.c:631
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入一树对象"
-#: builtin/am.c:1693
+#: builtin/am.c:1689
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr "无法写提交对象"
-#: builtin/am.c:1739 builtin/am.c:1743
+#: builtin/am.c:1735 builtin/am.c:1739
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续:%s 不存在。"
-#: builtin/am.c:1759
+#: builtin/am.c:1755
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "标准输入没有和终端关联,不能进行交互式操作。"
-#: builtin/am.c:1764
+#: builtin/am.c:1760
msgid "Commit Body is:"
msgstr "提交内容为:"
@@ -4663,35 +4924,35 @@ msgstr "提交内容为:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1774
+#: builtin/am.c:1770
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
-#: builtin/am.c:1824
+#: builtin/am.c:1820
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引:不能应用补丁(脏文件:%s)"
-#: builtin/am.c:1861 builtin/am.c:1933
+#: builtin/am.c:1860 builtin/am.c:1932
#, c-format
msgid "Applying: %.*s"
msgstr "应用:%.*s"
-#: builtin/am.c:1877
+#: builtin/am.c:1876
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:1885
+#: builtin/am.c:1884
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:1891
+#: builtin/am.c:1890
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "失败的补丁文件副本位于:%s"
-#: builtin/am.c:1936
+#: builtin/am.c:1935
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -4701,7 +4962,7 @@ msgstr ""
"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
-#: builtin/am.c:1943
+#: builtin/am.c:1942
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -4709,149 +4970,149 @@ msgstr ""
"您的索引中仍有未合并的路径。\n"
"您是否忘了执行 'git add'?"
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:2103
+#: builtin/am.c:2102
msgid "failed to clean index"
msgstr "无法清空索引"
-#: builtin/am.c:2137
+#: builtin/am.c:2136
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:2200
+#: builtin/am.c:2199
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值:%s"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要,允许使用三方合并。"
-#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:178
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:2247
+#: builtin/am.c:2246
msgid "add a Signed-off-by line to the commit message"
msgstr "在提交说明中添加一个 Signed-off-by 签名"
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集(默认)"
-#: builtin/am.c:2252
+#: builtin/am.c:2251
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:2254
+#: builtin/am.c:2253
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:2261
+#: builtin/am.c:2260
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
+#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274
+#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286
+#: builtin/am.c:2292
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135
+#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
-#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355
+#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:387 builtin/verify-tag.c:38
+#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37
+#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
-#: builtin/am.c:2290
+#: builtin/am.c:2289
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:2298
+#: builtin/am.c:2297
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "restore the original branch and abort the patching operation."
msgstr "恢复原始分支并终止打补丁操作。"
-#: builtin/am.c:2311
+#: builtin/am.c:2310
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233
-#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370
+#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2316
+#: builtin/am.c:2315
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "(internal use for git-rebase)"
msgstr "(内部使用,用于 git-rebase)"
-#: builtin/am.c:2334
+#: builtin/am.c:2333
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."
@@ -4859,16 +5120,16 @@ msgstr ""
"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
"请不要再使用它了。"
-#: builtin/am.c:2341
+#: builtin/am.c:2340
msgid "failed to read the index"
msgstr "无法读取索引"
-#: builtin/am.c:2356
+#: builtin/am.c:2355
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
-#: builtin/am.c:2380
+#: builtin/am.c:2379
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -4877,7 +5138,7 @@ msgstr ""
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2386
+#: builtin/am.c:2385
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行,我们不会继续。"
@@ -4907,11 +5168,6 @@ msgstr "git archive:应为 ACK/NACK,却得到 EOF"
msgid "git archive: NACK %s"
msgstr "git archive:NACK %s"
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "远程错误:%s"
-
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr "git archive:协议错误"
@@ -4940,111 +5196,111 @@ msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
-#: builtin/blame.c:1786
+#: builtin/blame.c:1777
msgid "Blaming lines"
msgstr "追踪代码行"
-#: builtin/blame.c:2582
+#: builtin/blame.c:2573
msgid "Show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
-#: builtin/blame.c:2583
+#: builtin/blame.c:2574
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "边界提交显示空的 SHA-1(默认:关闭)"
-#: builtin/blame.c:2584
+#: builtin/blame.c:2575
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界(默认:关闭)"
-#: builtin/blame.c:2585
+#: builtin/blame.c:2576
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
-#: builtin/blame.c:2586
+#: builtin/blame.c:2577
msgid "Force progress reporting"
msgstr "强制进度显示"
-#: builtin/blame.c:2587
+#: builtin/blame.c:2578
msgid "Show output score for blame entries"
msgstr "显示判断 blame 条目位移的得分诊断信息"
-#: builtin/blame.c:2588
+#: builtin/blame.c:2579
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件名(默认:自动)"
-#: builtin/blame.c:2589
+#: builtin/blame.c:2580
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行号(默认:关闭)"
-#: builtin/blame.c:2590
+#: builtin/blame.c:2581
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
-#: builtin/blame.c:2591
+#: builtin/blame.c:2582
msgid "Show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
-#: builtin/blame.c:2592
+#: builtin/blame.c:2583
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
-#: builtin/blame.c:2593
+#: builtin/blame.c:2584
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳(默认:关闭)"
-#: builtin/blame.c:2594
+#: builtin/blame.c:2585
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 提交号(默认:关闭)"
-#: builtin/blame.c:2595
+#: builtin/blame.c:2586
msgid "Suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳(默认:关闭)"
-#: builtin/blame.c:2596
+#: builtin/blame.c:2587
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字(默认:关闭)"
-#: builtin/blame.c:2597
+#: builtin/blame.c:2588
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:2604
+#: builtin/blame.c:2595
msgid "Use an experimental heuristic to improve diffs"
msgstr "使用一个试验性的启发式算法改进差异显示"
-#: builtin/blame.c:2606
+#: builtin/blame.c:2597
msgid "Spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
-#: builtin/blame.c:2607
+#: builtin/blame.c:2598
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
-#: builtin/blame.c:2608
+#: builtin/blame.c:2599
msgid "Use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的图片"
-#: builtin/blame.c:2609 builtin/blame.c:2610
+#: builtin/blame.c:2600 builtin/blame.c:2601
msgid "score"
msgstr "得分"
-#: builtin/blame.c:2609
+#: builtin/blame.c:2600
msgid "Find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
-#: builtin/blame.c:2610
+#: builtin/blame.c:2601
msgid "Find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "Process only line range n,m, counting from 1"
msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
-#: builtin/blame.c:2658
+#: builtin/blame.c:2649
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
@@ -5054,38 +5310,38 @@ msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2706
+#: builtin/blame.c:2697
msgid "4 years, 11 months ago"
msgstr "4 年 11 个月前"
-#: builtin/blame.c:2786
+#: builtin/blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
-#: builtin/blame.c:2806
+#: builtin/blame.c:2797
msgid "cannot use --contents with final commit object name"
msgstr "不能将 --contents 和最终的提交对象名共用"
-#: builtin/blame.c:2811
+#: builtin/blame.c:2802
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
-#: builtin/blame.c:2838
+#: builtin/blame.c:2829
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
-#: builtin/blame.c:2849
+#: builtin/blame.c:2840
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中无此路径 %1$s"
-#: builtin/blame.c:2860
+#: builtin/blame.c:2851
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能为路径 %2$s 读取数据对象 %1$s"
-#: builtin/blame.c:2879
+#: builtin/blame.c:2870
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
@@ -5112,8 +5368,12 @@ msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<选项>] [-r | -a] [--points-at]"
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<选项>] [-r | -a] [--format]"
+
# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:143
+#: builtin/branch.c:144
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5123,7 +5383,7 @@ msgstr ""
" '%s',但未合并到 HEAD。"
# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:147
+#: builtin/branch.c:148
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5132,12 +5392,12 @@ msgstr ""
"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
" 然而却尚未被合并到分支 '%s' 。"
-#: builtin/branch.c:161
+#: builtin/branch.c:162
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"
-#: builtin/branch.c:165
+#: builtin/branch.c:166
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5146,163 +5406,91 @@ msgstr ""
"分支 '%s' 没有完全合并。\n"
"如果您确认要删除它,执行 'git branch -D %s'。"
-#: builtin/branch.c:178
+#: builtin/branch.c:179
msgid "Update of config-file failed"
msgstr "无法更新 config 文件"
-#: builtin/branch.c:206
+#: builtin/branch.c:210
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 同时使用"
-#: builtin/branch.c:212
+#: builtin/branch.c:216
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
-#: builtin/branch.c:241
+#: builtin/branch.c:245
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到远程跟踪分支 '%s'。"
-#: builtin/branch.c:242
+#: builtin/branch.c:246
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未发现。"
-#: builtin/branch.c:257
+#: builtin/branch.c:261
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "无法删除远程跟踪分支 '%s'"
-#: builtin/branch.c:258
+#: builtin/branch.c:262
#, c-format
msgid "Error deleting branch '%s'"
msgstr "无法删除分支 '%s'"
-#: builtin/branch.c:265
+#: builtin/branch.c:269
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
-#: builtin/branch.c:266
+#: builtin/branch.c:270
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s(曾为 %s)。\n"
-#: builtin/branch.c:312
-#, c-format
-msgid "[%s: gone]"
-msgstr "[%s: 丢失]"
-
-#: builtin/branch.c:317
-#, c-format
-msgid "[%s]"
-msgstr "[%s]"
-
-#: builtin/branch.c:322
-#, c-format
-msgid "[%s: behind %d]"
-msgstr "[%s:落后 %d]"
-
-#: builtin/branch.c:324
-#, c-format
-msgid "[behind %d]"
-msgstr "[落后 %d]"
-
-#: builtin/branch.c:328
-#, c-format
-msgid "[%s: ahead %d]"
-msgstr "[%s:领先 %d]"
-
-#: builtin/branch.c:330
-#, c-format
-msgid "[ahead %d]"
-msgstr "[领先 %d]"
-
-#: builtin/branch.c:333
-#, c-format
-msgid "[%s: ahead %d, behind %d]"
-msgstr "[%s:领先 %d,落后 %d]"
-
-#: builtin/branch.c:336
-#, c-format
-msgid "[ahead %d, behind %d]"
-msgstr "[领先 %d,落后 %d]"
-
-#: builtin/branch.c:349
-msgid " **** invalid ref ****"
-msgstr " **** 无效引用 ****"
-
-#: builtin/branch.c:375
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(非分支,正变基 %s)"
-
-#: builtin/branch.c:378
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(非分支,二分查找开始于 %s)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:384
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(头指针分离于 %s)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:389
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(头指针分离自 %s)"
-
-#: builtin/branch.c:393
-msgid "(no branch)"
-msgstr "(非分支)"
-
-#: builtin/branch.c:535
+#: builtin/branch.c:441
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被变基到 %s"
-#: builtin/branch.c:539
+#: builtin/branch.c:445
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分查找于 %s"
-#: builtin/branch.c:554
+#: builtin/branch.c:460
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
-#: builtin/branch.c:564
+#: builtin/branch.c:470
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名:'%s'"
-#: builtin/branch.c:581
+#: builtin/branch.c:487
msgid "Branch rename failed"
msgstr "分支重命名失败"
-#: builtin/branch.c:585
+#: builtin/branch.c:490
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "重命名掉一个错误命名的旧分支 '%s'"
-#: builtin/branch.c:588
+#: builtin/branch.c:493
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s,但 HEAD 没有更新!"
-#: builtin/branch.c:595
+#: builtin/branch.c:502
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名,但更新 config 文件失败"
-#: builtin/branch.c:611
+#: builtin/branch.c:518
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5313,204 +5501,213 @@ msgstr ""
" %s\n"
"以 '%c' 开头的行将被过滤。\n"
-#: builtin/branch.c:643
+#: builtin/branch.c:551
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:645
+#: builtin/branch.c:553
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
-#: builtin/branch.c:646
+#: builtin/branch.c:554
msgid "suppress informational messages"
msgstr "不显示信息"
-#: builtin/branch.c:647
+#: builtin/branch.c:555
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模式(参见 git-pull(1))"
-#: builtin/branch.c:649
+#: builtin/branch.c:557
msgid "change upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "change the upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:652
+#: builtin/branch.c:560
msgid "Unset the upstream info"
msgstr "取消上游信息的设置"
-#: builtin/branch.c:653
+#: builtin/branch.c:561
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:654
+#: builtin/branch.c:562
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:656 builtin/branch.c:657
+#: builtin/branch.c:564 builtin/branch.c:566
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
-#: builtin/branch.c:660
+#: builtin/branch.c:565 builtin/branch.c:567
+msgid "print only branches that don't contain the commit"
+msgstr "只打印不包含该提交的分支"
+
+#: builtin/branch.c:570
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作:"
-#: builtin/branch.c:661
+#: builtin/branch.c:571
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
-#: builtin/branch.c:663
+#: builtin/branch.c:573
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
-#: builtin/branch.c:664
+#: builtin/branch.c:574
msgid "delete branch (even if not merged)"
msgstr "删除分支(即使没有合并)"
-#: builtin/branch.c:665
+#: builtin/branch.c:575
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支,以及它的引用日志"
-#: builtin/branch.c:666
+#: builtin/branch.c:576
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支,即使目标已存在"
-#: builtin/branch.c:667
+#: builtin/branch.c:577
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:668
+#: builtin/branch.c:578
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:670
+#: builtin/branch.c:580
msgid "edit the description for the branch"
msgstr "标记分支的描述"
-#: builtin/branch.c:671
+#: builtin/branch.c:581
msgid "force creation, move/rename, deletion"
msgstr "强制创建、移动/重命名、删除"
-#: builtin/branch.c:672
+#: builtin/branch.c:582
msgid "print only branches that are merged"
msgstr "只打印已经合并的分支"
-#: builtin/branch.c:673
+#: builtin/branch.c:583
msgid "print only branches that are not merged"
msgstr "只打印尚未合并的分支"
-#: builtin/branch.c:674
+#: builtin/branch.c:584
msgid "list branches in columns"
msgstr "以列的方式显示分支"
-#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381
+#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
msgid "key"
msgstr "key"
-#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382
+#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
msgid "field name to sort on"
msgstr "排序的字段名"
-#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404
#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
-#: builtin/tag.c:384
+#: builtin/tag.c:429
msgid "object"
msgstr "对象"
-#: builtin/branch.c:679
+#: builtin/branch.c:589
msgid "print only branches of the object"
msgstr "只打印指向该对象的分支"
-#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388
+#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
msgid "sorting and filtering are case insensitive"
msgstr "排序和过滤属于大小写不敏感"
-#: builtin/branch.c:698
+#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
+msgstr "输出格式"
+
+#: builtin/branch.c:611
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
-#: builtin/branch.c:702 builtin/clone.c:706
+#: builtin/branch.c:615 builtin/clone.c:724
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下!"
-#: builtin/branch.c:724
+#: builtin/branch.c:638
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
-#: builtin/branch.c:735 builtin/branch.c:787
+#: builtin/branch.c:649 builtin/branch.c:701
msgid "branch name required"
msgstr "必须提供分支名"
-#: builtin/branch.c:763
+#: builtin/branch.c:677
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
-#: builtin/branch.c:768
+#: builtin/branch.c:682
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
-#: builtin/branch.c:775
+#: builtin/branch.c:689
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
-#: builtin/branch.c:778
+#: builtin/branch.c:692
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:793
+#: builtin/branch.c:707
msgid "too many branches for a rename operation"
msgstr "为重命名操作提供了太多的分支名"
-#: builtin/branch.c:798
+#: builtin/branch.c:712
msgid "too many branches to set new upstream"
msgstr "为设置新上游提供了太多的分支名"
-#: builtin/branch.c:802
+#: builtin/branch.c:716
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
-#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848
+#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:809
+#: builtin/branch.c:723
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:821
+#: builtin/branch.c:735
msgid "too many branches to unset upstream"
msgstr "为取消上游设置操作提供了太多的分支名"
-#: builtin/branch.c:825
+#: builtin/branch.c:739
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/branch.c:831
+#: builtin/branch.c:745
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
-#: builtin/branch.c:845
+#: builtin/branch.c:759
msgid "it does not make sense to create 'HEAD' manually"
msgstr "手工创建 'HEAD' 没有意义"
-#: builtin/branch.c:851
+#: builtin/branch.c:765
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
-#: builtin/branch.c:854
+#: builtin/branch.c:768
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -5518,7 +5715,7 @@ msgid ""
msgstr ""
"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
-#: builtin/branch.c:871
+#: builtin/branch.c:785
#, c-format
msgid ""
"\n"
@@ -5529,16 +5726,16 @@ msgstr ""
"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
"\n"
-#: builtin/bundle.c:51
+#: builtin/bundle.c:45
#, c-format
msgid "%s is okay\n"
msgstr "%s 可以\n"
-#: builtin/bundle.c:64
+#: builtin/bundle.c:58
msgid "Need a repository to create a bundle."
msgstr "需要一个仓库来创建包。"
-#: builtin/bundle.c:68
+#: builtin/bundle.c:62
msgid "Need a repository to unbundle."
msgstr "需要一个仓库来解包。"
@@ -5586,7 +5783,7 @@ msgstr "对于数据对象,对其内容做文本转换"
msgid "for blob objects, run filters on object's content"
msgstr "对于数据对象,对其内容做过滤"
-#: builtin/cat-file.c:561 git-submodule.sh:929
+#: builtin/cat-file.c:561 git-submodule.sh:943
msgid "blob"
msgstr "数据对象"
@@ -5642,7 +5839,7 @@ msgstr "从标准输入读出文件名"
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
msgid "suppress progress reporting"
msgstr "不显示进度报告"
@@ -5732,9 +5929,9 @@ msgid "write the content to temporary files"
msgstr "将内容写入临时文件"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600
-#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967
-#: builtin/worktree.c:471
+#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
+#: builtin/worktree.c:477
msgid "string"
msgstr "字符串"
@@ -5746,114 +5943,114 @@ msgstr "在创建文件时,在前面加上 <字符串>"
msgid "copy out the files from named stage"
msgstr "从指定暂存区中拷出文件"
-#: builtin/checkout.c:25
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<选项>] <分支>"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: builtin/checkout.c:153 builtin/checkout.c:186
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: builtin/checkout.c:155 builtin/checkout.c:188
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
-#: builtin/checkout.c:152
+#: builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必须的版本"
-#: builtin/checkout.c:196
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必须的版本"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:232
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s':无法合并"
-#: builtin/checkout.c:230
+#: builtin/checkout.c:249
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
+#: builtin/checkout.c:278
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路径时使用"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:281 builtin/checkout.c:284
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 不能和 %s 同时使用"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:287
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同时更新路径并切换到分支'%s'。"
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:358 builtin/checkout.c:365
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:494
+#: builtin/checkout.c:513
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:644
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
-#: builtin/checkout.c:666
+#: builtin/checkout.c:685
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:670 builtin/clone.c:660
+#: builtin/checkout.c:689 builtin/clone.c:678
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:693
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:696
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:681
+#: builtin/checkout.c:700
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:683 builtin/checkout.c:1072
+#: builtin/checkout.c:702 builtin/checkout.c:1090
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:685
+#: builtin/checkout.c:704
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者:注意保持前导空格
-#: builtin/checkout.c:736
+#: builtin/checkout.c:755
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:742
+#: builtin/checkout.c:761
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -5874,7 +6071,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:761
+#: builtin/checkout.c:780
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5901,150 +6098,150 @@ msgstr[1] ""
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:816
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:820
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:828 builtin/checkout.c:1067
+#: builtin/checkout.c:847 builtin/checkout.c:1085
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:973
+#: builtin/checkout.c:991
#, c-format
msgid "only one reference expected, %d given."
msgstr "应只有一个引用,却给出了 %d 个"
-#: builtin/checkout.c:1013 builtin/worktree.c:214
+#: builtin/checkout.c:1031 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用:%s"
-#: builtin/checkout.c:1042
+#: builtin/checkout.c:1060
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树:%s"
-#: builtin/checkout.c:1081
+#: builtin/checkout.c:1099
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1084 builtin/checkout.c:1088
+#: builtin/checkout.c:1102 builtin/checkout.c:1106
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
+#: builtin/checkout.c:1121
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1108
+#: builtin/checkout.c:1126
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
-#: builtin/worktree.c:326
+#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329
+#: builtin/worktree.c:331
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1160
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1162
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1163
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1146 builtin/worktree.c:328
+#: builtin/checkout.c:1164 builtin/worktree.c:333
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1165
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1168
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1170
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1172
msgid "force checkout (throw away local modifications)"
msgstr "强制检出(丢弃本地修改)"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1173
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方合并"
-#: builtin/checkout.c:1156 builtin/merge.c:235
+#: builtin/checkout.c:1174 builtin/merge.c:234
msgid "update ignored files (default)"
msgstr "更新忽略的文件(默认)"
-#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251
+#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1176
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格(merge 或 diff3)"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1179
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1181
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "二次猜测'git checkout <无此分支>'"
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1183
msgid "do not check if another worktree is holding the given ref"
msgstr "不检查指定的引用是否被其他工作区所占用"
-#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119
-#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:168
+#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119
+#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539
+#: builtin/send-pack.c:172
msgid "force progress reporting"
msgstr "强制显示进度报告"
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1224
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b、-B 和 --orphan 是互斥的"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1241
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1219
+#: builtin/checkout.c:1246
msgid "Missing branch name; try -b"
msgstr "缺少分支名;尝试 -b"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1282
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -6053,12 +6250,12 @@ msgstr ""
"不能同时更新路径并切换到分支'%s'。\n"
"您是想要检出 '%s' 但其未能解析为提交么?"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1294
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout:--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1271
+#: builtin/checkout.c:1298
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6096,7 +6293,7 @@ msgstr "将忽略仓库 %s\n"
msgid "failed to remove %s"
msgstr "无法删除 %s"
-#: builtin/clean.c:291 git-add--interactive.perl:623
+#: builtin/clean.c:297 git-add--interactive.perl:614
#, c-format
msgid ""
"Prompt help:\n"
@@ -6109,7 +6306,7 @@ msgstr ""
"foo - 通过唯一前缀选择一个选项\n"
" - (空)什么也不选择\n"
-#: builtin/clean.c:295 git-add--interactive.perl:632
+#: builtin/clean.c:301 git-add--interactive.perl:623
#, c-format
msgid ""
"Prompt help:\n"
@@ -6130,38 +6327,38 @@ msgstr ""
"* - 选择所有选项\n"
" - (空)结束选择\n"
-#: builtin/clean.c:511 git-add--interactive.perl:598
-#: git-add--interactive.perl:603
+#: builtin/clean.c:517 git-add--interactive.perl:589
+#: git-add--interactive.perl:594
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "嗯(%s)?\n"
-#: builtin/clean.c:653
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "输入模版以排除条目>> "
-#: builtin/clean.c:690
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告:无法找到和 %s 匹配的条目"
-#: builtin/clean.c:711
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "选择要删除的条目"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:752
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "删除 %s [y/N]?"
-#: builtin/clean.c:777 git-add--interactive.perl:1669
+#: builtin/clean.c:783 git-add--interactive.perl:1660
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
-#: builtin/clean.c:785
+#: builtin/clean.c:791
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6179,69 +6376,70 @@ msgstr ""
"help - 显示本帮助\n"
"? - 显示如何在提示符下选择的帮助"
-#: builtin/clean.c:812 git-add--interactive.perl:1745
+#: builtin/clean.c:818 git-add--interactive.perl:1736
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: builtin/clean.c:813 git-add--interactive.perl:1742
+#: builtin/clean.c:819 git-add--interactive.perl:1733
msgid "What now"
msgstr "请选择"
-#: builtin/clean.c:821
+#: builtin/clean.c:827
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "将删除如下条目:"
msgstr[1] "将删除如下条目:"
-#: builtin/clean.c:838
+#: builtin/clean.c:844
msgid "No more files to clean, exiting."
msgstr "没有要清理的文件,退出。"
-#: builtin/clean.c:869
+#: builtin/clean.c:875
msgid "do not print names of files removed"
msgstr "不打印删除文件的名称"
-#: builtin/clean.c:871
+#: builtin/clean.c:877
msgid "force"
msgstr "强制"
-#: builtin/clean.c:872
+#: builtin/clean.c:878
msgid "interactive cleaning"
msgstr "交互式清除"
-#: builtin/clean.c:874
+#: builtin/clean.c:880
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
-#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176
+#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
+#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348
+#: builtin/name-rev.c:350 builtin/show-ref.c:176
msgid "pattern"
msgstr "模式"
-#: builtin/clean.c:876
+#: builtin/clean.c:882
msgid "add <pattern> to ignore rules"
msgstr "添加 <模式> 到忽略规则"
-#: builtin/clean.c:877
+#: builtin/clean.c:883
msgid "remove ignored files, too"
msgstr "也删除忽略的文件"
-#: builtin/clean.c:879
+#: builtin/clean.c:885
msgid "remove only ignored files"
msgstr "只删除忽略的文件"
-#: builtin/clean.c:897
+#: builtin/clean.c:903
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同时使用"
-#: builtin/clean.c:901
+#: builtin/clean.c:907
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:904
+#: builtin/clean.c:910
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6252,130 +6450,134 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-#: builtin/clone.c:65
+#: builtin/clone.c:80
msgid "don't create a checkout"
msgstr "不创建一个检出"
-#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
+#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "创建一个纯仓库"
-#: builtin/clone.c:70
+#: builtin/clone.c:85
msgid "create a mirror repository (implies bare)"
msgstr "创建一个镜像仓库(也是纯仓库)"
-#: builtin/clone.c:72
+#: builtin/clone.c:87
msgid "to clone from a local repository"
msgstr "从本地仓库克隆"
-#: builtin/clone.c:74
+#: builtin/clone.c:89
msgid "don't use local hardlinks, always copy"
msgstr "不使用本地硬链接,始终复制"
-#: builtin/clone.c:76
+#: builtin/clone.c:91
msgid "setup as shared repository"
msgstr "设置为共享仓库"
-#: builtin/clone.c:78 builtin/clone.c:80
+#: builtin/clone.c:93 builtin/clone.c:97
+msgid "pathspec"
+msgstr "路径规格"
+
+#: builtin/clone.c:93 builtin/clone.c:97
msgid "initialize submodules in the clone"
msgstr "在克隆时初始化子模组"
-#: builtin/clone.c:82
+#: builtin/clone.c:100
msgid "number of submodules cloned in parallel"
msgstr "并发克隆的子模组的数量"
-#: builtin/clone.c:83 builtin/init-db.c:475
+#: builtin/clone.c:101 builtin/init-db.c:475
msgid "template-directory"
msgstr "模板目录"
-#: builtin/clone.c:84 builtin/init-db.c:476
+#: builtin/clone.c:102 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604
-#: builtin/submodule--helper.c:970
+#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/submodule--helper.c:983
msgid "reference repository"
msgstr "参考仓库"
-#: builtin/clone.c:90
+#: builtin/clone.c:108
msgid "use --reference only while cloning"
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
-#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
msgid "name"
msgstr "名称"
-#: builtin/clone.c:92
+#: builtin/clone.c:110
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
-#: builtin/clone.c:94
+#: builtin/clone.c:112
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "检出 <分支> 而不是远程 HEAD"
-#: builtin/clone.c:96
+#: builtin/clone.c:114
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999
+#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
#: builtin/pull.c:202
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:98
+#: builtin/clone.c:116
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836
+#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
#: parse-options.h:142
msgid "time"
msgstr "时间"
-#: builtin/clone.c:100
+#: builtin/clone.c:118
msgid "create a shallow clone since a specific time"
msgstr "从一个特定时间创建一个浅克隆"
-#: builtin/clone.c:101 builtin/fetch.c:124
+#: builtin/clone.c:119 builtin/fetch.c:124
msgid "revision"
msgstr "版本"
-#: builtin/clone.c:102 builtin/fetch.c:125
+#: builtin/clone.c:120 builtin/fetch.c:125
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化浅克隆的历史,除了特定版本"
-#: builtin/clone.c:104
+#: builtin/clone.c:122
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
-#: builtin/clone.c:106
+#: builtin/clone.c:124
msgid "any cloned submodules will be shallow"
msgstr "子模组将以浅下载模式克隆"
-#: builtin/clone.c:107 builtin/init-db.c:484
+#: builtin/clone.c:125 builtin/init-db.c:484
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:108 builtin/init-db.c:485
+#: builtin/clone.c:126 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
-#: builtin/clone.c:109
+#: builtin/clone.c:127
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:110
+#: builtin/clone.c:128
msgid "set config inside the new repository"
msgstr "在新仓库中设置配置信息"
-#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
-#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
-#: builtin/clone.c:250
+#: builtin/clone.c:268
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6383,42 +6585,42 @@ msgstr ""
"无法猜到目录名。\n"
"请在命令行指定一个目录"
-#: builtin/clone.c:303
+#: builtin/clone.c:321
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
-#: builtin/clone.c:375
+#: builtin/clone.c:393
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
-#: builtin/clone.c:383
+#: builtin/clone.c:401
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:397
+#: builtin/clone.c:415
#, c-format
msgid "failed to stat %s\n"
-msgstr "无法枚举 %s 状态\n"
+msgstr "对 %s 调用 stat 失败\n"
-#: builtin/clone.c:419
+#: builtin/clone.c:437
#, c-format
msgid "failed to create link '%s'"
msgstr "无法创建链接 '%s'"
-#: builtin/clone.c:423
+#: builtin/clone.c:441
#, c-format
msgid "failed to copy file to '%s'"
msgstr "无法拷贝文件至 '%s'"
-#: builtin/clone.c:448
+#: builtin/clone.c:466
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:460
+#: builtin/clone.c:478
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6428,136 +6630,135 @@ msgstr ""
"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
"'git checkout -f HEAD' 重试\n"
-#: builtin/clone.c:537
+#: builtin/clone.c:555
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:632
+#: builtin/clone.c:650
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必须的对象"
-#: builtin/clone.c:648
+#: builtin/clone.c:666
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:697
+#: builtin/clone.c:715
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
-#: builtin/clone.c:728
+#: builtin/clone.c:746
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:768
+#: builtin/clone.c:786
msgid "unable to write parameters to config file"
msgstr "无法将参数写入配置文件"
-#: builtin/clone.c:831
+#: builtin/clone.c:849
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:833
+#: builtin/clone.c:851
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:866 builtin/receive-pack.c:1895
+#: builtin/clone.c:884 builtin/receive-pack.c:1900
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:870
+#: builtin/clone.c:888
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:883
+#: builtin/clone.c:901
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:886
+#: builtin/clone.c:904
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:899
+#: builtin/clone.c:917
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:905 builtin/fetch.c:1335
+#: builtin/clone.c:923 builtin/fetch.c:1337
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:915
+#: builtin/clone.c:933
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
-#: builtin/clone.c:925
+#: builtin/clone.c:943
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252
-#: builtin/submodule--helper.c:659 builtin/worktree.c:222
-#: builtin/worktree.c:249
+#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
+#: builtin/worktree.c:221 builtin/worktree.c:251
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:943
+#: builtin/clone.c:961
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:955
+#: builtin/clone.c:973
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:957
+#: builtin/clone.c:975
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:963
+#: builtin/clone.c:999
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1055
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
-#: builtin/clone.c:1021
+#: builtin/clone.c:1057
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
-#: builtin/clone.c:1023
+#: builtin/clone.c:1059
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
-#: builtin/clone.c:1026
+#: builtin/clone.c:1062
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆,忽略 --local"
-#: builtin/clone.c:1031
+#: builtin/clone.c:1067
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1035
+#: builtin/clone.c:1071
#, c-format
msgid "Don't know how to clone %s"
msgstr "不知道如何克隆 %s"
-#: builtin/clone.c:1090 builtin/clone.c:1098
+#: builtin/clone.c:1126 builtin/clone.c:1134
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:1101
+#: builtin/clone.c:1137
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
@@ -6745,11 +6946,6 @@ msgstr "提交 '%s' 有非法的作者信息"
msgid "malformed --author parameter"
msgstr "非法的 --author 参数"
-#: builtin/commit.c:611
-#, c-format
-msgid "invalid date format: %s"
-msgstr "无效的日期格式:%s"
-
#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
@@ -6761,7 +6957,7 @@ msgstr "无法选择一个未被当前提交说明使用的注释字符"
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
-#: builtin/commit.c:704 builtin/shortlog.c:295
+#: builtin/commit.c:704 builtin/shortlog.c:294
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(正从标准输入中读取日志信息)\n"
@@ -6860,7 +7056,7 @@ msgstr "无法读取索引"
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:968 builtin/tag.c:280
+#: builtin/commit.c:968 builtin/tag.c:273
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
@@ -6923,7 +7119,7 @@ msgstr "参数 --include/--only 不跟路径没有意义。"
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
-#: builtin/commit.c:1224 builtin/tag.c:495
+#: builtin/commit.c:1224 builtin/tag.c:551
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
@@ -6945,7 +7141,7 @@ msgid "version"
msgstr "版本"
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:442
+#: builtin/worktree.c:448
msgid "machine-readable output"
msgstr "机器可读的输出"
@@ -6958,7 +7154,7 @@ msgid "terminate entries with NUL"
msgstr "条目以 NUL 字符结尾"
#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:368
+#: builtin/fast-export.c:984 builtin/tag.c:411
msgid "mode"
msgstr "模式"
@@ -7014,7 +7210,7 @@ msgstr "在提交说明模板里显示差异"
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1586 builtin/tag.c:366
+#: builtin/commit.c:1586 builtin/tag.c:409
msgid "read message from file"
msgstr "从文件中读取提交说明"
@@ -7026,7 +7222,7 @@ msgstr "作者"
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1588 builtin/gc.c:333
+#: builtin/commit.c:1588 builtin/gc.c:357
msgid "date"
msgstr "日期"
@@ -7034,8 +7230,8 @@ msgstr "日期"
msgid "override date for commit"
msgstr "提交时覆盖日期"
-#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:364
+#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:407
msgid "message"
msgstr "说明"
@@ -7044,7 +7240,7 @@ msgid "commit message"
msgstr "提交说明"
#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
-#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81
+#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
msgid "commit"
msgstr "提交"
@@ -7068,7 +7264,7 @@ msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
-#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86
+#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: 签名"
@@ -7085,7 +7281,7 @@ msgstr "强制编辑提交"
msgid "default"
msgstr "default"
-#: builtin/commit.c:1598 builtin/tag.c:369
+#: builtin/commit.c:1598 builtin/tag.c:412
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除提交说明里的空格和#注释"
@@ -7093,8 +7289,8 @@ msgstr "设置如何删除提交说明里的空格和#注释"
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
-#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166
-#: builtin/revert.c:93
+#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
+#: builtin/revert.c:112
msgid "GPG sign commit"
msgstr "GPG 提交签名"
@@ -7187,139 +7383,139 @@ msgstr ""
msgid "git config [<options>]"
msgstr "git config [<选项>]"
-#: builtin/config.c:55
+#: builtin/config.c:56
msgid "Config file location"
msgstr "配置文件位置"
-#: builtin/config.c:56
+#: builtin/config.c:57
msgid "use global config file"
msgstr "使用全局配置文件"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "use system config file"
msgstr "使用系统级配置文件"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use repository config file"
msgstr "使用仓库级配置文件"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use given config file"
msgstr "使用指定的配置文件"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "blob-id"
msgstr "数据对象 ID"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "read config from given blob object"
msgstr "从给定的数据对象读取配置"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "Action"
msgstr "操作"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "get value: name [value-regex]"
msgstr "获取值:name [value-regex]"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "get all values: key [value-regex]"
msgstr "获得所有的值:key [value-regex]"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get values for regexp: name-regex [value-regex]"
msgstr "根据正则表达式获得值:name-regex [value-regex]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get value specific for the URL: section[.var] URL"
msgstr "获得 URL 取值:section[.var] URL"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "replace all matching variables: name value [value_regex]"
msgstr "替换所有匹配的变量:name value [value_regex]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "add a new variable: name value"
msgstr "添加一个新的变量:name value"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "remove a variable: name [value-regex]"
msgstr "删除一个变量:name [value-regex]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "remove all matches: name [value-regex]"
msgstr "删除所有匹配项:name [value-regex]"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "rename section: old-name new-name"
msgstr "重命名小节:old-name new-name"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove a section: name"
msgstr "删除一个小节:name"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "list all"
msgstr "列出所有"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "open an editor"
msgstr "打开一个编辑器"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "find the color configured: slot [default]"
msgstr "获得配置的颜色:配置 [默认]"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "获得颜色设置:配置 [stdout-is-tty]"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "Type"
msgstr "类型"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "value is \"true\" or \"false\""
msgstr "值是 \"true\" 或 \"false\""
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "value is decimal number"
msgstr "值是十进制数"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is --bool or --int"
msgstr "值是 --bool or --int"
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is a path (file or directory name)"
msgstr "值是一个路径(文件或目录名)"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "Other"
msgstr "其它"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "terminate values with NUL byte"
msgstr "终止值是 NUL 字节"
-#: builtin/config.c:83
+#: builtin/config.c:84
msgid "show variable names only"
msgstr "只显示变量名"
-#: builtin/config.c:84
+#: builtin/config.c:85
msgid "respect include directives on lookup"
msgstr "查询时参照 include 指令递归查找"
-#: builtin/config.c:85
+#: builtin/config.c:86
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
-#: builtin/config.c:327
+#: builtin/config.c:328
msgid "unable to parse default color value"
msgstr "不能解析默认颜色值"
-#: builtin/config.c:471
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7334,12 +7530,12 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:613
+#: builtin/config.c:615
#, c-format
msgid "cannot create configuration file %s"
msgstr "不能创建配置文件 %s"
-#: builtin/config.c:625
+#: builtin/config.c:627
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7356,55 +7552,67 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
msgid "print sizes in human readable format"
msgstr "以用户可读的格式显示大小"
-#: builtin/describe.c:17
+#: builtin/describe.c:18
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<选项>] [<提交号>...]"
-#: builtin/describe.c:18
+#: builtin/describe.c:19
msgid "git describe [<options>] --dirty"
msgstr "git describe [<选项>] --dirty"
-#: builtin/describe.c:217
+#: builtin/describe.c:53
+msgid "head"
+msgstr "头"
+
+#: builtin/describe.c:53
+msgid "lightweight"
+msgstr "轻量级的"
+
+#: builtin/describe.c:53
+msgid "annotated"
+msgstr "附注的"
+
+#: builtin/describe.c:250
#, c-format
msgid "annotated tag %s not available"
msgstr "附注标签 %s 无效"
-#: builtin/describe.c:221
+#: builtin/describe.c:254
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "附注标签 %s 没有嵌入名称"
-#: builtin/describe.c:223
+#: builtin/describe.c:256
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "标签 '%s' 的确是在 '%s'"
-#: builtin/describe.c:250 builtin/log.c:480
+#: builtin/describe.c:283 builtin/log.c:487
#, c-format
msgid "Not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
-#: builtin/describe.c:253
+#: builtin/describe.c:286
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一个有效的 '%s' 对象"
-#: builtin/describe.c:270
+#: builtin/describe.c:303
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "没有标签准确匹配 '%s'"
-#: builtin/describe.c:272
+#: builtin/describe.c:305
#, c-format
msgid "searching to describe %s\n"
msgstr "搜索描述 %s\n"
-#: builtin/describe.c:319
+#: builtin/describe.c:352
#, c-format
msgid "finished search at %s\n"
msgstr "完成搜索 %s\n"
-#: builtin/describe.c:346
+#: builtin/describe.c:379
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7413,7 +7621,7 @@ msgstr ""
"没有附注标签能描述 '%s'。\n"
"然而,存在未附注标签:尝试 --tags。"
-#: builtin/describe.c:350
+#: builtin/describe.c:383
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7422,12 +7630,12 @@ msgstr ""
"没有标签能描述 '%s'。\n"
"尝试 --always,或者创建一些标签。"
-#: builtin/describe.c:371
+#: builtin/describe.c:413
#, c-format
msgid "traversed %lu commits\n"
msgstr "已遍历 %lu 个提交\n"
-#: builtin/describe.c:374
+#: builtin/describe.c:416
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7436,65 +7644,77 @@ msgstr ""
"发现多于 %i 个标签,列出最近的 %i 个\n"
"在 %s 放弃搜索\n"
-#: builtin/describe.c:396
+#: builtin/describe.c:438
msgid "find the tag that comes after the commit"
msgstr "寻找该提交之后的标签"
-#: builtin/describe.c:397
+#: builtin/describe.c:439
msgid "debug search strategy on stderr"
msgstr "在标准错误上调试搜索策略"
-#: builtin/describe.c:398
+#: builtin/describe.c:440
msgid "use any ref"
msgstr "使用任意引用"
-#: builtin/describe.c:399
+#: builtin/describe.c:441
msgid "use any tag, even unannotated"
msgstr "使用任意标签,即使未附带注释"
-#: builtin/describe.c:400
+#: builtin/describe.c:442
msgid "always use long format"
msgstr "始终使用长提交号格式"
-#: builtin/describe.c:401
+#: builtin/describe.c:443
msgid "only follow first parent"
msgstr "只跟随第一个父提交"
-#: builtin/describe.c:404
+#: builtin/describe.c:446
msgid "only output exact matches"
msgstr "只输出精确匹配"
-#: builtin/describe.c:406
+#: builtin/describe.c:448
msgid "consider <n> most recent tags (default: 10)"
msgstr "考虑最近 <n> 个标签(默认:10)"
-#: builtin/describe.c:408
+#: builtin/describe.c:450
msgid "only consider tags matching <pattern>"
msgstr "只考虑匹配 <模式> 的标签"
-#: builtin/describe.c:410 builtin/name-rev.c:320
+#: builtin/describe.c:452
+msgid "do not consider tags matching <pattern>"
+msgstr "不考虑匹配 <模式> 的标签"
+
+#: builtin/describe.c:454 builtin/name-rev.c:357
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的提交号作为后备"
-#: builtin/describe.c:411
+#: builtin/describe.c:455 builtin/describe.c:458
msgid "mark"
msgstr "标记"
-#: builtin/describe.c:412
+#: builtin/describe.c:456
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
-#: builtin/describe.c:430
+#: builtin/describe.c:459
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
+
+#: builtin/describe.c:477
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 与 --abbrev=0 不兼容"
-#: builtin/describe.c:456
+#: builtin/describe.c:506
msgid "No names found, cannot describe anything."
msgstr "没有发现名称,无法描述任何东西。"
-#: builtin/describe.c:476
+#: builtin/describe.c:549
msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty 不能与提交同时使用"
+msgstr "--dirty 与提交号不兼容"
+
+#: builtin/describe.c:551
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken 与提交号不兼容"
#: builtin/diff.c:83
#, c-format
@@ -7534,77 +7754,94 @@ msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
msgid "failed: %d"
msgstr "失败:%d"
-#: builtin/difftool.c:342
+#: builtin/difftool.c:283
+#, c-format
+msgid "could not read symlink %s"
+msgstr "无法读取符号链接 %s"
+
+#: builtin/difftool.c:285
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "无法读取符号链接文件 %s"
+
+#: builtin/difftool.c:293
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
+
+#: builtin/difftool.c:395
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
-msgstr "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--cc')。"
+msgstr ""
+"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
+"cc')。"
-#: builtin/difftool.c:567
+#: builtin/difftool.c:609
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "两个文件都被修改:'%s' 和 '%s'。"
-#: builtin/difftool.c:569
+#: builtin/difftool.c:611
msgid "working tree file has been left."
msgstr "工作区文件被留了下来。"
-#: builtin/difftool.c:580
+#: builtin/difftool.c:622
#, c-format
msgid "temporary files exist in '%s'."
msgstr "临时文件存在于 '%s'。"
-#: builtin/difftool.c:581
+#: builtin/difftool.c:623
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者恢复它们。"
-#: builtin/difftool.c:626
+#: builtin/difftool.c:669
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/difftool.c:628
+#: builtin/difftool.c:671
msgid "perform a full-directory diff"
msgstr "执行一个全目录差异比较"
-#: builtin/difftool.c:630
+#: builtin/difftool.c:673
msgid "do not prompt before launching a diff tool"
msgstr "启动差异比较工具之前不提示"
-#: builtin/difftool.c:636
+#: builtin/difftool.c:679
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符号链接"
-#: builtin/difftool.c:637
+#: builtin/difftool.c:680
msgid "<tool>"
msgstr "<工具>"
-#: builtin/difftool.c:638
+#: builtin/difftool.c:681
msgid "use the specified diff tool"
msgstr "使用指定的差异比较工具"
-#: builtin/difftool.c:640
+#: builtin/difftool.c:683
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
-#: builtin/difftool.c:643
+#: builtin/difftool.c:686
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
-#: builtin/difftool.c:645
+#: builtin/difftool.c:688
msgid "<command>"
msgstr "<命令>"
-#: builtin/difftool.c:646
+#: builtin/difftool.c:689
msgid "specify a custom command for viewing diffs"
msgstr "指定一个用于查看差异的自定义命令"
-#: builtin/difftool.c:670
+#: builtin/difftool.c:713
msgid "no <tool> given for --tool=<tool>"
msgstr "没有为 --tool=<工具> 参数提供 <工具>"
-#: builtin/difftool.c:677
+#: builtin/difftool.c:720
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
@@ -7741,7 +7978,7 @@ msgstr "基于时间来深化浅克隆的历史"
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
-#: builtin/fetch.c:131 builtin/log.c:1433
+#: builtin/fetch.c:131 builtin/log.c:1440
msgid "dir"
msgstr "目录"
@@ -7769,73 +8006,73 @@ msgstr "指定获取操作的引用映射"
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
-#: builtin/fetch.c:511
+#: builtin/fetch.c:513
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "配置变量 fetch.output 包含无效值 %s"
-#: builtin/fetch.c:604
+#: builtin/fetch.c:606
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:610
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:621 builtin/fetch.c:701
+#: builtin/fetch.c:623 builtin/fetch.c:703
msgid "[rejected]"
msgstr "[已拒绝]"
-#: builtin/fetch.c:622
+#: builtin/fetch.c:624
msgid "can't fetch in current branch"
msgstr "当前分支下不能执行获取操作"
-#: builtin/fetch.c:631
+#: builtin/fetch.c:633
msgid "[tag update]"
msgstr "[标签更新]"
-#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681
-#: builtin/fetch.c:696
+#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
+#: builtin/fetch.c:698
msgid "unable to update local ref"
msgstr "不能更新本地引用"
-#: builtin/fetch.c:651
+#: builtin/fetch.c:653
msgid "[new tag]"
msgstr "[新标签]"
-#: builtin/fetch.c:654
+#: builtin/fetch.c:656
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:657
+#: builtin/fetch.c:659
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:696
+#: builtin/fetch.c:698
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:701
+#: builtin/fetch.c:703
msgid "non-fast-forward"
msgstr "非快进"
-#: builtin/fetch.c:746
+#: builtin/fetch.c:748
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必须的对象\n"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:768
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆不允许被更新"
-#: builtin/fetch.c:853 builtin/fetch.c:949
+#: builtin/fetch.c:855 builtin/fetch.c:951
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:864
+#: builtin/fetch.c:866
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -7845,95 +8082,95 @@ msgstr ""
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者:注意保持前导空格
-#: builtin/fetch.c:919
+#: builtin/fetch.c:921
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s 将成为摇摆状态)"
# 译者:注意保持前导空格
-#: builtin/fetch.c:920
+#: builtin/fetch.c:922
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s 已成为摇摆状态)"
-#: builtin/fetch.c:952
+#: builtin/fetch.c:954
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:953 builtin/remote.c:1020
+#: builtin/fetch.c:955 builtin/remote.c:1022
msgid "(none)"
msgstr "(无)"
-#: builtin/fetch.c:976
+#: builtin/fetch.c:978
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非纯仓库的当前分支 %s"
-#: builtin/fetch.c:995
+#: builtin/fetch.c:997
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:998
+#: builtin/fetch.c:1000
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1076
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "不知道如何从 %s 获取"
-#: builtin/fetch.c:1234
+#: builtin/fetch.c:1236
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:1236 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:1254
+#: builtin/fetch.c:1256
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:1277
+#: builtin/fetch.c:1279
msgid "You need to specify a tag name."
msgstr "您需要指定一个标签名称。"
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1321
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 不支持负数深度"
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1323
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/fetch.c:1326
+#: builtin/fetch.c:1328
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1330
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
-#: builtin/fetch.c:1350
+#: builtin/fetch.c:1352
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1354
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/fetch.c:1363
+#: builtin/fetch.c:1365
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组:%s"
-#: builtin/fetch.c:1371
+#: builtin/fetch.c:1373
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
@@ -7971,12 +8208,12 @@ msgid "git for-each-ref [--points-at <object>]"
msgstr "git for-each-ref [--points-at <对象>]"
#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--contains [<object>]]"
-msgstr "git for-each-ref [--contains [<对象>]]"
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
@@ -7998,10 +8235,6 @@ msgstr "引用占位符适用于 Tcl"
msgid "show only <n> matched refs"
msgstr "只显示 <n> 个匹配的引用"
-#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38
-msgid "format to use for the output"
-msgstr "输出格式"
-
#: builtin/for-each-ref.c:41
msgid "print only refs which points at the given object"
msgstr "只打印指向给定对象的引用"
@@ -8018,6 +8251,10 @@ msgstr "只打印没有合并的引用"
msgid "print only refs which contain the commit"
msgstr "只打印包含该提交的引用"
+#: builtin/for-each-ref.c:46
+msgid "print only refs which don't contain the commit"
+msgstr "只打印不包含该提交的引用"
+
#: builtin/fsck.c:554
msgid "Checking object directories"
msgstr "检查对象目录中"
@@ -8082,17 +8319,17 @@ msgstr "检查对象中"
msgid "git gc [<options>]"
msgstr "git gc [<选项>]"
-#: builtin/gc.c:72
+#: builtin/gc.c:78
#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "无效 %s:'%s'"
+msgid "Failed to fstat %s: %s"
+msgstr "对 %s 调用 fstat 失败:%s"
-#: builtin/gc.c:139
+#: builtin/gc.c:310
#, c-format
-msgid "insanely long object directory %.*s"
-msgstr "不正常的长对象目录 %.*s"
+msgid "Can't stat %s"
+msgstr "不能对 %s 调用 stat"
-#: builtin/gc.c:297
+#: builtin/gc.c:319
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8106,45 +8343,50 @@ msgstr ""
"\n"
"%s"
-#: builtin/gc.c:334
+#: builtin/gc.c:358
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
-#: builtin/gc.c:336
+#: builtin/gc.c:360
msgid "be more thorough (increased runtime)"
msgstr "更彻底(增加运行时间)"
-#: builtin/gc.c:337
+#: builtin/gc.c:361
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
-#: builtin/gc.c:338
+#: builtin/gc.c:362
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
-#: builtin/gc.c:380
+#: builtin/gc.c:379
+#, c-format
+msgid "Failed to parse gc.logexpiry value %s"
+msgstr "无法解析 gc.logexpiry 的值 %s"
+
+#: builtin/gc.c:407
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
-#: builtin/gc.c:382
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/gc.c:383
+#: builtin/gc.c:410
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护参见 \"git help gc\"。\n"
-#: builtin/gc.c:404
+#: builtin/gc.c:431
#, 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:448
+#: builtin/gc.c:475
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
@@ -8163,236 +8405,241 @@ msgstr "grep:无法创建线程:%s"
msgid "invalid number of threads specified (%d) for %s"
msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
-#: builtin/grep.c:763 builtin/grep.c:804
+#: builtin/grep.c:769 builtin/grep.c:810
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树(%s)"
-#: builtin/grep.c:823
+#: builtin/grep.c:829
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:887
+#: builtin/grep.c:893
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:973
+#: builtin/grep.c:980
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
-#: builtin/grep.c:975
+#: builtin/grep.c:982
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
# 译者:中文字符串拼接,可删除前导空格
-#: builtin/grep.c:977
+#: builtin/grep.c:984
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/grep.c:979
+#: builtin/grep.c:986
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/grep.c:981
-msgid "recursivley search in each submodule"
+#: builtin/grep.c:988
+msgid "recursively search in each submodule"
msgstr "在每一个子模组中递归搜索"
-#: builtin/grep.c:983
+#: builtin/grep.c:990
msgid "basename"
msgstr "基本名"
-#: builtin/grep.c:984
+#: builtin/grep.c:991
msgid "prepend parent project's basename to output"
msgstr "在输出中以父项目的基本名为前缀"
-#: builtin/grep.c:987
+#: builtin/grep.c:994
msgid "show non-matching lines"
msgstr "显示未匹配的行"
-#: builtin/grep.c:989
+#: builtin/grep.c:996
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
-#: builtin/grep.c:991
+#: builtin/grep.c:998
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
-#: builtin/grep.c:993
+#: builtin/grep.c:1000
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
-#: builtin/grep.c:995
+#: builtin/grep.c:1002
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
-#: builtin/grep.c:998
+#: builtin/grep.c:1005
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/grep.c:1000
+#: builtin/grep.c:1007
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:1004
+#: builtin/grep.c:1011
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:1007
+#: builtin/grep.c:1014
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式(默认)"
-#: builtin/grep.c:1010
+#: builtin/grep.c:1017
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1020
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:1016
+#: builtin/grep.c:1023
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:1017
+#: builtin/grep.c:1024
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:1018
+#: builtin/grep.c:1025
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1027
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:1022
+#: builtin/grep.c:1029
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1031
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1034
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:1029
+#: builtin/grep.c:1036
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:1031
+#: builtin/grep.c:1038
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数,而不显示匹配的行"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1039
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:1034
+#: builtin/grep.c:1041
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:1036
+#: builtin/grep.c:1043
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:1039
+#: builtin/grep.c:1046
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:1042
+#: builtin/grep.c:1049
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:1044
+#: builtin/grep.c:1051
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:1046
+#: builtin/grep.c:1053
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
-#: builtin/grep.c:1047
+#: builtin/grep.c:1054
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:1050
+#: builtin/grep.c:1057
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:1052
+#: builtin/grep.c:1059
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:1055
+#: builtin/grep.c:1062
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1064
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:1059
+#: builtin/grep.c:1066
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:1071
+#: builtin/grep.c:1078
msgid "indicate hit with exit status without output"
msgstr "不输出,而用退出码标识命中状态"
-#: builtin/grep.c:1073
+#: builtin/grep.c:1080
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:1075
+#: builtin/grep.c:1082
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达式的解析树"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:1082
+#: builtin/grep.c:1089
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)(本次构建忽略)"
-#: builtin/grep.c:1146
+#: builtin/grep.c:1153
msgid "no pattern given."
msgstr "未提供模式匹配。"
-#: builtin/grep.c:1178 builtin/index-pack.c:1482
+#: builtin/grep.c:1189
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index 或 --untracked 不能和版本同时使用"
+
+#: builtin/grep.c:1195
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "不能解析版本:%s"
+
+#: builtin/grep.c:1228 builtin/index-pack.c:1485
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效(%d)"
-#: builtin/grep.c:1215
+#: builtin/grep.c:1251
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:1238
+#: builtin/grep.c:1274
msgid "option not supported with --recurse-submodules."
msgstr "选项不支持和 --recurse-submodules 共用。"
-#: builtin/grep.c:1244
+#: builtin/grep.c:1280
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
-#: builtin/grep.c:1249
-msgid "--no-index or --untracked cannot be used with revs."
-msgstr "--no-index 或 --untracked 不能和版本同时使用。"
-
-#: builtin/grep.c:1252
+#: builtin/grep.c:1286
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
-#: builtin/grep.c:1260
+#: builtin/grep.c:1294
msgid "both --cached and trees are given."
msgstr "同时给出了 --cached 和树对象。"
@@ -8617,252 +8864,257 @@ msgstr "包超过了最大允许值"
msgid "unable to create '%s'"
msgstr "不能创建 '%s'"
-#: builtin/index-pack.c:322
+#: builtin/index-pack.c:323
#, c-format
msgid "cannot open packfile '%s'"
msgstr "无法打开包文件 '%s'"
-#: builtin/index-pack.c:336
+#: builtin/index-pack.c:337
msgid "pack signature mismatch"
msgstr "包签名不匹配"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "不支持包版本 %<PRIu32>"
-#: builtin/index-pack.c:356
+#: builtin/index-pack.c:357
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
-#: builtin/index-pack.c:478
+#: builtin/index-pack.c:479
#, c-format
msgid "inflate returned %d"
msgstr "解压缩返回 %d"
-#: builtin/index-pack.c:527
+#: builtin/index-pack.c:528
msgid "offset value overflow for delta base object"
msgstr "偏移值覆盖了 delta 基准对象"
-#: builtin/index-pack.c:535
+#: builtin/index-pack.c:536
msgid "delta base offset is out of bound"
msgstr "delta 基准偏移越界"
-#: builtin/index-pack.c:543
+#: builtin/index-pack.c:544
#, c-format
msgid "unknown object type %d"
msgstr "未知对象类型 %d"
-#: builtin/index-pack.c:574
+#: builtin/index-pack.c:575
msgid "cannot pread pack file"
msgstr "无法读取包文件"
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
-#: builtin/index-pack.c:602
+#: builtin/index-pack.c:603
msgid "serious inflate inconsistency"
msgstr "解压缩严重的不一致"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:813 builtin/index-pack.c:822
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:816 builtin/index-pack.c:825
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "发现 %s 出现 SHA1 冲突!"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:752 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:257
#, c-format
msgid "unable to read %s"
msgstr "不能读 %s"
-#: builtin/index-pack.c:819
+#: builtin/index-pack.c:814
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "不能读取现存对象信息 %s"
+
+#: builtin/index-pack.c:822
#, c-format
msgid "cannot read existing object %s"
msgstr "不能读取现存对象 %s"
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:836
#, c-format
msgid "invalid blob object %s"
msgstr "无效的数据对象 %s"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "invalid %s"
msgstr "无效的 %s"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:853
msgid "Error in object"
msgstr "对象中出错"
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:855
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子对象并非都可达"
-#: builtin/index-pack.c:924 builtin/index-pack.c:955
+#: builtin/index-pack.c:927 builtin/index-pack.c:958
msgid "failed to apply delta"
msgstr "无法应用 delta"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Receiving objects"
msgstr "接收对象中"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Indexing objects"
msgstr "索引对象中"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲突(SHA1 不匹配)"
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1165
msgid "cannot fstat packfile"
-msgstr "不能枚举包文件状态"
+msgstr "不能对包文件调用 fstat"
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1168
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数据"
-#: builtin/index-pack.c:1176
+#: builtin/index-pack.c:1179
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1202
msgid "Resolving deltas"
msgstr "处理 delta 中"
-#: builtin/index-pack.c:1210
+#: builtin/index-pack.c:1213
#, c-format
msgid "unable to create thread: %s"
msgstr "不能创建线程:%s"
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1258
+#: builtin/index-pack.c:1261
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "完成 %d 个本地对象"
msgstr[1] "完成 %d 个本地对象"
-#: builtin/index-pack.c:1270
+#: builtin/index-pack.c:1273
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
-#: builtin/index-pack.c:1274
+#: builtin/index-pack.c:1277
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "包有 %d 个未解决的 delta"
msgstr[1] "包有 %d 个未解决的 delta"
-#: builtin/index-pack.c:1298
+#: builtin/index-pack.c:1301
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能压缩附加对象(%d)"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1377
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
-#: builtin/index-pack.c:1398
+#: builtin/index-pack.c:1403
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1411
+#: builtin/index-pack.c:1415
#, c-format
msgid "cannot write keep file '%s'"
msgstr "无法写保留文件 '%s'"
-#: builtin/index-pack.c:1419
+#: builtin/index-pack.c:1423
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "无法关闭保留文件 '%s'"
-#: builtin/index-pack.c:1432
+#: builtin/index-pack.c:1433
msgid "cannot store pack file"
msgstr "无法存储包文件"
-#: builtin/index-pack.c:1443
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "无法存储索引文件"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1479
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "坏的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1486 builtin/index-pack.c:1683
+#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支持,忽略 %s"
-#: builtin/index-pack.c:1544
+#: builtin/index-pack.c:1547
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
-#: builtin/index-pack.c:1546
+#: builtin/index-pack.c:1549
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1596
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta:%d 个对象"
msgstr[1] "非 delta:%d 个对象"
-#: builtin/index-pack.c:1600
+#: builtin/index-pack.c:1603
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "链长 = %d: %lu 对象"
msgstr[1] "链长 = %d: %lu 对象"
-#: builtin/index-pack.c:1613
+#: builtin/index-pack.c:1616
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
-#: builtin/index-pack.c:1695 builtin/index-pack.c:1698
-#: builtin/index-pack.c:1714 builtin/index-pack.c:1718
+#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
+#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1734
+#: builtin/index-pack.c:1737
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同时使用"
-#: builtin/index-pack.c:1736
+#: builtin/index-pack.c:1739
msgid "--stdin requires a git repository"
msgstr "--stdin 需要一个 git 仓库"
-#: builtin/index-pack.c:1744
+#: builtin/index-pack.c:1747
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包文件名参数"
#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
-msgstr "不能枚举 '%s' 状态"
+msgstr "不能对 '%s' 调用 stat"
#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
-msgstr "不能枚举模版 '%s' 状态"
+msgstr "不能对模版 '%s' 调用 stat"
#: builtin/init-db.c:65
#, c-format
@@ -9008,104 +9260,104 @@ msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
msgid "git show [<options>] <object>..."
msgstr "git show [<选项>] <对象>..."
-#: builtin/log.c:84
+#: builtin/log.c:89
#, c-format
msgid "invalid --decorate option: %s"
msgstr "无效的 --decorate 选项:%s"
-#: builtin/log.c:139
+#: builtin/log.c:144
msgid "suppress diff output"
msgstr "不显示差异输出"
-#: builtin/log.c:140
+#: builtin/log.c:145
msgid "show source"
msgstr "显示源"
-#: builtin/log.c:141
+#: builtin/log.c:146
msgid "Use mail map file"
msgstr "使用邮件映射文件"
-#: builtin/log.c:142
+#: builtin/log.c:147
msgid "decorate options"
msgstr "修饰选项"
-#: builtin/log.c:145
+#: builtin/log.c:150
msgid "Process line range n,m in file, counting from 1"
msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
-#: builtin/log.c:241
+#: builtin/log.c:246
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出:%d %s\n"
-#: builtin/log.c:486
+#: builtin/log.c:493
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 损坏的文件"
-#: builtin/log.c:500 builtin/log.c:594
+#: builtin/log.c:507 builtin/log.c:601
#, c-format
msgid "Could not read object %s"
msgstr "不能读取对象 %s"
-#: builtin/log.c:618
+#: builtin/log.c:625
#, c-format
msgid "Unknown type: %d"
msgstr "未知类型:%d"
-#: builtin/log.c:739
+#: builtin/log.c:746
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:839
+#: builtin/log.c:846
msgid "name of output directory is too long"
msgstr "输出目录名太长"
-#: builtin/log.c:854
+#: builtin/log.c:861
#, c-format
msgid "Cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:868
+#: builtin/log.c:875
msgid "Need exactly one range."
msgstr "只需要一个范围。"
-#: builtin/log.c:878
+#: builtin/log.c:885
msgid "Not a range."
msgstr "不是一个范围。"
-#: builtin/log.c:984
+#: builtin/log.c:991
msgid "Cover letter needs email format"
msgstr "信封需要邮件地址格式"
-#: builtin/log.c:1063
+#: builtin/log.c:1071
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to:%s"
-#: builtin/log.c:1091
+#: builtin/log.c:1098
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1141
+#: builtin/log.c:1148
msgid "Two output directories?"
msgstr "两个输出目录?"
-#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
+#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
#, c-format
msgid "Unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476
+#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
-#: builtin/log.c:1263
+#: builtin/log.c:1270
msgid "Could not find exact merge base."
msgstr "不能找到准确的合并基线。"
-#: builtin/log.c:1267
+#: builtin/log.c:1274
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"
@@ -9115,315 +9367,315 @@ msgstr ""
"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
"参数 --base=<base-commit-id> 手动指定一个基线提交。"
-#: builtin/log.c:1287
+#: builtin/log.c:1294
msgid "Failed to find exact merge base"
msgstr "无法找到准确的合并基线"
-#: builtin/log.c:1298
+#: builtin/log.c:1305
msgid "base commit should be the ancestor of revision list"
msgstr "基线提交应该是版本列表的祖先"
-#: builtin/log.c:1302
+#: builtin/log.c:1309
msgid "base commit shouldn't be in revision list"
msgstr "基线提交不应该出现在版本列表中"
-#: builtin/log.c:1351
+#: builtin/log.c:1358
msgid "cannot get patch id"
msgstr "无法得到补丁 id"
-#: builtin/log.c:1408
+#: builtin/log.c:1415
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m],即使只有一个补丁"
-#: builtin/log.c:1411
+#: builtin/log.c:1418
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH],即使有多个补丁"
-#: builtin/log.c:1415
+#: builtin/log.c:1422
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1417
+#: builtin/log.c:1424
msgid "generate a cover letter"
msgstr "生成一封附信"
-#: builtin/log.c:1419
+#: builtin/log.c:1426
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1420
+#: builtin/log.c:1427
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1421
+#: builtin/log.c:1428
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1423
+#: builtin/log.c:1430
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号,而不是1"
-#: builtin/log.c:1425
+#: builtin/log.c:1432
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1427
+#: builtin/log.c:1434
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1430
+#: builtin/log.c:1437
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1433
+#: builtin/log.c:1440
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1439
+#: builtin/log.c:1446
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "output all-zero hash in From header"
msgstr "在 From 头信息中输出全为零的哈希值"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的(补丁+状态)"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "header"
msgstr "header"
-#: builtin/log.c:1449
+#: builtin/log.c:1456
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1450 builtin/log.c:1452
+#: builtin/log.c:1457 builtin/log.c:1459
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1452
+#: builtin/log.c:1459
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1454
+#: builtin/log.c:1461
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1455
+#: builtin/log.c:1462
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
-#: builtin/log.c:1457
+#: builtin/log.c:1464
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1458
+#: builtin/log.c:1465
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
-#: builtin/log.c:1459 builtin/log.c:1462
+#: builtin/log.c:1466 builtin/log.c:1469
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索,风格:浅,深"
-#: builtin/log.c:1469
+#: builtin/log.c:1476
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1470
+#: builtin/log.c:1477
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1471
+#: builtin/log.c:1478
msgid "base-commit"
msgstr "基线提交"
-#: builtin/log.c:1472
+#: builtin/log.c:1479
msgid "add prerequisite tree info to the patch series"
msgstr "为补丁列表添加前置树信息"
-#: builtin/log.c:1474
+#: builtin/log.c:1481
msgid "add a signature from a file"
msgstr "从文件添加一个签名"
-#: builtin/log.c:1475
+#: builtin/log.c:1482
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1565
+#: builtin/log.c:1572
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
-#: builtin/log.c:1567
+#: builtin/log.c:1574
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc 和 -k 互斥。"
-#: builtin/log.c:1575
+#: builtin/log.c:1582
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1577
+#: builtin/log.c:1584
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1579
+#: builtin/log.c:1586
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1609
+#: builtin/log.c:1616
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录,哪一个?"
-#: builtin/log.c:1611
+#: builtin/log.c:1618
#, c-format
msgid "Could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/log.c:1705
+#: builtin/log.c:1712
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读取签名文件 '%s'"
-#: builtin/log.c:1777
+#: builtin/log.c:1784
msgid "Failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:1826
+#: builtin/log.c:1833
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:1880
+#: builtin/log.c:1887
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:468
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<选项>] [<文件>...]"
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:517
msgid "identify the file status with tags"
msgstr "用标签标识文件的状态"
-#: builtin/ls-files.c:511
+#: builtin/ls-files.c:519
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小写字母表示 '假设未改变的' 文件"
-#: builtin/ls-files.c:513
+#: builtin/ls-files.c:521
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件(默认)"
-#: builtin/ls-files.c:515
+#: builtin/ls-files.c:523
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:525
msgid "show modified files in the output"
msgstr "显示已修改的文件"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:527
msgid "show other files in the output"
msgstr "显示其它文件"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:529
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
-#: builtin/ls-files.c:524
+#: builtin/ls-files.c:532
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:534
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:536
msgid "show 'other' directories' names only"
msgstr "只显示“其他”目录的名称"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:538
msgid "show line endings of files"
msgstr "显示文件换行符格式"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:540
msgid "don't show empty directories"
msgstr "不显示空目录"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:543
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:545
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:547
msgid "skip files matching pattern"
msgstr "匹配排除文件的模式"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:550
msgid "exclude patterns are read from <file>"
msgstr "从 <文件> 中读取排除模式"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:553
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:555
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:558
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:561
msgid "recurse through submodules"
msgstr "在子模组中递归"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:563
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区,视为错误"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:564
msgid "tree-ish"
msgstr "树或提交"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:565
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:567
msgid "show debugging data"
msgstr "显示调试数据"
@@ -9437,39 +9689,39 @@ msgstr ""
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<仓库> [<引用>...]]"
-#: builtin/ls-remote.c:50
+#: builtin/ls-remote.c:52
msgid "do not print remote URL"
msgstr "不打印远程 URL"
-#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
msgid "exec"
msgstr "exec"
-#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
msgid "path of git-upload-pack on the remote host"
msgstr "远程主机上的 git-upload-pack 路径"
-#: builtin/ls-remote.c:56
+#: builtin/ls-remote.c:58
msgid "limit to tags"
msgstr "仅限于标签"
-#: builtin/ls-remote.c:57
+#: builtin/ls-remote.c:59
msgid "limit to heads"
msgstr "仅限于分支"
-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:60
msgid "do not show peeled tags"
msgstr "不显示已解析的标签"
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:62
msgid "take url.<base>.insteadOf into account"
msgstr "参考 url.<base>.insteadOf 设置"
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:64
msgid "exit with exit code 2 if no matching refs are found"
msgstr "若未找到匹配的引用则以退出码2退出"
-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:66
msgid "show underlying ref in addition to the object pointed by it"
msgstr "除了显示指向的对象外,显示指向的引用名"
@@ -9514,147 +9766,143 @@ msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<选项>] [<提交>...]"
#: builtin/merge.c:47
-msgid "git merge [<options>] <msg> HEAD <commit>"
-msgstr "git merge [<选项>] <说明> HEAD <提交>"
-
-#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:48
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:103
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"
-#: builtin/merge.c:141
+#: builtin/merge.c:140
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合并策略 '%s'。\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:141
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有:"
-#: builtin/merge.c:147
+#: builtin/merge.c:146
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有:"
-#: builtin/merge.c:197 builtin/pull.c:127
+#: builtin/merge.c:196 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr "在合并的最后不显示差异统计"
-#: builtin/merge.c:200 builtin/pull.c:130
+#: builtin/merge.c:199 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "在合并的最后显示差异统计"
-#: builtin/merge.c:201 builtin/pull.c:133
+#: builtin/merge.c:200 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(和 --stat 同义)"
-#: builtin/merge.c:203 builtin/pull.c:136
+#: builtin/merge.c:202 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
-#: builtin/merge.c:206 builtin/pull.c:139
+#: builtin/merge.c:205 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "创建一个单独的提交而不是做一次合并"
-#: builtin/merge.c:208 builtin/pull.c:142
+#: builtin/merge.c:207 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合并成功,执行一次提交(默认)"
-#: builtin/merge.c:210 builtin/pull.c:145
+#: builtin/merge.c:209 builtin/pull.c:145
msgid "edit message before committing"
msgstr "在提交前编辑提交说明"
-#: builtin/merge.c:211
+#: builtin/merge.c:210
msgid "allow fast-forward (default)"
msgstr "允许快进(默认)"
-#: builtin/merge.c:213 builtin/pull.c:151
+#: builtin/merge.c:212 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "如果不能快进就放弃合并"
-#: builtin/merge.c:217 builtin/pull.c:154
+#: builtin/merge.c:216 builtin/pull.c:154
msgid "verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158
-#: builtin/revert.c:89
+#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
+#: builtin/revert.c:108
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:219 builtin/pull.c:159
+#: builtin/merge.c:218 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "要使用的合并策略"
-#: builtin/merge.c:220 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:221 builtin/pull.c:163
+#: builtin/merge.c:220 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "所选的合并策略的选项"
-#: builtin/merge.c:223
+#: builtin/merge.c:222
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合并的提交说明(针对非快进式合并)"
-#: builtin/merge.c:227
+#: builtin/merge.c:226
msgid "abort the current in-progress merge"
msgstr "放弃当前正在进行的合并"
-#: builtin/merge.c:229
+#: builtin/merge.c:228
msgid "continue the current in-progress merge"
msgstr "继续当前正在进行的合并"
-#: builtin/merge.c:231 builtin/pull.c:170
+#: builtin/merge.c:230 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "允许合并不相关的历史"
-#: builtin/merge.c:259
+#: builtin/merge.c:258
msgid "could not run stash."
msgstr "不能进行进度保存。"
-#: builtin/merge.c:264
+#: builtin/merge.c:263
msgid "stash failed"
msgstr "进度保存失败"
-#: builtin/merge.c:269
+#: builtin/merge.c:268
#, c-format
msgid "not a valid object: %s"
msgstr "不是一个有效对象:%s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:287 builtin/merge.c:304
msgid "read-tree failed"
msgstr "读取树失败"
# 译者:注意保持前导空格
-#: builtin/merge.c:335
+#: builtin/merge.c:334
msgid " (nothing to squash)"
msgstr " (无可压缩)"
-#: builtin/merge.c:346
+#: builtin/merge.c:345
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "压缩提交 -- 未更新 HEAD\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:395
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:446
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指向一个提交"
-#: builtin/merge.c:537
+#: builtin/merge.c:536
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
@@ -9711,64 +9959,59 @@ msgstr "太棒了。\n"
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
-#: builtin/merge.c:867
-#, c-format
-msgid "'%s' is not a commit"
-msgstr "'%s' 不是一个提交"
-
-#: builtin/merge.c:908
+#: builtin/merge.c:890
msgid "No current branch."
msgstr "没有当前分支。"
-#: builtin/merge.c:910
+#: builtin/merge.c:892
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程仓库。"
-#: builtin/merge.c:912
+#: builtin/merge.c:894
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/merge.c:917
+#: builtin/merge.c:899
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/merge.c:964
+#: builtin/merge.c:946
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
-#: builtin/merge.c:1038
+#: builtin/merge.c:1020
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
-#: builtin/merge.c:1065
+#: builtin/merge.c:1047
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合并:%s"
-#: builtin/merge.c:1099
+#: builtin/merge.c:1081
msgid "not something we can merge"
msgstr "不能合并"
-#: builtin/merge.c:1167
+#: builtin/merge.c:1146
msgid "--abort expects no arguments"
msgstr "--abort 不带参数"
-#: builtin/merge.c:1171
+#: builtin/merge.c:1150
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
-#: builtin/merge.c:1183
+#: builtin/merge.c:1162
msgid "--continue expects no arguments"
msgstr "--continue 不带参数"
-#: builtin/merge.c:1187
+#: builtin/merge.c:1166
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
-#: builtin/merge.c:1203
+#: builtin/merge.c:1182
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9776,7 +10019,7 @@ msgstr ""
"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1210
+#: builtin/merge.c:1189
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9784,112 +10027,112 @@ msgstr ""
"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1213
+#: builtin/merge.c:1192
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
-#: builtin/merge.c:1222
+#: builtin/merge.c:1201
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 与 --no-ff 同时使用。"
-#: builtin/merge.c:1230
+#: builtin/merge.c:1209
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1247
+#: builtin/merge.c:1226
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
-#: builtin/merge.c:1249
+#: builtin/merge.c:1228
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1233
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
-#: builtin/merge.c:1256
+#: builtin/merge.c:1235
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
-#: builtin/merge.c:1312
+#: builtin/merge.c:1269
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
-#: builtin/merge.c:1315
+#: builtin/merge.c:1272
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-#: builtin/merge.c:1318
+#: builtin/merge.c:1275
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 没有一个 GPG 签名。"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1278
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-#: builtin/merge.c:1383
+#: builtin/merge.c:1340
msgid "refusing to merge unrelated histories"
msgstr "拒绝合并无关的历史"
-#: builtin/merge.c:1392
+#: builtin/merge.c:1349
msgid "Already up-to-date."
msgstr "已经是最新的。"
-#: builtin/merge.c:1402
+#: builtin/merge.c:1359
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1443
+#: builtin/merge.c:1400
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1450
+#: builtin/merge.c:1407
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1475
+#: builtin/merge.c:1432
msgid "Already up-to-date. Yeeah!"
msgstr "已经是最新的。耶!"
-#: builtin/merge.c:1481
+#: builtin/merge.c:1438
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进,终止。"
-#: builtin/merge.c:1504 builtin/merge.c:1583
+#: builtin/merge.c:1461 builtin/merge.c:1540
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1508
+#: builtin/merge.c:1465
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1574
+#: builtin/merge.c:1531
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1576
+#: builtin/merge.c:1533
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1542
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1597
+#: builtin/merge.c:1554
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利,按要求在提交前停止\n"
@@ -9942,35 +10185,35 @@ msgstr ""
"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
"件> <文件2>"
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:32
msgid "send results to standard output"
msgstr "将结果发送到标准输出"
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:33
msgid "use a diff3 based merge"
msgstr "使用基于 diff3 的合并"
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c:34
msgid "for conflicts, use our version"
msgstr "如果冲突,使用我们的版本"
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c:36
msgid "for conflicts, use their version"
msgstr "如果冲突,使用他们的版本"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:38
msgid "for conflicts, use a union version"
msgstr "如果冲突,使用联合版本"
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:41
msgid "for conflicts, use this marker size"
msgstr "如果冲突,使用指定长度的标记"
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c:42
msgid "do not warn about conflicts"
msgstr "不要警告冲突"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:44
msgid "set labels for file1/orig-file/file2"
msgstr "为 文件1/初始文件/文件2 设置标签"
@@ -10113,43 +10356,47 @@ msgstr "重命名 %s 至 %s\n"
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:289
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<选项>] <提交>..."
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:290
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<选项>] --all"
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:291
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<选项>] --stdin"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:346
msgid "print only names (no SHA-1)"
msgstr "只打印名称(无 SHA-1)"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:347
msgid "only use tags to name the commits"
msgstr "只使用标签来命名提交"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:349
msgid "only use refs matching <pattern>"
msgstr "只使用和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:351
+msgid "ignore refs matching <pattern>"
+msgstr "忽略和 <模式> 相匹配的引用"
+
+#: builtin/name-rev.c:353
msgid "list all commits reachable from all refs"
msgstr "列出可以从所有引用访问的提交"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:354
msgid "read from stdin"
msgstr "从标准输入读取"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:355
msgid "allow to print `undefined` names (default)"
msgstr "允许打印 `未定义` 的名称(默认)"
-#: builtin/name-rev.c:324
+#: builtin/name-rev.c:361
msgid "dereference tags in the input (internal use)"
msgstr "反向解析输入中的标签(内部使用)"
@@ -10293,19 +10540,19 @@ msgstr "不能写注解对象"
msgid "the note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
-#: builtin/notes.c:233 builtin/tag.c:460
+#: builtin/notes.c:233 builtin/tag.c:516
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/notes.c:235 builtin/tag.c:463
+#: builtin/notes.c:235 builtin/tag.c:519
#, c-format
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"
#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
-#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
@@ -10338,12 +10585,12 @@ msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
-#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
-#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
+#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
msgid "too many parameters"
msgstr "参数太多"
-#: builtin/notes.c:378 builtin/notes.c:665
+#: builtin/notes.c:378 builtin/notes.c:664
#, c-format
msgid "no note found for object %s."
msgstr "未发现对象 %s 的注解。"
@@ -10384,7 +10631,7 @@ msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"
-#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
+#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
#, c-format
msgid "Removing note for object %s\n"
msgstr "删除对象 %s 的注解\n"
@@ -10422,97 +10669,97 @@ msgstr ""
"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
"请换用 'git notes add -f -m/-F/-c/-C'。\n"
-#: builtin/notes.c:685
+#: builtin/notes.c:684
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:687
+#: builtin/notes.c:686
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "无法删除引用 NOTES_MERGE_REF"
-#: builtin/notes.c:689
+#: builtin/notes.c:688
msgid "failed to remove 'git notes merge' worktree"
msgstr "无法删除 'git notes merge' 工作区"
-#: builtin/notes.c:709
+#: builtin/notes.c:708
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:711
+#: builtin/notes.c:710
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
-#: builtin/notes.c:713
+#: builtin/notes.c:712
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
-#: builtin/notes.c:726
+#: builtin/notes.c:725
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "无法解析 NOTES_MERGE_REF"
-#: builtin/notes.c:729
+#: builtin/notes.c:728
msgid "failed to finalize notes merge"
msgstr "无法完成注解合并"
-#: builtin/notes.c:755
+#: builtin/notes.c:754
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "未知的注解合并策略 %s"
-#: builtin/notes.c:771
+#: builtin/notes.c:770
msgid "General options"
msgstr "通用选项"
-#: builtin/notes.c:773
+#: builtin/notes.c:772
msgid "Merge options"
msgstr "合并选项"
-#: builtin/notes.c:775
+#: builtin/notes.c:774
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:777
+#: builtin/notes.c:776
msgid "Committing unmerged notes"
msgstr "提交未合并的注解"
-#: builtin/notes.c:779
+#: builtin/notes.c:778
msgid "finalize notes merge by committing unmerged notes"
msgstr "通过提交未合并的注解来完成注解合并"
-#: builtin/notes.c:781
+#: builtin/notes.c:780
msgid "Aborting notes merge resolution"
msgstr "中止注解合并的方案"
-#: builtin/notes.c:783
+#: builtin/notes.c:782
msgid "abort notes merge"
msgstr "中止注解合并"
-#: builtin/notes.c:794
+#: builtin/notes.c:793
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "不能混用 --commit、--abort 或 -s/--strategy"
-#: builtin/notes.c:799
+#: builtin/notes.c:798
msgid "must specify a notes ref to merge"
msgstr "必须指定一个注解引用来合并"
-#: builtin/notes.c:823
+#: builtin/notes.c:822
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "未知的 -s/--strategy:%s"
-#: builtin/notes.c:860
+#: builtin/notes.c:859
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
-#: builtin/notes.c:863
+#: builtin/notes.c:862
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "无法存储链接到当前的注解引用(%s)"
-#: builtin/notes.c:865
+#: builtin/notes.c:864
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10522,36 +10769,36 @@ msgstr ""
"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
-#: builtin/notes.c:887
+#: builtin/notes.c:886
#, c-format
msgid "Object %s has no note\n"
msgstr "对象 %s 没有注解\n"
-#: builtin/notes.c:899
+#: builtin/notes.c:898
msgid "attempt to remove non-existent note is not an error"
msgstr "尝试删除不存在的注解不是一个错误"
-#: builtin/notes.c:902
+#: builtin/notes.c:901
msgid "read object names from the standard input"
msgstr "从标准输入读取对象名称"
-#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "不删除,只显示"
-#: builtin/notes.c:941
+#: builtin/notes.c:940
msgid "report pruned notes"
msgstr "报告清除的注解"
-#: builtin/notes.c:983
+#: builtin/notes.c:982
msgid "notes-ref"
msgstr "注解引用"
-#: builtin/notes.c:984
+#: builtin/notes.c:983
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1019
+#: builtin/notes.c:1018
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子命令:%s"
@@ -10571,169 +10818,169 @@ msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象
msgid "deflate error (%d)"
msgstr "压缩错误 (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:770
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:783
msgid "Writing objects"
msgstr "写入对象中"
-#: builtin/pack-objects.c:1068
+#: builtin/pack-objects.c:1063
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
-#: builtin/pack-objects.c:2344
+#: builtin/pack-objects.c:2426
msgid "Compressing objects"
msgstr "压缩对象中"
-#: builtin/pack-objects.c:2747
+#: builtin/pack-objects.c:2829
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
-#: builtin/pack-objects.c:2751
+#: builtin/pack-objects.c:2833
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
-#: builtin/pack-objects.c:2781
+#: builtin/pack-objects.c:2863
msgid "do not show progress meter"
msgstr "不显示进度表"
-#: builtin/pack-objects.c:2783
+#: builtin/pack-objects.c:2865
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/pack-objects.c:2785
+#: builtin/pack-objects.c:2867
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/pack-objects.c:2788
+#: builtin/pack-objects.c:2870
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/pack-objects.c:2789
+#: builtin/pack-objects.c:2871
msgid "version[,offset]"
msgstr "版本[,偏移]"
-#: builtin/pack-objects.c:2790
+#: builtin/pack-objects.c:2872
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/pack-objects.c:2793
+#: builtin/pack-objects.c:2875
msgid "maximum size of each output pack file"
msgstr "每个输出包的最大尺寸"
-#: builtin/pack-objects.c:2795
+#: builtin/pack-objects.c:2877
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
-#: builtin/pack-objects.c:2797
+#: builtin/pack-objects.c:2879
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:2799
+#: builtin/pack-objects.c:2881
msgid "limit pack window by objects"
msgstr "限制打包窗口的对象数"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2883
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数量限制外设置打包窗口的内存限制"
-#: builtin/pack-objects.c:2803
+#: builtin/pack-objects.c:2885
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允许的 delta 链的最大长度"
-#: builtin/pack-objects.c:2805
+#: builtin/pack-objects.c:2887
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2889
msgid "reuse existing objects"
msgstr "重用已存在的对象"
-#: builtin/pack-objects.c:2809
+#: builtin/pack-objects.c:2891
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:2811
+#: builtin/pack-objects.c:2893
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹配"
-#: builtin/pack-objects.c:2813
+#: builtin/pack-objects.c:2895
msgid "do not create an empty pack output"
msgstr "不创建空的包输出"
-#: builtin/pack-objects.c:2815
+#: builtin/pack-objects.c:2897
msgid "read revision arguments from standard input"
msgstr "从标准输入读取版本号参数"
-#: builtin/pack-objects.c:2817
+#: builtin/pack-objects.c:2899
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的对象"
-#: builtin/pack-objects.c:2820
+#: builtin/pack-objects.c:2902
msgid "include objects reachable from any reference"
msgstr "包括可以从任何引用访问到的对象"
-#: builtin/pack-objects.c:2823
+#: builtin/pack-objects.c:2905
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:2826
+#: builtin/pack-objects.c:2908
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2911
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:2831
+#: builtin/pack-objects.c:2913
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/pack-objects.c:2833
+#: builtin/pack-objects.c:2915
msgid "keep unreachable objects"
msgstr "维持不可达的对象"
-#: builtin/pack-objects.c:2835
+#: builtin/pack-objects.c:2917
msgid "pack loose unreachable objects"
msgstr "打包松散的不可达对象"
-#: builtin/pack-objects.c:2837
+#: builtin/pack-objects.c:2919
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:2840
+#: builtin/pack-objects.c:2922
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:2842
+#: builtin/pack-objects.c:2924
msgid "create packs suitable for shallow fetches"
msgstr "创建适合浅克隆仓库获取的包"
-#: builtin/pack-objects.c:2844
+#: builtin/pack-objects.c:2926
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 文件的包"
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:2928
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:2848
+#: builtin/pack-objects.c:2930
msgid "do not hide commits by grafts"
msgstr "显示被嫁接隐藏的提交"
-#: builtin/pack-objects.c:2850
+#: builtin/pack-objects.c:2932
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
-#: builtin/pack-objects.c:2852
+#: builtin/pack-objects.c:2934
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同时创建 bitmap 索引"
-#: builtin/pack-objects.c:2979
+#: builtin/pack-objects.c:3061
msgid "Counting objects"
msgstr "对象计数中"
@@ -10790,7 +11037,7 @@ msgstr "和合并相关的选项"
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用变基操作取代合并操作以合入修改"
-#: builtin/pull.c:148 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
msgid "allow fast-forward"
msgstr "允许快进式"
@@ -10859,7 +11106,7 @@ msgstr "详见 git-pull(1)。"
msgid "<remote>"
msgstr "<远程>"
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<分支>"
@@ -11136,11 +11383,11 @@ msgstr "--all 和 --mirror 不兼容"
msgid "repository"
msgstr "仓库"
-#: builtin/push.c:519 builtin/send-pack.c:161
+#: builtin/push.c:519 builtin/send-pack.c:162
msgid "push all refs"
msgstr "推送所有引用"
-#: builtin/push.c:520 builtin/send-pack.c:163
+#: builtin/push.c:520 builtin/send-pack.c:164
msgid "mirror all refs"
msgstr "镜像所有引用"
@@ -11152,15 +11399,15 @@ msgstr "删除引用"
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推送标签(不能使用 --all or --mirror)"
-#: builtin/push.c:526 builtin/send-pack.c:164
+#: builtin/push.c:526 builtin/send-pack.c:165
msgid "force updates"
msgstr "强制更新"
-#: builtin/push.c:528 builtin/send-pack.c:175
+#: builtin/push.c:528 builtin/send-pack.c:179
msgid "refname>:<expect"
msgstr "引用名>:<期望值"
-#: builtin/push.c:529 builtin/send-pack.c:176
+#: builtin/push.c:529 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr "要求引用旧的取值为设定值"
@@ -11168,12 +11415,12 @@ msgstr "要求引用旧的取值为设定值"
msgid "control recursive pushing of submodules"
msgstr "控制子模组的递归推送"
-#: builtin/push.c:534 builtin/send-pack.c:169
+#: builtin/push.c:534 builtin/send-pack.c:173
msgid "use thin pack"
msgstr "使用精简打包"
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158
-#: builtin/send-pack.c:159
+#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
+#: builtin/send-pack.c:160
msgid "receive pack program"
msgstr "接收包程序"
@@ -11193,19 +11440,19 @@ msgstr "绕过 pre-push 钩子"
msgid "push missing but relevant tags"
msgstr "推送缺失但有关的标签"
-#: builtin/push.c:546 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:167
msgid "GPG sign the push"
msgstr "用 GPG 为推送签名"
-#: builtin/push.c:548 builtin/send-pack.c:170
+#: builtin/push.c:548 builtin/send-pack.c:174
msgid "request atomic transaction on remote side"
msgstr "需要远端支持原子事务"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:170
msgid "server-specific"
msgstr "server-specific"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:171
msgid "option to transmit"
msgstr "传输选项"
@@ -11221,7 +11468,7 @@ msgstr "--delete 未接任何引用没有意义"
msgid "push options must not have new line characters"
msgstr "推送选项不能有换行符"
-#: builtin/read-tree.c:37
+#: builtin/read-tree.c:40
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -11231,75 +11478,87 @@ msgstr ""
"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
-#: builtin/read-tree.c:110
+#: builtin/read-tree.c:130
msgid "write resulting index to <file>"
msgstr "将索引结果写入 <文件>"
-#: builtin/read-tree.c:113
+#: builtin/read-tree.c:133
msgid "only empty the index"
msgstr "只是清空索引"
-#: builtin/read-tree.c:115
+#: builtin/read-tree.c:135
msgid "Merging"
msgstr "合并"
-#: builtin/read-tree.c:117
+#: builtin/read-tree.c:137
msgid "perform a merge in addition to a read"
msgstr "读取之余再执行一个合并"
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c:139
msgid "3-way merge if no file level merging required"
msgstr "如果没有文件级合并需要,执行三方合并"
-#: builtin/read-tree.c:121
+#: builtin/read-tree.c:141
msgid "3-way merge in presence of adds and removes"
msgstr "存在添加和删除时,也执行三方合并"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:143
msgid "same as -m, but discard unmerged entries"
msgstr "类似于 -m,但丢弃未合并的条目"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:144
msgid "<subdirectory>/"
msgstr "<子目录>/"
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c:145
msgid "read the tree into the index under <subdirectory>/"
msgstr "读取树对象到索引的 <子目录>/ 下"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:148
msgid "update working tree with merge result"
msgstr "用合并的结果更新工作区"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:150
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:151
msgid "allow explicitly ignored files to be overwritten"
msgstr "允许忽略文件中设定的文件可以被覆盖"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:154
msgid "don't check the working tree after merging"
msgstr "合并后不检查工作区"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:155
msgid "don't update the index or the work tree"
msgstr "不更新索引区和工作区"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:157
msgid "skip applying sparse checkout filter"
msgstr "跳过应用稀疏检出过滤器"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:159
msgid "debug unpack-trees"
msgstr "调试 unpack-trees"
-#: builtin/receive-pack.c:26
+#: builtin/rebase--helper.c:7
+msgid "git rebase--helper [<options>]"
+msgstr "git rebase--helper [<选项>]"
+
+#: builtin/rebase--helper.c:19
+msgid "continue rebase"
+msgstr "继续变基"
+
+#: builtin/rebase--helper.c:21
+msgid "abort rebase"
+msgstr "中止变基"
+
+#: builtin/receive-pack.c:27
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:793
+#: builtin/receive-pack.c:795
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"
@@ -11325,7 +11584,7 @@ msgstr ""
"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
-#: builtin/receive-pack.c:813
+#: builtin/receive-pack.c:815
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"
@@ -11344,11 +11603,11 @@ msgstr ""
"\n"
"若要屏蔽此信息,您可以设置它为 'refuse'。"
-#: builtin/receive-pack.c:1883
+#: builtin/receive-pack.c:1888
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:1897
+#: builtin/receive-pack.c:1902
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
@@ -11525,7 +11784,7 @@ msgstr "(匹配)"
msgid "(delete)"
msgstr "(删除)"
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
#, c-format
msgid "No such remote: %s"
msgstr "没有这样的远程:%s"
@@ -11556,7 +11815,7 @@ msgstr "删除 '%s' 失败"
msgid "creating '%s' failed"
msgstr "创建 '%s' 失败"
-#: builtin/remote.c:792
+#: builtin/remote.c:794
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11566,144 +11825,144 @@ msgid_plural ""
msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
-#: builtin/remote.c:806
+#: builtin/remote.c:808
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除配置小节 '%s'"
-#: builtin/remote.c:907
+#: builtin/remote.c:909
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的(下一次获取将存储于 remotes/%s)"
-#: builtin/remote.c:910
+#: builtin/remote.c:912
msgid " tracked"
msgstr " 已跟踪"
-#: builtin/remote.c:912
+#: builtin/remote.c:914
msgid " stale (use 'git remote prune' to remove)"
msgstr " 过时(使用 'git remote prune' 来移除)"
-#: builtin/remote.c:914
+#: builtin/remote.c:916
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:955
+#: builtin/remote.c:957
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
-#: builtin/remote.c:963
+#: builtin/remote.c:965
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "交互式变基到远程 %s"
-#: builtin/remote.c:964
+#: builtin/remote.c:966
#, c-format
msgid "rebases onto remote %s"
msgstr "变基到远程 %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:969
#, c-format
msgid " merges with remote %s"
msgstr " 与远程 %s 合并"
-#: builtin/remote.c:970
+#: builtin/remote.c:972
#, c-format
msgid "merges with remote %s"
msgstr "与远程 %s 合并"
-#: builtin/remote.c:973
+#: builtin/remote.c:975
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和远程 %s\n"
-#: builtin/remote.c:1016
+#: builtin/remote.c:1018
msgid "create"
msgstr "创建"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1021
msgid "delete"
msgstr "删除"
-#: builtin/remote.c:1023
+#: builtin/remote.c:1025
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1028
msgid "fast-forwardable"
msgstr "可快进"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1031
msgid "local out of date"
msgstr "本地已过时"
-#: builtin/remote.c:1036
+#: builtin/remote.c:1038
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 强制推送至 %-*s (%s)"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1041
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1045
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 强制推送至 %s"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1048
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1116
msgid "do not query remotes"
msgstr "不查询远程"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1143
#, c-format
msgid "* remote %s"
msgstr "* 远程 %s"
-#: builtin/remote.c:1142
+#: builtin/remote.c:1144
#, c-format
msgid " Fetch URL: %s"
msgstr " 获取地址:%s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
+#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
msgid "(no URL)"
msgstr "(无 URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1154 builtin/remote.c:1156
+#: builtin/remote.c:1156 builtin/remote.c:1158
#, c-format
msgid " Push URL: %s"
msgstr " 推送地址:%s"
-#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支:%s"
# 译者:中文字符串拼接,可删除前导空格
-#: builtin/remote.c:1158
+#: builtin/remote.c:1160
msgid "(not queried)"
msgstr "(未查询)"
-#: builtin/remote.c:1160
+#: builtin/remote.c:1162
msgid "(unknown)"
msgstr "(未知)"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1166
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1178
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -11711,155 +11970,155 @@ msgstr[0] " 远程分支:%s"
msgstr[1] " 远程分支:%s"
# 译者:中文字符串拼接,可删除前导空格
-#: builtin/remote.c:1179 builtin/remote.c:1205
+#: builtin/remote.c:1181 builtin/remote.c:1207
msgid " (status not queried)"
msgstr "(状态未查询)"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1190
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 为 'git pull' 配置的本地分支:"
msgstr[1] " 为 'git pull' 配置的本地分支:"
-#: builtin/remote.c:1196
+#: builtin/remote.c:1198
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜像"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1204
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 为 'git push' 配置的本地引用%s:"
msgstr[1] " 为 'git push' 配置的本地引用%s:"
-#: builtin/remote.c:1223
+#: builtin/remote.c:1225
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1225
+#: builtin/remote.c:1227
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1242
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1242
+#: builtin/remote.c:1244
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
-#: builtin/remote.c:1252
+#: builtin/remote.c:1254
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1262
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一个有效引用:%s"
-#: builtin/remote.c:1262
+#: builtin/remote.c:1264
#, c-format
msgid "Could not setup %s"
msgstr "不能设置 %s"
# 译者:注意保持前导空格
-#: builtin/remote.c:1280
+#: builtin/remote.c:1282
#, c-format
msgid " %s will become dangling!"
msgstr " %s 将成为摇摆状态!"
# 译者:注意保持前导空格
-#: builtin/remote.c:1281
+#: builtin/remote.c:1283
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成为摇摆状态!"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1293
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1294
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: builtin/remote.c:1308
+#: builtin/remote.c:1310
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1311
+#: builtin/remote.c:1313
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1356
+#: builtin/remote.c:1358
msgid "prune remotes after fetching"
msgstr "抓取后清除远程"
-#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
+#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1435
+#: builtin/remote.c:1437
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1442
+#: builtin/remote.c:1444
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1459
+#: builtin/remote.c:1461
msgid "query push URLs rather than fetch URLs"
msgstr "查询推送 URL 地址,而非获取 URL 地址"
-#: builtin/remote.c:1461
+#: builtin/remote.c:1463
msgid "return all URLs"
msgstr "返回所有 URL 地址"
-#: builtin/remote.c:1489
+#: builtin/remote.c:1491
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "没有给远程仓库 '%s' 设定 URL"
-#: builtin/remote.c:1515
+#: builtin/remote.c:1517
msgid "manipulate push URLs"
msgstr "操作推送 URLS"
-#: builtin/remote.c:1517
+#: builtin/remote.c:1519
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1526
+#: builtin/remote.c:1528
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 无意义"
-#: builtin/remote.c:1567
+#: builtin/remote.c:1569
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹配模版:%s"
-#: builtin/remote.c:1575
+#: builtin/remote.c:1577
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL:%s"
-#: builtin/remote.c:1577
+#: builtin/remote.c:1579
msgid "Will not delete all non-push URLs"
msgstr "将不会删除所有非推送 URL 地址"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1593
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出;必须置于子命令之前"
-#: builtin/remote.c:1622
+#: builtin/remote.c:1624
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子命令:%s"
@@ -11977,67 +12236,67 @@ msgstr "git replace -d <对象>..."
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<格式>] [-l [<模式>]]"
-#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "不是一个有效的对象名:'%s'"
-#: builtin/replace.c:355
+#: builtin/replace.c:360
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "提交 '%s' 中含有损坏的合并标签"
-#: builtin/replace.c:357
+#: builtin/replace.c:362
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "提交 '%s' 中含有非法的合并标签"
-#: builtin/replace.c:368
+#: builtin/replace.c:373
#, 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:401
+#: builtin/replace.c:406
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "原始提交 '%s' 中包含一个 GPG 签名"
-#: builtin/replace.c:402
+#: builtin/replace.c:407
msgid "the signature will be removed in the replacement commit!"
msgstr "在替换的提交中签名将被移除!"
-#: builtin/replace.c:408
+#: builtin/replace.c:413
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "不能为 '%s' 写替换提交"
-#: builtin/replace.c:432
+#: builtin/replace.c:437
msgid "list replace refs"
msgstr "列出替换的引用"
-#: builtin/replace.c:433
+#: builtin/replace.c:438
msgid "delete replace refs"
msgstr "删除替换的引用"
-#: builtin/replace.c:434
+#: builtin/replace.c:439
msgid "edit existing object"
msgstr "编辑现存的对象"
-#: builtin/replace.c:435
+#: builtin/replace.c:440
msgid "change a commit's parents"
msgstr "修改一个提交的父提交"
-#: builtin/replace.c:436
+#: builtin/replace.c:441
msgid "replace the ref if it exists"
msgstr "如果存在则替换引用"
-#: builtin/replace.c:437
+#: builtin/replace.c:442
msgid "do not pretty-print contents for --edit"
msgstr "不要为 --edit 操作美观显示内容"
-#: builtin/replace.c:438
+#: builtin/replace.c:443
msgid "use this format"
msgstr "使用此格式"
@@ -12181,23 +12440,23 @@ msgstr "不能写入新的索引文件。"
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支持显示注解"
-#: builtin/rev-parse.c:391
+#: builtin/rev-parse.c:393
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
-#: builtin/rev-parse.c:396
+#: builtin/rev-parse.c:398
msgid "keep the `--` passed as an arg"
msgstr "保持 `--` 作为一个参数传递"
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:400
msgid "stop parsing after the first non-option argument"
msgstr "遇到第一个非选项参数后停止解析"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:403
msgid "output in stuck long form"
msgstr "以固定长格式输出"
-#: builtin/rev-parse.c:532
+#: builtin/rev-parse.c:534
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12227,68 +12486,72 @@ msgstr "git cherry-pick [<选项>] <提交号>..."
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <子命令>"
-#: builtin/revert.c:71
+#: builtin/revert.c:89
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s:%s 不能和 %s 同时使用"
-#: builtin/revert.c:80
+#: builtin/revert.c:98
msgid "end revert or cherry-pick sequence"
msgstr "终止反转或拣选操作"
-#: builtin/revert.c:81
+#: builtin/revert.c:99
msgid "resume revert or cherry-pick sequence"
msgstr "继续反转或拣选操作"
-#: builtin/revert.c:82
+#: builtin/revert.c:100
msgid "cancel revert or cherry-pick sequence"
msgstr "取消反转或拣选操作"
-#: builtin/revert.c:83
+#: builtin/revert.c:101
msgid "don't automatically commit"
msgstr "不要自动提交"
-#: builtin/revert.c:84
+#: builtin/revert.c:102
msgid "edit the commit message"
msgstr "编辑提交说明"
-#: builtin/revert.c:87
-msgid "parent number"
+#: builtin/revert.c:105
+msgid "parent-number"
msgstr "父编号"
-#: builtin/revert.c:89
+#: builtin/revert.c:106
+msgid "select mainline parent"
+msgstr "选择主干父提交编号"
+
+#: builtin/revert.c:108
msgid "merge strategy"
msgstr "合并策略"
-#: builtin/revert.c:90
+#: builtin/revert.c:109
msgid "option"
msgstr "选项"
-#: builtin/revert.c:91
+#: builtin/revert.c:110
msgid "option for merge strategy"
msgstr "合并策略的选项"
-#: builtin/revert.c:100
+#: builtin/revert.c:119
msgid "append commit name"
msgstr "追加提交名称"
-#: builtin/revert.c:102
+#: builtin/revert.c:121
msgid "preserve initially empty commits"
msgstr "保留初始化的空提交"
-#: builtin/revert.c:103
+#: builtin/revert.c:122
msgid "allow commits with empty messages"
msgstr "允许提交说明为空"
-#: builtin/revert.c:104
+#: builtin/revert.c:123
msgid "keep redundant, empty commits"
msgstr "保持多余的、空的提交"
-#: builtin/revert.c:192
+#: builtin/revert.c:211
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:205
+#: builtin/revert.c:224
msgid "cherry-pick failed"
msgstr "拣选失败"
@@ -12380,19 +12643,19 @@ msgstr ""
"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
" --all 和明确的 <引用> 互斥。"
-#: builtin/send-pack.c:160
+#: builtin/send-pack.c:161
msgid "remote name"
msgstr "远程名称"
-#: builtin/send-pack.c:171
+#: builtin/send-pack.c:175
msgid "use stateless RPC protocol"
msgstr "使用无状态的 RPC 协议"
-#: builtin/send-pack.c:172
+#: builtin/send-pack.c:176
msgid "read refs from stdin"
msgstr "从标准输入读取引用"
-#: builtin/send-pack.c:173
+#: builtin/send-pack.c:177
msgid "print status from remote helper"
msgstr "打印来自远程 helper 的状态"
@@ -12400,27 +12663,27 @@ msgstr "打印来自远程 helper 的状态"
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:248
msgid "Group by committer rather than author"
msgstr "按照提交者分组而不是作者"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:250
msgid "sort output according to the number of commits per author"
msgstr "根据每个作者的提交数量排序"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:252
msgid "Suppress commit descriptions, only provides commit count"
msgstr "隐藏提交说明,只提供提交数量"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:254
msgid "Show the email address of each author"
msgstr "显示每个作者的电子邮件地址"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:255
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:256
msgid "Linewrap output"
msgstr "折行输出"
@@ -12440,120 +12703,120 @@ msgstr ""
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
-#: builtin/show-branch.c:375
+#: builtin/show-branch.c:374
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
-#: builtin/show-branch.c:541
+#: builtin/show-branch.c:536
#, c-format
msgid "no matching refs with %s"
msgstr "没有和 %s 匹配的引用"
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:632
msgid "show remote-tracking and local branches"
msgstr "显示远程跟踪的和本地的分支"
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:634
msgid "show remote-tracking branches"
msgstr "显示远程跟踪的分支"
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:636
msgid "color '*!+-' corresponding to the branch"
msgstr "着色 '*!+-' 到相应的分支"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:638
msgid "show <n> more commits after the common ancestor"
msgstr "显示共同祖先后的 <n> 个提交"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:640
msgid "synonym to more=-1"
msgstr "和 more=-1 同义"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:641
msgid "suppress naming strings"
msgstr "不显示字符串命名"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:643
msgid "include the current branch"
msgstr "包括当前分支"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:645
msgid "name commits with their object names"
msgstr "以对象名字命名提交"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:647
msgid "show possible merge bases"
msgstr "显示可能合并的基线"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:649
msgid "show refs unreachable from any other ref"
msgstr "显示没有任何引用的的引用"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:651
msgid "show commits in topological order"
msgstr "以拓扑顺序显示提交"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:654
msgid "show only commits not on the first branch"
msgstr "只显示不在第一个分支上的提交"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:656
msgid "show merges reachable from only one tip"
msgstr "显示仅一个分支可访问的合并提交"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:658
msgid "topologically sort, maintaining date order where possible"
msgstr "拓扑方式排序,并尽可能地保持日期顺序"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:661
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:662
msgid "show <n> most recent ref-log entries starting at base"
msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
-#: builtin/show-branch.c:703
+#: builtin/show-branch.c:696
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
-#: builtin/show-branch.c:727
+#: builtin/show-branch.c:720
msgid "no branches given, and HEAD is not valid"
msgstr "未提供分支,且 HEAD 无效"
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:723
msgid "--reflog option needs one branch name"
msgstr "选项 --reflog 需要一个分支名"
-#: builtin/show-branch.c:733
+#: builtin/show-branch.c:726
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "一次只能显示 %d 个条目。"
msgstr[1] "一次只能显示 %d 个条目。"
-#: builtin/show-branch.c:737
+#: builtin/show-branch.c:730
#, c-format
msgid "no such ref %s"
msgstr "无此引用 %s"
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:814
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "不能处理 %d 个以上的版本。"
msgstr[1] "不能处理 %d 个以上的版本。"
-#: builtin/show-branch.c:833
+#: builtin/show-branch.c:818
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' 不是一个有效的引用。"
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:821
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "不能找到提交 %s(%s)"
@@ -12618,12 +12881,12 @@ msgstr "跳过和移除所有的注释行"
msgid "prepend comment character and space to each line"
msgstr "为每一行的行首添加注释符和空格"
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用:%s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用名称,却得到 %s"
@@ -12633,93 +12896,100 @@ msgstr "期望一个完整的引用名称,却得到 %s"
msgid "cannot strip one component off url '%s'"
msgstr "无法从 url '%s' 剥离一个组件"
-#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记(anchor)"
-#: builtin/submodule--helper.c:287
+#: builtin/submodule--helper.c:310
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
-#: builtin/submodule--helper.c:373
+#: builtin/submodule--helper.c:395
+#, c-format
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
+
+#: builtin/submodule--helper.c:406
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册 url"
-#: builtin/submodule--helper.c:377
+#: builtin/submodule--helper.c:410
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
#
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:420
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
-#: builtin/submodule--helper.c:394
+#: builtin/submodule--helper.c:427
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册更新模式"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:443
msgid "Suppress output for initializing a submodule"
msgstr "初始化子模组时抑制输出"
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:448
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<路径>]"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:476
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路径>"
-#: builtin/submodule--helper.c:442
+#: builtin/submodule--helper.c:482
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
-#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模组 '%s' 不能添加仓库备选:%s"
-#: builtin/submodule--helper.c:564
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:571
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:633
msgid "where the new submodule will be cloned to"
msgstr "新的子模组将要克隆的路径"
-#: builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:636
msgid "name of the new submodule"
msgstr "新子模组的名称"
-#: builtin/submodule--helper.c:601
+#: builtin/submodule--helper.c:639
msgid "url where to clone the submodule from"
msgstr "克隆子模组的 url 地址"
-#: builtin/submodule--helper.c:607
+#: builtin/submodule--helper.c:645
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
msgid "force cloning progress"
msgstr "强制显示克隆进度"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:653
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -12727,116 +12997,106 @@ msgstr ""
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
-#: builtin/submodule--helper.c:646
+#: builtin/submodule--helper.c:684
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-#: builtin/submodule--helper.c:662
-#, c-format
-msgid "cannot open file '%s'"
-msgstr "无法打开文件 '%s'"
-
-#: builtin/submodule--helper.c:667
-#, c-format
-msgid "could not close file %s"
-msgstr "无法关闭文件 %s"
-
-#: builtin/submodule--helper.c:674
+#: builtin/submodule--helper.c:699
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' 的子模组目录"
-#: builtin/submodule--helper.c:742
+#: builtin/submodule--helper.c:764
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模组 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:746
+#: builtin/submodule--helper.c:768
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想要执行 'update --init'?"
-#: builtin/submodule--helper.c:772
+#: builtin/submodule--helper.c:793
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未合并的子模组 %s"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:814
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过子模组 '%s'"
-#: builtin/submodule--helper.c:929
+#: builtin/submodule--helper.c:942
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "克隆 '%s' 失败。按计划重试"
-#: builtin/submodule--helper.c:940
+#: builtin/submodule--helper.c:953
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次尝试克隆 '%s' 失败,退出"
-#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105
+#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
msgid "path into the working tree"
msgstr "到工作区的路径"
-#: builtin/submodule--helper.c:964
+#: builtin/submodule--helper.c:977
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作区中的路径,递归嵌套子模组"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:981
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:972
+#: builtin/submodule--helper.c:985
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:988
msgid "parallel jobs"
msgstr "并发任务"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:990
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
-#: builtin/submodule--helper.c:978
+#: builtin/submodule--helper.c:991
msgid "don't print cloning progress"
msgstr "不要输出克隆进度"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:998
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1008
msgid "bad value for update parameter"
msgstr "update 参数取值错误"
-#: builtin/submodule--helper.c:1066
+#: builtin/submodule--helper.c:1079
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
-#: builtin/submodule--helper.c:1106
+#: builtin/submodule--helper.c:1163
msgid "recurse into submodules"
msgstr "在子模组中递归"
-#: builtin/submodule--helper.c:1112
+#: builtin/submodule--helper.c:1169
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<路径>...]"
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1226
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "submodule-helper 子命令必须由另外的子命令调用"
-#: builtin/submodule--helper.c:1164
+#: builtin/submodule--helper.c:1233
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
-#: builtin/submodule--helper.c:1170
+#: builtin/submodule--helper.c:1239
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
@@ -12882,32 +13142,29 @@ msgstr "git tag -d <标签名>..."
#: builtin/tag.c:25
msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
+"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
+"at <对象>]\n"
"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
#: builtin/tag.c:27
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<格式>] <标签名>..."
-#: builtin/tag.c:82
-#, c-format
-msgid "tag name too long: %.*s..."
-msgstr "标签名称太长:%.*s..."
-
-#: builtin/tag.c:87
+#: builtin/tag.c:83
#, c-format
msgid "tag '%s' not found."
msgstr "未发现标签 '%s'。"
-#: builtin/tag.c:102
+#: builtin/tag.c:99
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除标签 '%s'(曾为 %s)\n"
-#: builtin/tag.c:131
+#: builtin/tag.c:128
#, c-format
msgid ""
"\n"
@@ -12920,7 +13177,7 @@ msgstr ""
" %s\n"
"以 '%c' 开头的行将被忽略。\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:132
#, c-format
msgid ""
"\n"
@@ -12934,138 +13191,142 @@ msgstr ""
" %s\n"
"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
-#: builtin/tag.c:213
+#: builtin/tag.c:210
msgid "unable to sign the tag"
msgstr "无法签署标签"
-#: builtin/tag.c:215
+#: builtin/tag.c:212
msgid "unable to write tag file"
msgstr "无法写标签文件"
-#: builtin/tag.c:240
+#: builtin/tag.c:236
msgid "bad object type."
msgstr "坏的对象类型。"
-#: builtin/tag.c:253
-msgid "tag header too big."
-msgstr "标签头信息太大。"
-
-#: builtin/tag.c:289
+#: builtin/tag.c:282
msgid "no tag message?"
msgstr "无标签说明?"
-#: builtin/tag.c:295
+#: builtin/tag.c:289
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "标签说明被保留在 %s\n"
-#: builtin/tag.c:354
+#: builtin/tag.c:397
msgid "list tag names"
msgstr "列出标签名称"
-#: builtin/tag.c:356
+#: builtin/tag.c:399
msgid "print <n> lines of each tag message"
msgstr "每个标签信息打印 <n> 行"
-#: builtin/tag.c:358
+#: builtin/tag.c:401
msgid "delete tags"
msgstr "删除标签"
-#: builtin/tag.c:359
+#: builtin/tag.c:402
msgid "verify tags"
msgstr "验证标签"
-#: builtin/tag.c:361
+#: builtin/tag.c:404
msgid "Tag creation options"
msgstr "标签创建选项"
-#: builtin/tag.c:363
+#: builtin/tag.c:406
msgid "annotated tag, needs a message"
msgstr "附注标签,需要一个说明"
-#: builtin/tag.c:365
+#: builtin/tag.c:408
msgid "tag message"
msgstr "标签说明"
-#: builtin/tag.c:367
+#: builtin/tag.c:410
msgid "annotated and GPG-signed tag"
msgstr "附注并附加 GPG 签名的标签"
-#: builtin/tag.c:371
+#: builtin/tag.c:414
msgid "use another key to sign the tag"
msgstr "使用另外的私钥签名该标签"
-#: builtin/tag.c:372
+#: builtin/tag.c:415
msgid "replace the tag if exists"
msgstr "如果存在,替换现有的标签"
-#: builtin/tag.c:373 builtin/update-ref.c:368
+#: builtin/tag.c:416 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "创建引用日志"
-#: builtin/tag.c:375
+#: builtin/tag.c:418
msgid "Tag listing options"
msgstr "标签列表选项"
-#: builtin/tag.c:376
+#: builtin/tag.c:419
msgid "show tag list in columns"
msgstr "以列的方式显示标签列表"
-#: builtin/tag.c:377 builtin/tag.c:378
+#: builtin/tag.c:420 builtin/tag.c:422
msgid "print only tags that contain the commit"
-msgstr "只打印包含提交的标签"
+msgstr "只打印包含该提交的标签"
+
+#: builtin/tag.c:421 builtin/tag.c:423
+msgid "print only tags that don't contain the commit"
+msgstr "只打印不包含该提交的标签"
-#: builtin/tag.c:379
+#: builtin/tag.c:424
msgid "print only tags that are merged"
msgstr "只打印已经合并的标签"
-#: builtin/tag.c:380
+#: builtin/tag.c:425
msgid "print only tags that are not merged"
msgstr "只打印尚未合并的标签"
-#: builtin/tag.c:385
+#: builtin/tag.c:430
msgid "print only tags of the object"
-msgstr "只打印对象的标签"
+msgstr "只打印指向该对象的标签"
-#: builtin/tag.c:415
+#: builtin/tag.c:469
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不兼容"
-#: builtin/tag.c:437
-msgid "-n option is only allowed with -l."
-msgstr "-n 选项只允许和 -l 同时使用。"
+#: builtin/tag.c:491
+msgid "-n option is only allowed in list mode"
+msgstr "-n 选项只允许用在列表显示模式"
+
+#: builtin/tag.c:493
+msgid "--contains option is only allowed in list mode"
+msgstr "--contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:439
-msgid "--contains option is only allowed with -l."
-msgstr "--contains 选项只允许和 -l 同时使用。"
+#: builtin/tag.c:495
+msgid "--no-contains option is only allowed in list mode"
+msgstr "--no-contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:441
-msgid "--points-at option is only allowed with -l."
-msgstr "--points-at 选项只允许和 -l 同时使用。"
+#: builtin/tag.c:497
+msgid "--points-at option is only allowed in list mode"
+msgstr "--points-at 选项只允许用在列表显示模式"
-#: builtin/tag.c:443
-msgid "--merged and --no-merged option are only allowed with -l"
-msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
+#: builtin/tag.c:499
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
-#: builtin/tag.c:454
+#: builtin/tag.c:510
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"
-#: builtin/tag.c:473
+#: builtin/tag.c:529
msgid "too many params"
msgstr "太多参数"
-#: builtin/tag.c:479
+#: builtin/tag.c:535
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的标签名称。"
-#: builtin/tag.c:484
+#: builtin/tag.c:540
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
-#: builtin/tag.c:512
+#: builtin/tag.c:570
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'(曾为 %s)\n"
@@ -13082,7 +13343,7 @@ msgstr "无法创建目录 %s"
#: builtin/update-index.c:85
#, c-format
msgid "failed to stat %s"
-msgstr "无法枚举 %s 状态"
+msgstr "对 %s 调用 stat 失败"
#: builtin/update-index.c:95
#, c-format
@@ -13094,165 +13355,179 @@ msgstr "无法创建文件 %s"
msgid "failed to delete file %s"
msgstr "无法删除文件 %s"
-#: builtin/update-index.c:110 builtin/update-index.c:212
+#: builtin/update-index.c:110 builtin/update-index.c:216
#, c-format
msgid "failed to delete directory %s"
msgstr "无法删除目录 %s"
-#: builtin/update-index.c:133
+#: builtin/update-index.c:135
#, c-format
msgid "Testing mtime in '%s' "
msgstr "在 '%s' 中测试 mtime "
-#: builtin/update-index.c:145
+#: builtin/update-index.c:149
msgid "directory stat info does not change after adding a new file"
msgstr "添加一个新文件后,目录的状态信息未改变"
-#: builtin/update-index.c:158
+#: builtin/update-index.c:162
msgid "directory stat info does not change after adding a new directory"
msgstr "添加一个新目录后,目录的状态信息未改变"
-#: builtin/update-index.c:171
+#: builtin/update-index.c:175
msgid "directory stat info changes after updating a file"
msgstr "更新一个文件后,目录的状态信息被修改"
-#: builtin/update-index.c:182
+#: builtin/update-index.c:186
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "在子目录中添加文件后,目录的状态信息被修改"
-#: builtin/update-index.c:193
+#: builtin/update-index.c:197
msgid "directory stat info does not change after deleting a file"
msgstr "删除一个文件后,目录的状态信息未改变"
-#: builtin/update-index.c:206
+#: builtin/update-index.c:210
msgid "directory stat info does not change after deleting a directory"
msgstr "删除一个目录后,目录的状态信息未改变"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:217
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:564
+#: builtin/update-index.c:568
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<选项>] [--] [<文件>...]"
-#: builtin/update-index.c:919
+#: builtin/update-index.c:923
msgid "continue refresh even when index needs update"
msgstr "当索引需要更新时继续刷新"
-#: builtin/update-index.c:922
+#: builtin/update-index.c:926
msgid "refresh: ignore submodules"
msgstr "刷新:忽略子模组"
-#: builtin/update-index.c:925
+#: builtin/update-index.c:929
msgid "do not ignore new files"
msgstr "不忽略新的文件"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:931
msgid "let files replace directories and vice-versa"
msgstr "让文件替换目录(反之亦然)"
-#: builtin/update-index.c:929
+#: builtin/update-index.c:933
msgid "notice files missing from worktree"
msgstr "通知文件从工作区丢失"
-#: builtin/update-index.c:931
+#: builtin/update-index.c:935
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引区包含未合并的条目也执行刷新"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:938
msgid "refresh stat information"
msgstr "刷新统计信息"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:942
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:946
msgid "<mode>,<object>,<path>"
msgstr "<存取模式>,<对象>,<路径>"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:947
msgid "add the specified entry to the index"
msgstr "添加指定的条目到索引区"
-#: builtin/update-index.c:952
+#: builtin/update-index.c:956
msgid "mark files as \"not changing\""
msgstr "把文件标记为 \"没有变更\""
-#: builtin/update-index.c:955
+#: builtin/update-index.c:959
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
-#: builtin/update-index.c:958
+#: builtin/update-index.c:962
msgid "mark files as \"index-only\""
msgstr "把文件标记为 \"仅索引\""
-#: builtin/update-index.c:961
+#: builtin/update-index.c:965
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:968
msgid "add to index only; do not add content to object database"
msgstr "只添加到索引区;不添加对象到对象库"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:970
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作区里,也删除路径"
-#: builtin/update-index.c:968
+#: builtin/update-index.c:972
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "携带 --stdin:输入的行以 null 字符终止"
-#: builtin/update-index.c:970
+#: builtin/update-index.c:974
msgid "read list of paths to be updated from standard input"
msgstr "从标准输入中读取需要更新的路径列表"
-#: builtin/update-index.c:974
+#: builtin/update-index.c:978
msgid "add entries from standard input to the index"
msgstr "从标准输入添加条目到索引区"
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "为指定文件重新生成第2和第3暂存区"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:986
msgid "only update entries that differ from HEAD"
msgstr "只更新与 HEAD 不同的条目"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:990
msgid "ignore files missing from worktree"
msgstr "忽略工作区丢失的文件"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:993
msgid "report actions to standard output"
msgstr "在标准输出显示操作"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘记保存的未解决的冲突"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
msgid "write index in this format"
msgstr "以这种格式写入索引区"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1001
msgid "enable or disable split index"
msgstr "启用或禁用索引拆分"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1003
msgid "enable/disable untracked cache"
msgstr "启用/禁用对未跟踪文件的缓存"
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1005
msgid "test if the filesystem supports untracked cache"
msgstr "测试文件系统是否支持未跟踪文件缓存"
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1007
msgid "enable untracked cache without testing the filesystem"
msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
-#: builtin/update-index.c:1120
+#: builtin/update-index.c:1107
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
+
+#: builtin/update-index.c:1116
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
+
+#: builtin/update-index.c:1127
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -13260,11 +13535,11 @@ msgstr ""
"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
"改它。"
-#: builtin/update-index.c:1124
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "缓存未跟踪文件被禁用"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13272,7 +13547,7 @@ msgstr ""
"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
"修改它。"
-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "缓存未跟踪文件在 '%s' 启用"
@@ -13365,27 +13640,27 @@ msgstr "git worktree prune [<选项>]"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:43
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "删除工作区/%s:不是一个有效的目录"
-#: builtin/worktree.c:48
+#: builtin/worktree.c:49
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "删除 worktrees/%s:gitdir 文件不存在"
-#: builtin/worktree.c:53
+#: builtin/worktree.c:54
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
-#: builtin/worktree.c:64
+#: builtin/worktree.c:65
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "删除 worktrees/%s:无效的 gitdir 文件"
-#: builtin/worktree.c:80
+#: builtin/worktree.c:81
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
@@ -13403,60 +13678,64 @@ msgstr "将早于 <time> 的工作区过期"
msgid "'%s' already exists"
msgstr "'%s' 已经存在"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/worktree.c:272
+#: builtin/worktree.c:274
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "准备 %s(标识符 %s)"
-#: builtin/worktree.c:323
+#: builtin/worktree.c:328
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
-#: builtin/worktree.c:325
+#: builtin/worktree.c:330
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:332
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:334
msgid "populate the new working tree"
msgstr "生成新的工作区"
-#: builtin/worktree.c:337
+#: builtin/worktree.c:335
+msgid "keep the new working tree locked"
+msgstr "锁定新工作区"
+
+#: builtin/worktree.c:343
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:472
+#: builtin/worktree.c:478
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:484 builtin/worktree.c:517
+#: builtin/worktree.c:490 builtin/worktree.c:523
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:486 builtin/worktree.c:519
+#: builtin/worktree.c:492 builtin/worktree.c:525
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:497
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定,原因:%s"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:499
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:521
+#: builtin/worktree.c:527
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
@@ -13481,19 +13760,19 @@ msgstr "只对调试有用"
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<选项>] <目录>"
-#: upload-pack.c:1036
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "在一次单独的请求/响应(request/response)交换后退出"
-#: upload-pack.c:1038
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "在初始的引用广告后立即退出"
-#: upload-pack.c:1040
+#: upload-pack.c:1044
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
-#: upload-pack.c:1042
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "不活动 <n> 秒钟后终止传输"
@@ -13524,15 +13803,20 @@ msgstr ""
"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
"帮助。"
-#: http.c:344
+#: http.c:336
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "http.postbuffer 为负值,默认为 %d"
+
+#: http.c:357
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "当 cURL < 7.22.0 时,不支持委托控制"
-#: http.c:353
+#: http.c:366
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
-#: http.c:1713
+#: http.c:1766
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -13543,7 +13827,7 @@ msgstr ""
" 请求:%s\n"
" 重定向:%s"
-#: remote-curl.c:319
+#: remote-curl.c:323
#, c-format
msgid "redirecting to %s"
msgstr "重定向到 %s"
@@ -13911,7 +14195,7 @@ msgstr "尝试和 $pretty_name 的简单合并"
msgid "Simple merge did not work, trying automatic merge."
msgstr "简单合并未生效,尝试自动合并。"
-#: git-rebase.sh:57
+#: git-rebase.sh:58
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -13922,37 +14206,37 @@ msgstr ""
"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
-#: git-rebase.sh:157 git-rebase.sh:396
+#: git-rebase.sh:158 git-rebase.sh:397
#, sh-format
msgid "Could not move back to $head_name"
msgstr "无法移回 $head_name"
-#: git-rebase.sh:171
+#: git-rebase.sh:172
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "无法保存 $stash_sha1"
-#: git-rebase.sh:211
+#: git-rebase.sh:212
msgid "The pre-rebase hook refused to rebase."
msgstr "钩子 pre-rebase 拒绝变基操作。"
-#: git-rebase.sh:216
+#: git-rebase.sh:217
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
-#: git-rebase.sh:357
+#: git-rebase.sh:358
msgid "No rebase in progress?"
msgstr "没有正在进行的变基?"
-#: git-rebase.sh:368
+#: git-rebase.sh:369
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: git-rebase.sh:375
+#: git-rebase.sh:376
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: git-rebase.sh:378
+#: git-rebase.sh:379
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -13960,7 +14244,7 @@ msgstr ""
"您必须编辑所有的合并冲突,然后通过 git add\n"
"命令将它们标记为已解决"
-#: git-rebase.sh:418
+#: git-rebase.sh:419
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -13979,101 +14263,101 @@ msgstr ""
"\t$cmd_clear_stale_rebase\n"
"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
-#: git-rebase.sh:469
+#: git-rebase.sh:470
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "无效的上游 $upstream_name"
-#: git-rebase.sh:493
+#: git-rebase.sh:494
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 有一个以上的合并基准"
-#: git-rebase.sh:496 git-rebase.sh:500
+#: git-rebase.sh:497 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 没有合并基准"
-#: git-rebase.sh:505
+#: git-rebase.sh:506
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "没有指向一个有效的提交:$onto_name"
-#: git-rebase.sh:528
+#: git-rebase.sh:529
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "严重错误:无此分支:$branch_name"
-#: git-rebase.sh:561
+#: git-rebase.sh:562
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: git-rebase.sh:566
+#: git-rebase.sh:567
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "创建了 autostash: $stash_abbrev"
-#: git-rebase.sh:570
+#: git-rebase.sh:571
msgid "Please commit or stash them."
msgstr "请提交或为它们保存进度。"
-#: git-rebase.sh:590
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "当前分支 $branch_name 是最新的。"
-#: git-rebase.sh:594
+#: git-rebase.sh:595
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "当前分支 $branch_name 是最新的,强制变基。"
-#: git-rebase.sh:605
+#: git-rebase.sh:606
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "变更从 $mb 到 $onto:"
-#: git-rebase.sh:614
+#: git-rebase.sh:615
msgid "First, rewinding head to replay your work on top of it..."
msgstr "首先,回退分支以便在上面重放您的工作..."
-#: git-rebase.sh:624
+#: git-rebase.sh:625
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "快进 $branch_name 至 $onto_name。"
-#: git-stash.sh:50
+#: git-stash.sh:53
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear 不支持参数"
-#: git-stash.sh:73
+#: git-stash.sh:94
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: git-stash.sh:88
+#: git-stash.sh:109
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
-#: git-stash.sh:103
+#: git-stash.sh:124
msgid "Cannot save the untracked files"
msgstr "无法保存未跟踪文件"
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:144 git-stash.sh:157
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
-#: git-stash.sh:140
+#: git-stash.sh:161
msgid "No changes selected"
msgstr "没有选择变更"
-#: git-stash.sh:143
+#: git-stash.sh:164
msgid "Cannot remove temporary index (can't happen)"
msgstr "无法删除临时索引(不应发生)"
-#: git-stash.sh:156
+#: git-stash.sh:177
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
-#: git-stash.sh:188
+#: git-stash.sh:209
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "无法用 $w_commit 更新 $ref_stash"
@@ -14088,7 +14372,7 @@ msgstr "无法用 $w_commit 更新 $ref_stash"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:238
+#: git-stash.sh:265
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -14097,107 +14381,107 @@ msgstr ""
"错误:'stash save' 的未知选项:$option\n"
" 要提供一个描述信息,使用 git stash save -- '$option'"
-#: git-stash.sh:251
+#: git-stash.sh:278
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-#: git-stash.sh:259
+#: git-stash.sh:286
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
-#: git-stash.sh:263
+#: git-stash.sh:291
msgid "Cannot initialize stash"
msgstr "无法初始化 stash"
-#: git-stash.sh:267
+#: git-stash.sh:295
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
-#: git-stash.sh:268
+#: git-stash.sh:296
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "保存工作目录和索引状态 $stash_msg"
-#: git-stash.sh:285
+#: git-stash.sh:323
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: git-stash.sh:403
+#: git-stash.sh:471
#, sh-format
msgid "unknown option: $opt"
msgstr "未知选项: $opt"
-#: git-stash.sh:416
+#: git-stash.sh:484
msgid "No stash found."
msgstr "未发现 stash。"
-#: git-stash.sh:423
+#: git-stash.sh:491
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "指定了太多的版本:$REV"
-#: git-stash.sh:438
+#: git-stash.sh:506
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference 不是一个有效的引用"
-#: git-stash.sh:466
+#: git-stash.sh:534
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' 不是 stash 样提交"
-#: git-stash.sh:477
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' 不是一个 stash 引用"
-#: git-stash.sh:485
+#: git-stash.sh:553
msgid "unable to refresh index"
msgstr "无法刷新索引"
-#: git-stash.sh:489
+#: git-stash.sh:557
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程中恢复进度"
-#: git-stash.sh:497
+#: git-stash.sh:565
msgid "Conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不使用 --index。"
-#: git-stash.sh:499
+#: git-stash.sh:567
msgid "Could not save index tree"
msgstr "不能保存索引树"
-#: git-stash.sh:508
+#: git-stash.sh:576
msgid "Could not restore untracked files from stash"
msgstr "无法从进度保存中恢复未跟踪文件"
-#: git-stash.sh:533
+#: git-stash.sh:601
msgid "Cannot unstage modified files"
msgstr "无法将修改的文件取消暂存"
-#: git-stash.sh:548
+#: git-stash.sh:616
msgid "Index was not unstashed."
msgstr "索引的进度没有被恢复。"
-#: git-stash.sh:562
+#: git-stash.sh:630
msgid "The stash is kept in case you need it again."
msgstr "暂存被保留以备您再次需要。"
-#: git-stash.sh:571
+#: git-stash.sh:639
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"
-#: git-stash.sh:572
+#: git-stash.sh:640
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}:不能丢弃进度条目"
-#: git-stash.sh:580
+#: git-stash.sh:648
msgid "No branch name specified"
msgstr "未指定分支名"
-#: git-stash.sh:652
+#: git-stash.sh:727
msgid "(To restore them type \"git stash apply\")"
msgstr "(为恢复数据输入 \"git stash apply\")"
@@ -14281,27 +14565,27 @@ msgstr "无法添加子模组 '$sm_path'"
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
-#: git-submodule.sh:327
+#: git-submodule.sh:341
#, sh-format
msgid "Entering '$displaypath'"
msgstr "正在进入 '$displaypath'"
-#: git-submodule.sh:347
+#: git-submodule.sh:361
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "停止于 '$displaypath';脚本返回非零值。"
-#: git-submodule.sh:418
+#: git-submodule.sh:432
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "pathspec 和 --all 不兼容"
-#: git-submodule.sh:423
+#: git-submodule.sh:437
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
-#: git-submodule.sh:443
+#: git-submodule.sh:457
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
@@ -14310,56 +14594,56 @@ msgstr ""
"子模组工作区 '$displaypath' 包含一个 .git 目录\n"
"(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)"
-#: git-submodule.sh:451
+#: git-submodule.sh:465
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
-#: git-submodule.sh:454
+#: git-submodule.sh:468
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "已清除目录 '$displaypath'"
-#: git-submodule.sh:455
+#: git-submodule.sh:469
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "无法移除子模组工作区 '$displaypath'"
-#: git-submodule.sh:458
+#: git-submodule.sh:472
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "不能创建空的子模组目录 '$displaypath'"
-#: git-submodule.sh:467
+#: git-submodule.sh:481
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
-#: git-submodule.sh:623
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
-#: git-submodule.sh:633
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-submodule.sh:638
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
-#: git-submodule.sh:656
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中获取"
-#: git-submodule.sh:662
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14367,84 +14651,84 @@ msgid ""
msgstr ""
"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
-#: git-submodule.sh:669
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:670
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "子模组路径 '$displaypath':检出 '$sha1'"
-#: git-submodule.sh:674
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-#: git-submodule.sh:675
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
-#: git-submodule.sh:680
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-#: git-submodule.sh:681
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
-#: git-submodule.sh:686
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:687
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "子模组 '$displaypath':'$command $sha1'"
-#: git-submodule.sh:718
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进子模组路径 '$displaypath'"
-#: git-submodule.sh:826
+#: git-submodule.sh:840
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached 不能和选项 --files 同时使用"
-#: git-submodule.sh:878
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
# 译者:注意保持前导空格
-#: git-submodule.sh:898
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告:$display_name 未包含提交 $sha1_src"
# 译者:注意保持前导空格
-#: git-submodule.sh:901
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告:$display_name 未包含提交 $sha1_dst"
# 译者:注意保持前导空格
-#: git-submodule.sh:904
+#: git-submodule.sh:918
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
-#: git-submodule.sh:1051
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进子模组路径 '$sm_path'"
-#: git-submodule.sh:1118
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "为 '$displaypath' 同步子模组 url"
@@ -14737,11 +15021,11 @@ msgstr ""
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。"
-#: git-rebase--interactive.sh:1079
+#: git-rebase--interactive.sh:1083
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1084
+#: git-rebase--interactive.sh:1088
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -14770,22 +15054,22 @@ msgstr ""
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1101
+#: git-rebase--interactive.sh:1105
msgid "Error trying to find the author identity to amend commit"
msgstr "在修补提交中查找作者信息时遇到错误"
-#: git-rebase--interactive.sh:1106
+#: git-rebase--interactive.sh:1110
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115
+#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
msgid "Could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: git-rebase--interactive.sh:1139
+#: git-rebase--interactive.sh:1147
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -14799,40 +15083,40 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305
+#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
msgid "Could not execute editor"
msgstr "无法运行编辑器"
-#: git-rebase--interactive.sh:1160
+#: git-rebase--interactive.sh:1168
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "不能检出 $switch_to"
-#: git-rebase--interactive.sh:1165
+#: git-rebase--interactive.sh:1173
msgid "No HEAD?"
msgstr "没有 HEAD?"
-#: git-rebase--interactive.sh:1166
+#: git-rebase--interactive.sh:1174
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "不能创建临时 $state_dir"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:1176
msgid "Could not mark as interactive"
msgstr "不能标记为交互式"
-#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183
+#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
msgid "Could not init rewritten commits"
msgstr "不能对重写提交进行初始化"
-#: git-rebase--interactive.sh:1283
+#: git-rebase--interactive.sh:1291
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1296
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -14842,7 +15126,7 @@ msgstr ""
"然而,如果您删除全部内容,变基操作将会终止。\n"
"\n"
-#: git-rebase--interactive.sh:1295
+#: git-rebase--interactive.sh:1303
msgid "Note that empty commits are commented out"
msgstr "注意空提交已被注释掉"
@@ -14917,113 +15201,107 @@ msgstr "缓存"
msgid "unstaged"
msgstr "未缓存"
-#: git-add--interactive.perl:297 git-add--interactive.perl:322
+#: git-add--interactive.perl:288 git-add--interactive.perl:313
msgid "binary"
msgstr "二进制"
-#: git-add--interactive.perl:306 git-add--interactive.perl:360
+#: git-add--interactive.perl:297 git-add--interactive.perl:351
msgid "nothing"
msgstr "无"
-#: git-add--interactive.perl:342 git-add--interactive.perl:357
+#: git-add--interactive.perl:333 git-add--interactive.perl:348
msgid "unchanged"
msgstr "没有修改"
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:644
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "增加了 %d 个路径\n"
msgstr[1] "增加了 %d 个路径\n"
-#: git-add--interactive.perl:656
+#: git-add--interactive.perl:647
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "更新了 %d 个路径\n"
msgstr[1] "更新了 %d 个路径\n"
-#: git-add--interactive.perl:659
+#: git-add--interactive.perl:650
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "还原了 %d 个路径\n"
msgstr[1] "还原了 %d 个路径\n"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:653
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "触碰了 %d 个路径\n"
msgstr[1] "触碰了 %d 个路径\n"
-#: git-add--interactive.perl:671
+#: git-add--interactive.perl:662
msgid "Update"
msgstr "更新"
-#: git-add--interactive.perl:683
+#: git-add--interactive.perl:674
msgid "Revert"
msgstr "还原"
-#: git-add--interactive.perl:706
+#: git-add--interactive.perl:697
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "说明:%s 现已成为未跟踪的。\n"
-#: git-add--interactive.perl:717
+#: git-add--interactive.perl:708
msgid "Add untracked"
msgstr "添加未跟踪的"
-#: git-add--interactive.perl:723
+#: git-add--interactive.perl:714
msgid "No untracked files.\n"
msgstr "没有未跟踪的文件。\n"
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1030
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr "如果补丁能干净地应用,编辑块将立即标记为保存进度。"
-#: git-add--interactive.perl:1045
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
-#: git-add--interactive.perl:1048 git-add--interactive.perl:1057
+#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
-#: git-add--interactive.perl:1051
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for discarding"
-msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃"
-
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
-#: git-add--interactive.perl:1067
+#: git-add--interactive.perl:1058
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "无法写入块编辑文件:%s"
-#: git-add--interactive.perl:1068
+#: git-add--interactive.perl:1059
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1065
#, perl-format
msgid ""
"---\n"
@@ -15037,7 +15315,7 @@ msgstr ""
"以 %s 开始的行将被删除。\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1082
+#: git-add--interactive.perl:1073
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -15046,7 +15324,7 @@ msgstr ""
"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
"此次编辑被终止,该块不会被修改。\n"
-#: git-add--interactive.perl:1096
+#: git-add--interactive.perl:1087
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "无法读取块编辑文件:%s"
@@ -15057,12 +15335,12 @@ msgstr "无法读取块编辑文件:%s"
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1187
+#: git-add--interactive.perl:1178
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
-#: git-add--interactive.perl:1196
+#: git-add--interactive.perl:1187
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -15076,7 +15354,7 @@ msgstr ""
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1202
+#: git-add--interactive.perl:1193
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -15090,7 +15368,7 @@ msgstr ""
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1208
+#: git-add--interactive.perl:1199
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -15104,7 +15382,7 @@ msgstr ""
"a - 不暂存该块和本文件中后面的全部块\n"
"d - 不要不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1214
+#: git-add--interactive.perl:1205
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -15118,7 +15396,7 @@ msgstr ""
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1211
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -15132,7 +15410,7 @@ msgstr ""
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1226
+#: git-add--interactive.perl:1217
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -15146,7 +15424,7 @@ msgstr ""
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1232
+#: git-add--interactive.perl:1223
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -15160,7 +15438,7 @@ msgstr ""
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1241
+#: git-add--interactive.perl:1232
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -15182,201 +15460,201 @@ msgstr ""
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
-#: git-add--interactive.perl:1272
+#: git-add--interactive.perl:1263
msgid "The selected hunks do not apply to the index!\n"
msgstr "选中的块不能应用到索引!\n"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1264
msgid "Apply them to the worktree anyway? "
msgstr "无论如何都要应用到工作区么?"
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1267
msgid "Nothing was applied.\n"
msgstr "未应用。\n"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1278
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "忽略未合入的:%s\n"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1287
msgid "Only binary files changed.\n"
msgstr "只有二进制文件被修改。\n"
-#: git-add--interactive.perl:1298
+#: git-add--interactive.perl:1289
msgid "No changes.\n"
msgstr "没有修改。\n"
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1297
msgid "Patch update"
msgstr "补丁更新"
-#: git-add--interactive.perl:1358
+#: git-add--interactive.perl:1349
#, perl-format
msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1359
+#: git-add--interactive.perl:1350
#, perl-format
msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1351
#, perl-format
msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
msgstr "暂存该块 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1363
+#: git-add--interactive.perl:1354
#, perl-format
msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1364
+#: git-add--interactive.perl:1355
#, perl-format
msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1365
+#: git-add--interactive.perl:1356
#, perl-format
msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1368
+#: git-add--interactive.perl:1359
#, perl-format
msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1369
+#: git-add--interactive.perl:1360
#, perl-format
msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1370
+#: git-add--interactive.perl:1361
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1373
+#: git-add--interactive.perl:1364
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1374
+#: git-add--interactive.perl:1365
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1375
+#: git-add--interactive.perl:1366
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1378
+#: git-add--interactive.perl:1369
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
msgstr "修改工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1379
+#: git-add--interactive.perl:1370
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1380
+#: git-add--interactive.perl:1371
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1383
+#: git-add--interactive.perl:1374
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "修改索引和工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1384
+#: git-add--interactive.perl:1375
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1385
+#: git-add--interactive.perl:1376
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1388
+#: git-add--interactive.perl:1379
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1389
+#: git-add--interactive.perl:1380
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1381
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1493
+#: git-add--interactive.perl:1484
msgid "go to which hunk (<ret> to see more)? "
msgstr "跳转到哪个块(<回车> 查看更多)? "
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1486
msgid "go to which hunk? "
msgstr "跳转到哪个块?"
-#: git-add--interactive.perl:1504
+#: git-add--interactive.perl:1495
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "无效数字:'%s'\n"
-#: git-add--interactive.perl:1509
+#: git-add--interactive.perl:1500
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "对不起,只有 %d 个可用块。\n"
msgstr[1] "对不起,只有 %d 个可用块。\n"
-#: git-add--interactive.perl:1535
+#: git-add--interactive.perl:1526
msgid "search for regex? "
msgstr "使用正则表达式搜索?"
-#: git-add--interactive.perl:1548
+#: git-add--interactive.perl:1539
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "错误的正则表达式 %s:%s\n"
-#: git-add--interactive.perl:1558
+#: git-add--interactive.perl:1549
msgid "No hunk matches the given pattern\n"
msgstr "没有和给定模式相匹配的快\n"
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1592
+#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
msgid "No previous hunk\n"
msgstr "没有前一个块\n"
-#: git-add--interactive.perl:1579 git-add--interactive.perl:1598
+#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
msgid "No next hunk\n"
msgstr "没有下一个块\n"
-#: git-add--interactive.perl:1606
+#: git-add--interactive.perl:1597
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "拆分为 %d 块。\n"
msgstr[1] "拆分为 %d 块。\n"
-#: git-add--interactive.perl:1658
+#: git-add--interactive.perl:1649
msgid "Review diff"
msgstr "检视 diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1677
+#: git-add--interactive.perl:1668
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"revert - revert staged set of changes back to the HEAD version\n"
"patch - pick hunks and update selectively\n"
-"diff\t - view diff between HEAD and index\n"
+"diff - view diff between HEAD and index\n"
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
@@ -15387,18 +15665,18 @@ msgstr ""
"diff - 显示 HEAD 和索引间差异\n"
"add untracked - 添加未跟踪文件的内容至暂存列表\n"
-#: git-add--interactive.perl:1694 git-add--interactive.perl:1699
-#: git-add--interactive.perl:1702 git-add--interactive.perl:1709
-#: git-add--interactive.perl:1713 git-add--interactive.perl:1719
+#: git-add--interactive.perl:1685 git-add--interactive.perl:1690
+#: git-add--interactive.perl:1693 git-add--interactive.perl:1700
+#: git-add--interactive.perl:1704 git-add--interactive.perl:1710
msgid "missing --"
msgstr "缺失 --"
-#: git-add--interactive.perl:1715
+#: git-add--interactive.perl:1706
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "未知的 --patch 模式:%s"
-#: git-add--interactive.perl:1721 git-add--interactive.perl:1727
+#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "无效的参数 %s,期望是 --"
@@ -15473,7 +15751,8 @@ msgid ""
" * Saying \"./%s\" if you mean a file; or\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除歧义:\n"
+"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
+"歧义:\n"
"\n"
" * 如果含义为一个文件,使用 \"./%s\",或者\n"
" * 如果含义为一个范围,使用 --format-patch 选项。\n"
@@ -15497,7 +15776,10 @@ msgid ""
"\n"
"No patch files specified!\n"
"\n"
-msgstr "\n未指定补丁文件!\n\n"
+msgstr ""
+"\n"
+"未指定补丁文件!\n"
+"\n"
#: git-send-email.perl:658
#, perl-format
@@ -15744,6 +16026,87 @@ msgstr "略过 %s 含备份后缀 '%s'。\n"
msgid "Do you really want to send %s? [y|N]: "
msgstr "您真的要发送 %s?[y|N]:"
+#~ msgid "tag: tagging "
+#~ msgstr "tag: tagging "
+
+#~ msgid "object of unknown type"
+#~ msgstr "未知类型的对象"
+
+#~ msgid "commit object"
+#~ msgstr "提交对象"
+
+#~ msgid "tree object"
+#~ msgstr "树对象"
+
+#~ msgid "blob object"
+#~ msgstr "数据对象"
+
+#~ msgid "other tag object"
+#~ msgstr "其它标签对象"
+
+#~ msgid ""
+#~ "There is nothing to exclude from by :(exclude) patterns.\n"
+#~ "Perhaps you forgot to add either ':/' or '.' ?"
+#~ msgstr ""
+#~ "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
+#~ "添加 ':/' 或 '.' ?"
+
+#~ msgid "unrecognized format: %%(%s)"
+#~ msgstr "未能识别的格式:%%(%s)"
+
+#~ msgid ":strip= requires a positive integer argument"
+#~ msgstr ":strip= 需要一个正整型参数"
+
+#~ msgid "ref '%s' does not have %ld components to :strip"
+#~ msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
+
+#~ msgid "unknown %.*s format %s"
+#~ msgstr "未知的 %.*s 格式 %s"
+
+#~ msgid "[%s: gone]"
+#~ msgstr "[%s: 丢失]"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "[%s: behind %d]"
+#~ msgstr "[%s:落后 %d]"
+
+#~ msgid "[%s: ahead %d]"
+#~ msgstr "[%s:领先 %d]"
+
+#~ msgid "[%s: ahead %d, behind %d]"
+#~ msgstr "[%s:领先 %d,落后 %d]"
+
+#~ msgid " **** invalid ref ****"
+#~ msgstr " **** 无效引用 ****"
+
+#~ msgid "insanely long object directory %.*s"
+#~ msgstr "不正常的长对象目录 %.*s"
+
+#~ msgid "git merge [<options>] <msg> HEAD <commit>"
+#~ msgstr "git merge [<选项>] <说明> HEAD <提交>"
+
+#~ msgid "'%s' is not a commit"
+#~ msgstr "'%s' 不是一个提交"
+
+#~ msgid "cannot open file '%s'"
+#~ msgstr "无法打开文件 '%s'"
+
+#~ msgid "could not close file %s"
+#~ msgstr "无法关闭文件 %s"
+
+#~ msgid "tag name too long: %.*s..."
+#~ msgstr "标签名称太长:%.*s..."
+
+#~ msgid "tag header too big."
+#~ msgstr "标签头信息太大。"
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for discarding"
+#~ msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃"
+
#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
#~ msgstr "使用一个试验性的基于空行的启发式算法改进差异显示"