# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
# This file is distributed under the same license as the Git package.
# Contributors:
+# - Fangyi Zhou <me AT fangyi.io>
# - Jiang Xin <worldhello.net AT gmail.com>
# - Lian Cheng <rhythm.mail AT gmail.com>
# - Ray Chen <oldsharp AT gmail.com>
# commit-ish (also committish) | 提交号
# conflict | 冲突
# core Git | 核心 Git 工具
+# cover letter | 附函
# DAG | 有向无环图
-# dangling object | æ\91\87æ\91\86对象
+# dangling object | æ\82¬ç©º对象
# detached HEAD | 分离头指针
# directory | 目录
# dirty | 脏（的工作区）
# fork | 派生
# Git archive | 仓库（对于 arch 用户）
# gitfile | gitfile（仓库链接文件）
-# grafts | （提交）嫁接
+# grafts | （提交）移植
# hash | 哈希值
# HEAD | HEAD（头指针，亦即当前分支）
# head | 头、分支
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-10-17 09:44+0800\n"
-"PO-Revision-Date: 2017-10-24 09:43+0800\n"
+"POT-Creation-Date: 2019-06-04 08:24+0800\n"
+"PO-Revision-Date: 2019-06-04 09:04+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: advice.c:58
+#: advice.c:103
#, c-format
-msgid "hint: %.*s\n"
-msgstr "提示：%.*s\n"
+msgid "%shint: %.*s%s\n"
+msgstr "%s提示：%.*s%s\n"
-#: advice.c:86
+#: advice.c:156
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "无法拣选，因为您有未合并的文件。"
-#: advice.c:88
+#: advice.c:158
msgid "Committing is not possible because you have unmerged files."
msgstr "无法提交，因为您有未合并的文件。"
-#: advice.c:90
+#: advice.c:160
msgid "Merging is not possible because you have unmerged files."
msgstr "无法合并，因为您有未合并的文件。"
-#: advice.c:92
+#: advice.c:162
msgid "Pulling is not possible because you have unmerged files."
msgstr "无法拉取，因为您有未合并的文件。"
-#: advice.c:94
+#: advice.c:164
msgid "Reverting is not possible because you have unmerged files."
msgstr "无法回退，因为您有未合并的文件。"
-#: advice.c:96
+#: advice.c:166
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "无法 %s，因为您有未合并的文件。"
-#: advice.c:104
+#: advice.c:174
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
"请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"
-#: advice.c:112
+#: advice.c:182
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
-#: advice.c:117 builtin/merge.c:1211
+#: advice.c:187 builtin/merge.c:1320
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
-#: advice.c:119
+#: advice.c:189
msgid "Please, commit your changes before merging."
msgstr "请在合并前先提交您的修改。"
-#: advice.c:120
+#: advice.c:190
msgid "Exiting because of unfinished merge."
msgstr "因为存在未完成的合并而退出。"
-#: advice.c:126
+#: advice.c:196
#, c-format
msgid ""
"Note: checking out '%s'.\n"
"如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在检出命令添加\n"
"参数 -b 来实现（现在或稍后）。例如：\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git checkout -b <新分支名>\n"
"\n"
-#: apply.c:58
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "命令行以 \\ 结尾"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "未关闭的引号"
+
+#: apply.c:63
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "未能识别的空白字符选项 '%s'"
-#: apply.c:74
+#: apply.c:79
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
-#: apply.c:125
+#: apply.c:129
msgid "--reject and --3way cannot be used together."
-msgstr "--reject 和 --3say 不能同时使用。"
+msgstr "--reject 和 --3way 不能同时使用。"
-#: apply.c:127
+#: apply.c:131
msgid "--cached and --3way cannot be used together."
msgstr "--cached 和 --3way 不能同时使用。"
-#: apply.c:130
+#: apply.c:134
msgid "--3way outside a repository"
msgstr "--3way 在一个仓库之外"
-#: apply.c:141
+#: apply.c:145
msgid "--index outside a repository"
msgstr "--index 在一个仓库之外"
-#: apply.c:144
+#: apply.c:148
msgid "--cached outside a repository"
msgstr "--cached 在一个仓库之外"
-#: apply.c:845
+#: apply.c:829
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "无法准备时间戳正则表达式 %s"
-#: apply.c:854
+#: apply.c:838
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d，输入为：%s"
-#: apply.c:928
+#: apply.c:912
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在补丁的第 %d 行找到文件名"
-#: apply.c:966
+#: apply.c:950
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
-#: apply.c:972
+#: apply.c:956
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
-#: apply.c:973
+#: apply.c:957
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
-#: apply.c:978
+#: apply.c:962
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
-#: apply.c:1007
+#: apply.c:991
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "第 %d 行包含无效文件模式：%s"
-#: apply.c:1325
+#: apply.c:1310
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "不一致的文件头，%d 行和 %d 行"
-#: apply.c:1497
+#: apply.c:1482
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount：意外的行：%.*s"
-#: apply.c:1566
+#: apply.c:1551
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补丁片段没有头信息：%.*s"
-#: apply.c:1586
+#: apply.c:1571
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
-#: apply.c:1599
+#: apply.c:1584
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"
-#: apply.c:1787
+#: apply.c:1772
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"
-#: apply.c:1789
+#: apply.c:1774
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"
-#: apply.c:1823
+#: apply.c:1808
#, c-format
msgid "corrupt patch at line %d"
msgstr "补丁在第 %d 行损坏"
-#: apply.c:1860
+#: apply.c:1845
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"
-#: apply.c:1862
+#: apply.c:1847
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"
-#: apply.c:1865
+#: apply.c:1850
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告：文件 %s 成为空文件但并未删除"
-#: apply.c:2012
+#: apply.c:1997
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏：%.*s"
-#: apply.c:2049
+#: apply.c:2034
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
-#: apply.c:2209
+#: apply.c:2196
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
-#: apply.c:2295
+#: apply.c:2282
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
-#: apply.c:2299
+#: apply.c:2286
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
-#: apply.c:2958
+#: apply.c:2945
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符：'%c'"
-#: apply.c:3077
+#: apply.c:3066
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"
-#: apply.c:3089
+#: apply.c:3078
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
-#: apply.c:3095
+#: apply.c:3084
#, c-format
msgid ""
"while searching for:\n"
"当查询：\n"
"%.*s"
-#: apply.c:3117
+#: apply.c:3106
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
-#: apply.c:3125
+#: apply.c:3114
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
-#: apply.c:3171
+#: apply.c:3161
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
-#: apply.c:3181
+#: apply.c:3171
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
-#: apply.c:3189
+#: apply.c:3179
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "补丁应用到空文件 '%s'，但其并非空文件"
-#: apply.c:3207
+#: apply.c:3197
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
-msgstr "æ\97 æ³\95读å\8f\96 '%2$s' å¿\85é¡»的目标文件 %1$s"
+msgstr "æ\97 æ³\95读å\8f\96 '%2$s' å¿\85é\9c\80的目标文件 %1$s"
-#: apply.c:3220
+#: apply.c:3210
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
-#: apply.c:3226
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
-#: apply.c:3247
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败：%s:%ld"
-#: apply.c:3369
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
-#: apply.c:3426
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读取位于符号链接中的 '%s'"
-#: apply.c:3455 apply.c:3695
+#: apply.c:3449 apply.c:3692
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
-#: apply.c:3538 apply.c:3709
+#: apply.c:3535 apply.c:3707
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在于索引中"
-#: apply.c:3547 apply.c:3717
+#: apply.c:3544 apply.c:3715
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不匹配"
-#: apply.c:3582
+#: apply.c:3579
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: apply.c:3585
+#: apply.c:3582
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "回落到三方合并...\n"
-#: apply.c:3601 apply.c:3605
+#: apply.c:3598 apply.c:3602
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "无法读取 '%s' 的当前内容"
-#: apply.c:3617
+#: apply.c:3614
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "无法回落到三方合并...\n"
-#: apply.c:3631
+#: apply.c:3628
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "应用补丁到 '%s' 存在冲突。\n"
-#: apply.c:3636
+#: apply.c:3633
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功应用补丁到 '%s'。\n"
-#: apply.c:3662
+#: apply.c:3659
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
-#: apply.c:3734
+#: apply.c:3732
#, c-format
msgid "%s: wrong type"
msgstr "%s：错误类型"
-#: apply.c:3736
+#: apply.c:3734
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o，应为 %o"
-#: apply.c:3886 apply.c:3888
+#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
-#: apply.c:3944
+#: apply.c:3943
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已经存在于索引中"
-#: apply.c:3947
+#: apply.c:3946
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已经存在于工作区中"
-#: apply.c:3967
+#: apply.c:3966
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
-#: apply.c:3972
+#: apply.c:3971
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
-#: apply.c:3992
+#: apply.c:3991
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
-#: apply.c:3996
+#: apply.c:3995
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：补丁未应用"
-#: apply.c:4011
+#: apply.c:4010
#, c-format
msgid "Checking patch %s..."
-msgstr "检查补丁 %s..."
+msgstr "æ£å\9c¨æ£\80æ\9f¥è¡¥ä¸\81 %s..."
#: apply.c:4102
#, c-format
#: apply.c:4109
#, c-format
msgid "mode change for %s, which is not in current HEAD"
-msgstr "%s 的模式被改变，但它不在当前 HEAD 中"
+msgstr "%s 的模式变更，但它不在当前 HEAD 中"
#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效（%s）。"
-#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
+#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-#: apply.c:4304
+#: apply.c:4303
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
-#: apply.c:4310
+#: apply.c:4309
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"
-#: apply.c:4318
+#: apply.c:4317
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
-#: apply.c:4324 apply.c:4468
+#: apply.c:4323 apply.c:4468
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
-#: apply.c:4365
+#: apply.c:4366
#, c-format
msgid "failed to write to '%s'"
-msgstr "无法写入 '%s'"
+msgstr "写入 '%s' 失败"
-#: apply.c:4369
+#: apply.c:4370
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: apply.c:4439
+#: apply.c:4440
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
-#: apply.c:4537
+#: apply.c:4538
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
-#: apply.c:4545
+#: apply.c:4546
msgid "internal error"
msgstr "内部错误"
-#: apply.c:4548
+#: apply.c:4549
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
-#: apply.c:4559
+#: apply.c:4560
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
+#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
-#: apply.c:4581
+#: apply.c:4582
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
-#: apply.c:4585
+#: apply.c:4586
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
-#: apply.c:4695
+#: apply.c:4696
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"
-#: apply.c:4703
+#: apply.c:4704
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: apply.c:4722
+#: apply.c:4724
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: apply.c:4859
+#: apply.c:4879
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s'：%s"
-#: apply.c:4886
+#: apply.c:4906
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: apply.c:4892 apply.c:4907
+#: apply.c:4912 apply.c:4927
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字符误用。"
msgstr[1] "%d 行新增了空白字符误用。"
-#: apply.c:4900
+#: apply.c:4920
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修复空白错误后，应用了 %d 行。"
msgstr[1] "修复空白错误后，应用了 %d 行。"
-#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
+#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259
-#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187
-#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622
-#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992
-#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212
-#: git-add--interactive.perl:197
+#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
+#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
+#: builtin/pull.c:207 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
+#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
msgid "path"
msgstr "路径"
-#: apply.c:4948
+#: apply.c:4964
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: apply.c:4951
+#: apply.c:4967
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:4953 builtin/am.c:2265
+#: apply.c:4969 builtin/am.c:2219
msgid "num"
msgstr "数字"
-#: apply.c:4954
+#: apply.c:4970
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: apply.c:4957
+#: apply.c:4973
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: apply.c:4959
+#: apply.c:4975
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
-#: apply.c:4963
+#: apply.c:4979
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
-#: apply.c:4965
+#: apply.c:4981
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁，而是显示输入的概要"
-#: apply.c:4967
+#: apply.c:4983
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁，而是查看补丁是否可应用"
-#: apply.c:4969
+#: apply.c:4985
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: apply.c:4971
+#: apply.c:4987
+msgid "mark new files with `git add --intent-to-add`"
+msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
+
+#: apply.c:4989
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: apply.c:4973
+#: apply.c:4991
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
-#: apply.c:4975
+#: apply.c:4994
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
-#: apply.c:4977
+#: apply.c:4996
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三方合并"
-#: apply.c:4979
+#: apply.c:4998
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
+#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: apply.c:4984
+#: apply.c:5003
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
-#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
+#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
+#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
+#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
msgid "action"
msgstr "动作"
-#: apply.c:4986
+#: apply.c:5005
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: apply.c:4989 apply.c:4992
+#: apply.c:5008 apply.c:5011
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: apply.c:4995
+#: apply.c:5014
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: apply.c:4997
+#: apply.c:5016
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: apply.c:4999
+#: apply.c:5018
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: apply.c:5001
+#: apply.c:5020
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21
-#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640
-#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "冗长输出"
-#: apply.c:5004
+#: apply.c:5023
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
-#: apply.c:5007
+#: apply.c:5026
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:5009 builtin/am.c:2253
+#: apply.c:5028 builtin/am.c:2207
msgid "root"
msgstr "根目录"
-#: apply.c:5010
+#: apply.c:5029
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
-#: archive.c:13
+#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<选项>] <树或提交> [<路径>...]"
-#: archive.c:14
+#: archive.c:15
msgid "git archive --list"
msgstr "git archive --list"
-#: archive.c:15
+#: archive.c:16
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
-#: archive.c:16
+#: archive.c:17
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹配任何文件"
-#: archive.c:436
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "无此引用：%.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "不是一个有效的对象名：%s"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "不是一个树对象：%s"
+
+#: archive.c:424
+msgid "current working directory is untracked"
+msgstr "当前工作目录未被跟踪"
+
+#: archive.c:455
msgid "fmt"
msgstr "格式"
-#: archive.c:436
+#: archive.c:455
msgid "archive format"
msgstr "归档格式"
-#: archive.c:437 builtin/log.c:1452
+#: archive.c:456 builtin/log.c:1557
msgid "prefix"
msgstr "前缀"
-#: archive.c:438
+#: archive.c:457
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
-#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859
-#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550
-#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
-#: parse-options.h:153
+#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
+#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "文件"
-#: archive.c:440 builtin/archive.c:89
+#: archive.c:459 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "归档写入此文件"
-#: archive.c:442
+#: archive.c:461
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
-#: archive.c:443
+#: archive.c:462
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
-#: archive.c:444
+#: archive.c:463
msgid "store only"
msgstr "只存储"
-#: archive.c:445
+#: archive.c:464
msgid "compress faster"
msgstr "压缩速度更快"
-#: archive.c:453
+#: archive.c:472
msgid "compress better"
msgstr "压缩效果更好"
-#: archive.c:456
+#: archive.c:475
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
-#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001
+#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
+#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
msgid "repo"
msgstr "仓库"
-#: archive.c:459 builtin/archive.c:91
+#: archive.c:478 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库（<仓库>）提取归档文件"
-#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
+#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr "命令"
-#: archive.c:461 builtin/archive.c:93
+#: archive.c:480 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
-#: archive.c:468
+#: archive.c:487
msgid "Unexpected option --remote"
msgstr "未知参数 --remote"
-#: archive.c:470
+#: archive.c:489
msgid "Option --exec can only be used together with --remote"
msgstr "选项 --exec 只能和 --remote 同时使用"
-#: archive.c:472
+#: archive.c:491
msgid "Unexpected option --output"
msgstr "未知参数 --output"
-#: archive.c:494
+#: archive.c:513
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知归档格式 '%s'"
-#: archive.c:501
+#: archive.c:520
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "参数不支持此格式 '%s'：-%d"
-#: attr.c:218
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "不能打开数据对象 %s"
+
+#: archive-tar.c:260 archive-zip.c:363
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "不支持的文件模式：0%o (SHA1: %s)"
+
+#: archive-tar.c:287 archive-zip.c:353
+#, c-format
+msgid "cannot read %s"
+msgstr "不能读取 %s"
+
+#: archive-tar.c:459
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "无法启动 '%s' 过滤器"
+
+#: archive-tar.c:462
+msgid "unable to redirect descriptor"
+msgstr "无法重定向描述符"
+
+#: archive-tar.c:469
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "'%s' 过滤器报告了错误"
+
+#: archive-zip.c:314
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "路径不是有效的 UTF-8：%s"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "路径太长（%d 字符，SHA1：%s）：%s"
+
+#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
+#, c-format
+msgid "deflate error (%d)"
+msgstr "压缩错误 (%d)"
+
+#: archive-zip.c:609
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "对于本系统时间戳太大：%<PRIuMAX>"
+
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一个有效的属性名"
-#: attr.c:415
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "不允许 %s：%s:%d"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时，使用 '\\!'。"
-#: bisect.c:447
+#: bisect.c:468
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "文件 '%s' 包含错误的引用格式：%s"
-#: bisect.c:655
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找！\n"
-#: bisect.c:708
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"
-#: bisect.c:732
+#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is bad.\n"
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
-#: bisect.c:737
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
-#: bisect.c:742
+#: bisect.c:768
#, c-format
msgid ""
"The merge base %s is %s.\n"
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
-#: bisect.c:750
+#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本？\n"
-#: bisect.c:763
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"
-#: bisect.c:798
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中：合并基线必须是经过测试的\n"
-#: bisect.c:850
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
-#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
-#: bisect.c:918
+#: bisect.c:928 builtin/merge.c:146
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
-#: bisect.c:948
+#: bisect.c:958
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"
-#: bisect.c:968
+#: bisect.c:977
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"
-#: bisect.c:976
+#: bisect.c:985
#, c-format
msgid ""
"No testable commit found.\n"
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数？\n"
-#: bisect.c:995
+#: bisect.c:1004
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1001
+#: bisect.c:1010
#, 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"
msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
-#: blame.c:1757
+#: blame.c:1794
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
-#: blame.c:1768
+#: blame.c:1808
msgid "cannot use --contents with final commit object name"
msgstr "不能将 --contents 和最终的提交对象名共用"
-#: blame.c:1788
+#: blame.c:1829
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
-#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
-#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
-#: builtin/shortlog.c:191
+#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
+#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
+#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415
+#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
+#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
-#: blame.c:1815
+#: blame.c:1856
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
-#: blame.c:1826
+#: blame.c:1867
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中无此路径 %1$s"
-#: blame.c:1837
+#: blame.c:1878
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能为路径 %2$s 读取数据对象 %1$s"
msgid "Not tracking: ambiguous information for ref %s"
msgstr "未跟踪：引用 %s 有歧义"
-#: branch.c:185
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' 不是一个有效的分支名称。"
-#: branch.c:190
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "一个分支名 '%s' 已经存在。"
-#: branch.c:197
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "无法强制更新当前分支。"
-#: branch.c:217
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"
-#: branch.c:219
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "请求的上游分支 '%s' 不存在"
-#: branch.c:221
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
-#: branch.c:264
+#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "不是一个有效的对象名：'%s'。"
-#: branch.c:284
+#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "歧义的对象名：'%s'。"
-#: branch.c:289
+#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "无效的分支点：'%s'。"
-#: branch.c:343
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已经检出到 '%s'"
-#: branch.c:366
+#: branch.c:382
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "工作区 %s 的 HEAD 指向没有被更新"
-#: bundle.c:34
+#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr "'%s' 不像是一个 v2 版本的包文件"
-#: bundle.c:62
+#: bundle.c:64
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"
-#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500
-#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807
-#: sequencer.c:2949 builtin/commit.c:782
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
+#: builtin/commit.c:788
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
-#: bundle.c:140
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的提交："
-#: bundle.c:193
+#: bundle.c:194
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "这个包中含有这个引用："
msgstr[1] "这个包中含有 %d 个引用："
-#: bundle.c:200
+#: bundle.c:201
msgid "The bundle records a complete history."
msgstr "这个包记录一个完整历史。"
-#: bundle.c:202
+#: bundle.c:203
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "这个包需要这个引用："
msgstr[1] "这个包需要 %d 个引用："
-#: bundle.c:261
+#: bundle.c:269
+msgid "unable to dup bundle descriptor"
+msgstr "无法复制 bundle 描述符"
+
+#: bundle.c:276
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"
-#: bundle.c:272
+#: bundle.c:287
msgid "pack-objects died"
msgstr "pack-objects 终止"
-#: bundle.c:314
+#: bundle.c:329
msgid "rev-list died"
msgstr "rev-list 终止"
-#: bundle.c:363
+#: bundle.c:378
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
+#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
-#: bundle.c:461
+#: bundle.c:465
msgid "Refusing to create empty bundle."
msgstr "不能创建空包。"
-#: bundle.c:473
+#: bundle.c:475
#, c-format
msgid "cannot create '%s'"
msgstr "不能创建 '%s'"
-#: bundle.c:501
+#: bundle.c:500
msgid "index-pack died"
msgstr "index-pack 终止"
-#: color.c:301
+#: color.c:296
#, c-format
msgid "invalid color value: %.*s"
msgstr "无效的颜色值：%.*s"
-#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1467 builtin/am.c:2105
+#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
-#: commit.c:43
+#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
-msgstr "%s %s 不是一个提交!"
+msgstr "%s %s 不是一个提交！"
+
+#: commit.c:193
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"对 <GIT_DIR>/info/grafts 的支持已被弃用，并将在\n"
+"未来的Git版本中被移除。\n"
+"\n"
+"请使用 \"git replace --convert-graft-file\" 将\n"
+"grafts 转换为替换引用。\n"
+"\n"
+"设置 \"git config advice.graftFileDeprecated false\"\n"
+"可关闭本消息"
+
+#: commit.c:1128
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
+
+#: commit.c:1131
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
+
+#: commit.c:1134
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "提交 %s 没有 GPG 签名。"
+
+#: commit.c:1137
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-#: commit.c:1517
+#: commit.c:1391
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"
"设置为您项目所用的字符编码。\n"
+#: commit-graph.c:105
+msgid "commit-graph file is too small"
+msgstr "提交图形文件太小"
+
+#: commit-graph.c:170
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "提交图形签名 %X 和签名 %X 不匹配"
+
+#: commit-graph.c:177
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "提交图形版本 %X 和版本 %X 不匹配"
+
+#: commit-graph.c:184
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
+
+#: commit-graph.c:207
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr "提交图形块查找表条目丢失，文件可能不完整"
+
+#: commit-graph.c:218
+#, c-format
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "提交图形不正确的块偏移 %08x%08x"
+
+#: commit-graph.c:255
+#, c-format
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "提交图形块 id %08x 出现了多次"
+
+#: commit-graph.c:390
+#, c-format
+msgid "could not find commit %s"
+msgstr "无法找到提交 %s"
+
+#: commit-graph.c:732 builtin/pack-objects.c:2649
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "无法获得对象 %s 类型"
+
+#: commit-graph.c:765
+msgid "Loading known commits in commit graph"
+msgstr "正在加载提交图中的已知提交"
+
+#: commit-graph.c:781
+msgid "Expanding reachable commits in commit graph"
+msgstr "正在扩展提交图中的可达提交"
+
+#: commit-graph.c:793
+msgid "Clearing commit marks in commit graph"
+msgstr "正在清除提交图中的提交标记"
+
+#: commit-graph.c:813
+msgid "Computing commit graph generation numbers"
+msgstr "正在计算提交图世代数字"
+
+#: commit-graph.c:930
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "正在 %d 个包中查找提交图的提交"
+msgstr[1] "正在 %d 个包中查找提交图的提交"
+
+#: commit-graph.c:943
+#, c-format
+msgid "error adding pack %s"
+msgstr "添加包 %s 出错"
+
+#: commit-graph.c:945
+#, c-format
+msgid "error opening index for %s"
+msgstr "为 %s 打开索引出错"
+
+#: commit-graph.c:959
+#, c-format
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] "正在从 %d 个引用中查找提交图的提交"
+msgstr[1] "正在从 %d 个引用中查找提交图的提交"
+
+#: commit-graph.c:991
+msgid "Finding commits for commit graph among packed objects"
+msgstr "正在打包对象中查找提交图的提交"
+
+#: commit-graph.c:1004
+msgid "Counting distinct commits in commit graph"
+msgstr "正在计算提交图中不同的提交"
+
+#: commit-graph.c:1017
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "提交图格式不能写入 %d 个提交"
+
+#: commit-graph.c:1026
+msgid "Finding extra edges in commit graph"
+msgstr "正在查找提交图中额外的边"
+
+#: commit-graph.c:1050
+msgid "too many commits to write graph"
+msgstr "提交太多不能画图"
+
+#: commit-graph.c:1057 midx.c:819
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "不能为 %s 创建先导目录"
+
+#: commit-graph.c:1097
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "正在用 %d 步写出提交图"
+msgstr[1] "正在用 %d 步写出提交图"
+
+#: commit-graph.c:1162
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr "提交图文件的校验码错误，可能已经损坏"
+
+#: commit-graph.c:1172
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
+
+#: commit-graph.c:1182 commit-graph.c:1197
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
+
+#: commit-graph.c:1189
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "无法从提交图形中解析提交 %s"
+
+#: commit-graph.c:1206
+msgid "Verifying commits in commit graph"
+msgstr "正在校验提交图中的提交"
+
+#: commit-graph.c:1219
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr "无法从提交图形的对象库中解析提交 %s"
+
+#: commit-graph.c:1226
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
+
+#: commit-graph.c:1236
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "提交 %s 的提交图形父提交列表太长了"
+
+#: commit-graph.c:1242
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "%s 的提交图形父提交是 %s != %s"
+
+#: commit-graph.c:1255
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "提交 %s 的提交图形父提交列表过早终止"
+
+#: commit-graph.c:1260
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
+
+#: commit-graph.c:1264
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
+
+#: commit-graph.c:1279
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
+
+#: commit-graph.c:1285
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
+
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "内存耗尽"
-#: config.c:187
+#: config.c:123
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"超过了最大包含深度（%1$d），当从\n"
+"\t%3$s\n"
+"包含\n"
+"\t%2$s\n"
+"这可能是因为循环包含。"
+
+#: config.c:139
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "无法扩展包含路径 '%s'"
+
+#: config.c:150
+msgid "relative config includes must come from files"
+msgstr "相对路径的配置文件引用必须来自于文件"
+
+#: config.c:190
msgid "relative config include conditionals must come from files"
-msgstr "包含相对路径的条件引用必须来自于文件"
+msgstr "相对路径的配置文件条件引用必须来自于文件"
+
+#: config.c:348
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "键名没有包含一个小节名称：%s"
+
+#: config.c:354
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "键名没有包含变量名：%s"
+
+#: config.c:378 sequencer.c:2459
+#, c-format
+msgid "invalid key: %s"
+msgstr "无效键名：%s"
+
+#: config.c:384
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "无效键名（有换行符）：%s"
+
+#: config.c:420 config.c:432
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "伪配置参数：%s"
+
+#: config.c:467
+#, c-format
+msgid "bogus format in %s"
+msgstr "%s 中格式错误"
-#: config.c:721
+#: config.c:793
#, c-format
msgid "bad config line %d in blob %s"
msgstr "数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:725
+#: config.c:797
#, c-format
msgid "bad config line %d in file %s"
msgstr "文件 %2$s 中错误的配置行 %1$d"
-#: config.c:729
+#: config.c:801
#, c-format
msgid "bad config line %d in standard input"
msgstr "标准输入中错误的配置行 %d"
-#: config.c:733
+#: config.c:805
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:737
+#: config.c:809
#, c-format
msgid "bad config line %d in command line %s"
msgstr "命令行 %2$s 中错误的配置行 %1$d"
-#: config.c:741
+#: config.c:813
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中错误的配置行 %1$d"
-#: config.c:869
+#: config.c:952
msgid "out of range"
msgstr "超出范围"
-#: config.c:869
+#: config.c:952
msgid "invalid unit"
msgstr "无效的单位"
-#: config.c:875
+#: config.c:958
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
-#: config.c:880
+#: config.c:963
#, 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:883
+#: config.c:966
#, 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:886
+#: config.c:969
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
-#: config.c:889
+#: config.c:972
#, 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:892
+#: config.c:975
#, 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:895
+#: config.c:978
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:990
+#: config.c:1073
#, c-format
msgid "failed to expand user dir in: '%s'"
-msgstr "无法扩展 '%s' 中的用户目录"
+msgstr "无法扩展用户目录：'%s'"
+
+#: config.c:1082
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
+
+#: config.c:1173
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "缩写长度超出范围：%d"
-#: config.c:1085 config.c:1096
+#: config.c:1187 config.c:1198
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
-#: config.c:1213
+#: config.c:1290
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar 应该是一个字符"
+
+#: config.c:1323
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式：%s"
-#: config.c:1372
+#: config.c:1395
+#, c-format
+msgid "malformed value for %s"
+msgstr "%s 的取值格式错误"
+
+#: config.c:1421
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "%s 的取值格式错误：%s"
+
+#: config.c:1422
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
+
+#: config.c:1483 builtin/pack-objects.c:3397
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
-#: config.c:1568
+#: config.c:1604
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "无法从数据对象 '%s' 加载配置"
+
+#: config.c:1607
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "引用 '%s' 没有指向一个数据对象"
+
+#: config.c:1624
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "不能解析配置对象 '%s'"
+
+#: config.c:1654
+#, c-format
+msgid "failed to parse %s"
+msgstr "解析 %s 失败"
+
+#: config.c:1710
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
-#: config.c:1900
+#: config.c:2059
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
-#: config.c:2087
+#: config.c:2229
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s：'%s'"
-#: config.c:2130
+#: config.c:2272
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"
-#: config.c:2156
+#: config.c:2298
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
-#: config.c:2167
+#: config.c:2344
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
-#: config.c:2169
+#: config.c:2346
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:2228
+#: config.c:2427
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "无效的小节名称 '%s'"
+
+#: config.c:2459
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2571 config.c:2789
+#: config.c:2488
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "写入新的配置文件 %s 失败"
+
+#: config.c:2740 config.c:3064
+#, c-format
+msgid "could not lock config file %s"
+msgstr "不能锁定配置文件 %s"
+
+#: config.c:2751
+#, c-format
+msgid "opening %s"
+msgstr "打开 %s"
+
+#: config.c:2786 builtin/config.c:328
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "无效模式：%s"
+
+#: config.c:2811
+#, c-format
+msgid "invalid config file %s"
+msgstr "无效的配置文件 %s"
+
+#: config.c:2824 config.c:3077
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
-#: config.c:2678
+#: config.c:2835
+#, c-format
+msgid "unable to mmap '%s'"
+msgstr "不能 mmap '%s'"
+
+#: config.c:2844 config.c:3082
+#, c-format
+msgid "chmod on %s failed"
+msgstr "对 %s 调用 chmod 失败"
+
+#: config.c:2929 config.c:3179
+#, c-format
+msgid "could not write config file %s"
+msgstr "不能写入配置文件 %s"
+
+#: config.c:2963
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:2680 builtin/remote.c:776
+#: config.c:2965 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
-#: connect.c:50
-msgid "The remote end hung up upon initial contact"
-msgstr "远端在连接发起时即挂断"
+#: config.c:3055
+#, c-format
+msgid "invalid section name: %s"
+msgstr "无效的小节名称：%s"
+
+#: config.c:3222
+#, c-format
+msgid "missing value for '%s'"
+msgstr "%s 的取值缺失"
+
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
+msgstr "远端在初始连接时即挂断"
-#: connect.c:52
+#: connect.c:63
msgid ""
"Could not read from remote repository.\n"
"\n"
"\n"
"请确认您有正确的访问权限并且仓库存在。"
-#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
-msgid "Checking connectivity"
-msgstr "检查连接中"
-
-#: connected.c:76
-msgid "Could not run 'git rev-list'"
-msgstr "不能执行 'git rev-list'"
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "服务器不支持 '%s'"
-#: connected.c:96
-msgid "failed write to rev-list"
-msgstr "无法写入 rev-list"
+#: connect.c:103
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "服务器不支持特性 '%s'"
-#: connected.c:103
-msgid "failed to close rev-list's stdin"
-msgstr "无法关闭 rev-list 的标准输入"
+#: connect.c:114
+msgid "expected flush after capabilities"
+msgstr "在能力之后应为一个 flush 包"
-#: convert.c:205
+#: connect.c:233
#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory."
-msgstr ""
-"文件 %s 中的 CRLF 将被 LF 替换。\n"
-"在工作区中该文件仍保持原有的换行符。"
+msgid "ignoring capabilities after first line '%s'"
+msgstr "忽略第一行 '%s' 之后的能力字段"
+
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "协议错误：意外的 capabilities^{}"
-#: convert.c:209
+#: connect.c:273
#, c-format
-msgid "CRLF would be replaced by LF in %s."
-msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'"
+
+#: connect.c:275
+msgid "repository on the other end cannot be shallow"
+msgstr "另一端的仓库不能是浅克隆仓库"
+
+#: connect.c:313
+msgid "invalid packet"
+msgstr "无效数据包"
-#: convert.c:215
+#: connect.c:333
#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory."
-msgstr ""
-"文件 %s 中的 LF 将被 CRLF 替换。\n"
-"在工作区中该文件仍保持原有的换行符。"
+msgid "protocol error: unexpected '%s'"
+msgstr "协议错误：意外的 '%s'"
-#: convert.c:219
+#: connect.c:441
#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "æ\96\87件 %s ä¸ç\9a\84 LF å°\86被 CRLF æ\9b¿æ\8d¢"
+msgid "invalid ls-refs response: %s"
+msgstr "æ\97 æ\95\88ç\9a\84 ls-refs å\93\8dåº\94ï¼\9a%s"
-#: date.c:116
-msgid "in the future"
-msgstr "å\9c¨å°\86æ\9d¥"
+#: connect.c:445
+msgid "expected flush after ref listing"
+msgstr "å\9c¨å¼\95ç\94¨å\88\97表ä¹\8bå\90\8eåº\94该æ\9c\89ä¸\80个 flush å\8c\85"
-#: date.c:122
+#: connect.c:544
#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "%<PRIuMAX> 秒钟前"
-msgstr[1] "%<PRIuMAX> 秒钟前"
+msgid "protocol '%s' is not supported"
+msgstr "不支持 '%s' 协议"
-#: date.c:129
+#: connect.c:595
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "无法为 socket 设置 SO_KEEPALIVE"
+
+#: connect.c:635 connect.c:698
#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "%<PRIuMAX> 分钟前"
-msgstr[1] "%<PRIuMAX> 分钟前"
+msgid "Looking up %s ... "
+msgstr "查找 %s ..."
-#: date.c:136
+#: connect.c:639
#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "%<PRIuMAX> 小时前"
-msgstr[1] "%<PRIuMAX> 小时前"
+msgid "unable to look up %s (port %s) (%s)"
+msgstr "无法查找 %s（端口 %s）（%s）"
-#: date.c:143
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:643 connect.c:714
#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "%<PRIuMAX> 天前"
-msgstr[1] "%<PRIuMAX> 天前"
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"完成。\n"
+"连接到 %s（端口 %s）... "
-#: date.c:149
+#: connect.c:665 connect.c:742
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"无法连接到 %s：\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:671 connect.c:748
+msgid "done."
+msgstr "完成。"
+
+#: connect.c:702
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "无法查找 %s（%s）"
+
+#: connect.c:708
+#, c-format
+msgid "unknown port %s"
+msgstr "未知端口 %s"
+
+#: connect.c:845 connect.c:1171
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "已阻止奇怪的主机名 '%s'"
+
+#: connect.c:847
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "已阻止奇怪的端口号 '%s'"
+
+#: connect.c:857
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "不能启动代理 %s"
+
+#: connect.c:924
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"
+
+#: connect.c:1119
+msgid "ssh variant 'simple' does not support -4"
+msgstr "ssh 变体 'simple' 不支持 -4"
+
+#: connect.c:1131
+msgid "ssh variant 'simple' does not support -6"
+msgstr "ssh 变体 'simple' 不支持 -6"
+
+#: connect.c:1148
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "ssh 变体 'simple' 不支持设置端口"
+
+#: connect.c:1260
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "已阻止奇怪的路径名 '%s'"
+
+#: connect.c:1307
+msgid "unable to fork"
+msgstr "无法 fork"
+
+#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
+msgid "Checking connectivity"
+msgstr "正在检查连通性"
+
+#: connected.c:97
+msgid "Could not run 'git rev-list'"
+msgstr "不能执行 'git rev-list'"
+
+#: connected.c:117
+msgid "failed write to rev-list"
+msgstr "写入 rev-list 失败"
+
+#: connected.c:124
+msgid "failed to close rev-list's stdin"
+msgstr "关闭 rev-list 的标准输入失败"
+
+#: convert.c:193
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "非法的 crlf 动作 %d"
+
+#: convert.c:206
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "%s 中的 CRLF 将被 LF 替换"
+
+#: convert.c:208
+#, c-format
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+"%s 中的 CRLF 将被 LF 替换。<\n"
+"在工作区中该文件仍保持原有的换行符。"
+
+#: convert.c:216
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "文件 %s 中的 LF 将被 CRLF 替换"
+
+#: convert.c:218
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+"%s 中的 LF 将被 CRLF 替换。\n"
+"在工作区中该文件仍保持原有的换行符"
+
+#: convert.c:279
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM"
+
+#: convert.c:286
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
+msgstr "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%s 作为工作区编码。"
+
+#: convert.c:304
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM"
+
+#: convert.c:306
+#, c-format
+msgid ""
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
+msgstr ""
+"文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"
+"节序）作为工作区编码。"
+
+#: convert.c:424 convert.c:495
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
+
+#: convert.c:467
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
+
+#: convert.c:673
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "不能 fork 以执行外部过滤器 '%s'"
+
+#: convert.c:693
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "不能将输入传递给外部过滤器 '%s'"
+
+#: convert.c:700
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "外部过滤器 '%s' 失败码 %d"
+
+#: convert.c:735 convert.c:738
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "从外部过滤器 '%s' 读取失败"
+
+#: convert.c:741 convert.c:796
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "外部过滤器 '%s' 失败"
+
+#: convert.c:844
+msgid "unexpected filter type"
+msgstr "意外的过滤类型"
+
+#: convert.c:855
+msgid "path name too long for external filter"
+msgstr "外部过滤器的路径名太长"
+
+#: convert.c:929
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"
+
+#: convert.c:1228
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false 不是有效的工作区编码"
+
+#: convert.c:1398 convert.c:1432
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s：clean 过滤器 '%s' 失败"
+
+#: convert.c:1476
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s：smudge 过滤器 %s 失败"
+
+#: date.c:137
+msgid "in the future"
+msgstr "在将来"
+
+#: date.c:143
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> 秒钟前"
+msgstr[1] "%<PRIuMAX> 秒钟前"
+
+#: date.c:150
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> 分钟前"
+msgstr[1] "%<PRIuMAX> 分钟前"
+
+#: date.c:157
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> 小时前"
+msgstr[1] "%<PRIuMAX> 小时前"
+
+#: date.c:164
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> 天前"
+msgstr[1] "%<PRIuMAX> 天前"
+
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "%<PRIuMAX> 周前"
msgstr[1] "%<PRIuMAX> 周前"
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "%<PRIuMAX> 个月前"
msgstr[1] "%<PRIuMAX> 个月前"
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[1] "%<PRIuMAX> 年"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s %<PRIuMAX> 个月前"
msgstr[1] "%s %<PRIuMAX> 个月前"
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] "%<PRIuMAX> 年前"
msgstr[1] "%<PRIuMAX> 年前"
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr "正在传播数据岛标记"
+
+#: delta-islands.c:290
+#, c-format
+msgid "bad tree object %s"
+msgstr "坏的树对象 %s"
+
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "未能加载 '%s' 的数据岛正则表达式：%s"
+
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 %d 个）"
+
+#: delta-islands.c:466
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "已标记 %d 个数据岛，结束。\n"
+
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
-msgstr "无法读取排序文件 '%s'"
+msgstr "读取排序文件 '%s' 失败"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:544
msgid "Performing inexact rename detection"
msgstr "正在进行非精确的重命名探测"
-#: diff.c:74
-#, c-format
-msgid "option '%s' requires a value"
-msgstr "选项 '%s' 需要一个值"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<选项>] <路径> <路径>"
+
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径"
# 译者：注意保持前导空格
-#: diff.c:152
+#: diff.c:155
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
# 译者：注意保持前导空格
-#: diff.c:157
+#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 参数 '%s'\n"
-#: diff.c:281
+#: diff.c:296
msgid ""
-"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
"'plain'"
-msgstr "代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'"
-#: diff.c:341
+#: diff.c:324
+#, c-format
+msgid ""
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
+msgstr ""
+"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
+"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
+
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"
+
+#: diff.c:405
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
-#: diff.c:398
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:3861
+#: diff.c:4210
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出，停止在 %s"
-#: diff.c:4189
+#: diff.c:4555
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: diff.c:4279
+#: diff.c:4558
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G、-S 和 --find-object 是互斥的"
+
+#: diff.c:4636
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
-#: diff.c:4445
+#: diff.c:4684
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "无效的 --stat 值：%s"
+
+#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
+#: parse-options.c:199 parse-options.c:203
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s 期望一个数字值"
+
+#: diff.c:4721
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: diff.c:4459
+#: diff.c:4806
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "无法解析 --submodule 选项的参数：'%s'"
-
-#: diff.c:5505
-msgid "inexact rename detection was skipped due to too many files."
-msgstr "因为文件太多，略过不严格的重命名检查。"
-
-#: diff.c:5508
-msgid "only found copies from modified paths due to too many files."
-msgstr "因为文件太多，只在修改的路径中查找拷贝。"
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
-#: diff.c:5511
+#: diff.c:4830
#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "ws-error-highlight=%.*s 之后未知的值"
-#: dir.c:1983
-msgid "failed to get kernel name and information"
-msgstr "无法获得内核名称和信息"
-
-#: dir.c:2102
-msgid "Untracked cache is disabled on this system or location."
-msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
-
-#: dir.c:2885 dir.c:2890
+#: diff.c:4844
#, c-format
-msgid "could not create directories for %s"
-msgstr "不能为 %s 创建目录"
+msgid "unable to resolve '%s'"
+msgstr "不能解析 '%s'"
-#: dir.c:2915
+#: diff.c:4894 diff.c:4900
#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
+msgid "%s expects <n>/<m> form"
+msgstr "%s 期望 <n>/<m> 格式"
-#: entry.c:176
-msgid "Filtering content"
-msgstr "过滤内容"
-
-#: entry.c:433
+#: diff.c:4912
#, c-format
-msgid "could not stat file '%s'"
-msgstr "不能对文件 '%s' 调用 stat"
-
-#: fetch-pack.c:252
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack：应为 shallow 列表"
+msgid "%s expects a character, got '%s'"
+msgstr "%s 期望一个字符，得到 '%s'"
-#: fetch-pack.c:264
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
-msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"
-
-#: fetch-pack.c:283 builtin/archive.c:63
+#: diff.c:4933
#, c-format
-msgid "remote error: %s"
-msgstr "远程错误：%s"
+msgid "bad --color-moved argument: %s"
+msgstr "坏的 --color-moved 参数：%s"
-#: fetch-pack.c:284
+#: diff.c:4952
#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "--color-moved-ws 中的无效模式 '%s' "
-#: fetch-pack.c:336
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc 需要 multi_ack_detailed"
+#: diff.c:4992
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-#: fetch-pack.c:422
+#: diff.c:5028 diff.c:5048
#, c-format
-msgid "invalid shallow line: %s"
-msgstr "无效的 shallow 信息：%s"
+msgid "invalid argument to %s"
+msgstr "%s 的参数无效"
-#: fetch-pack.c:428
+#: diff.c:5186
#, c-format
-msgid "invalid unshallow line: %s"
-msgstr "æ\97 æ\95\88ç\9a\84 unshallow ä¿¡æ\81¯ï¼\9a%s"
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "æ\97 æ³\95解æ\9e\90 --submodule é\80\89项ç\9a\84å\8f\82æ\95°ï¼\9a'%s'"
-#: fetch-pack.c:430
+#: diff.c:5242
#, c-format
-msgid "object not found: %s"
-msgstr "对象æ\9cªæ\89¾å\88°ï¼\9a%s"
+msgid "bad --word-diff argument: %s"
+msgstr "å\9d\8fç\9a\84 --word-diff å\8f\82æ\95°ï¼\9a%s"
-#: fetch-pack.c:433
-#, c-format
-msgid "error in object: %s"
-msgstr "对象中出错：%s"
+#: diff.c:5265
+msgid "Diff output format options"
+msgstr "差异输出格式化选项"
-#: fetch-pack.c:435
-#, c-format
-msgid "no shallow found: %s"
-msgstr "未发现 shallow：%s"
+#: diff.c:5267 diff.c:5273
+msgid "generate patch"
+msgstr "生成补丁"
-#: fetch-pack.c:438
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr "应为 shallow/unshallow，却得到 %s"
+#: diff.c:5270 builtin/log.c:167
+msgid "suppress diff output"
+msgstr "不显示差异输出"
-#: fetch-pack.c:477
-#, c-format
-msgid "got %s %d %s"
-msgstr "得到 %s %d %s"
+#: diff.c:5275 diff.c:5389 diff.c:5396
+msgid "<n>"
+msgstr "<n>"
-#: fetch-pack.c:491
-#, c-format
-msgid "invalid commit %s"
-msgstr "无效提交 %s"
+#: diff.c:5276 diff.c:5279
+msgid "generate diffs with <n> lines context"
+msgstr "生成含 <n> 行上下文的差异"
-#: fetch-pack.c:524
-msgid "giving up"
-msgstr "放弃"
+#: diff.c:5281
+msgid "generate the diff in raw format"
+msgstr "生成原始格式的差异"
-#: fetch-pack.c:534 progress.c:242
-msgid "done"
-msgstr "å®\8cæ\88\90"
+#: diff.c:5284
+msgid "synonym for '-p --raw'"
+msgstr "å\92\8c '-p --raw' å\90\8cä¹\89"
-#: fetch-pack.c:546
-#, c-format
-msgid "got %s (%d) %s"
-msgstr "得到 %s (%d) %s"
+#: diff.c:5288
+msgid "synonym for '-p --stat'"
+msgstr "和 '-p --stat' 同义"
-#: fetch-pack.c:592
-#, c-format
-msgid "Marking %s as complete"
-msgstr "标记 %s 为完成"
+#: diff.c:5292
+msgid "machine friendly --stat"
+msgstr "机器友好的 --stat"
-#: fetch-pack.c:776
-#, c-format
-msgid "already have %s (%s)"
-msgstr "已经有 %s（%s）"
+#: diff.c:5295
+msgid "output only the last line of --stat"
+msgstr "只输出 --stat 的最后一行"
-#: fetch-pack.c:814
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack：无法派生 sideband 多路输出"
+#: diff.c:5297 diff.c:5305
+msgid "<param1,param2>..."
+msgstr "<参数1,参数2>..."
-#: fetch-pack.c:822
-msgid "protocol error: bad pack header"
-msgstr "协议错误：坏的包头"
+#: diff.c:5298
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr "输出每个子目录相对变更的分布"
-#: fetch-pack.c:878
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack：无法派生进程 %s"
+#: diff.c:5302
+msgid "synonym for --dirstat=cumulative"
+msgstr "和 --dirstat=cumulative 同义"
-#: fetch-pack.c:894
-#, c-format
-msgid "%s failed"
-msgstr "%s 失败"
+#: diff.c:5306
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "是 --dirstat=files,param1,param2... 的同义词"
-#: fetch-pack.c:896
-msgid "error in sideband demultiplexer"
-msgstr "sideband 多路输出出错"
+#: diff.c:5310
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
-#: fetch-pack.c:923
-msgid "Server does not support shallow clients"
-msgstr "服务器不支持 shalllow 客户端"
+#: diff.c:5313
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "精简摘要，例如创建、重命名和模式变更"
-#: fetch-pack.c:927
-msgid "Server supports multi_ack_detailed"
-msgstr "服务器支持 multi_ack_detailed"
+#: diff.c:5316
+msgid "show only names of changed files"
+msgstr "只显示变更文件的文件名"
-#: fetch-pack.c:930
-msgid "Server supports no-done"
-msgstr "服务器支持 no-done"
+#: diff.c:5319
+msgid "show only names and status of changed files"
+msgstr "只显示变更文件的文件名和状态"
-#: fetch-pack.c:936
-msgid "Server supports multi_ack"
-msgstr "服务器支持 multi_ack"
+#: diff.c:5321
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
-#: fetch-pack.c:940
-msgid "Server supports side-band-64k"
-msgstr "服务器支持 side-band-64k"
+#: diff.c:5322
+msgid "generate diffstat"
+msgstr "生成差异统计（diffstat）"
-#: fetch-pack.c:944
-msgid "Server supports side-band"
-msgstr "服务器支持 side-band"
+#: diff.c:5324 diff.c:5327 diff.c:5330
+msgid "<width>"
+msgstr "<宽度>"
-#: fetch-pack.c:948
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "服务器支持 allow-tip-sha1-in-want"
+#: diff.c:5325
+msgid "generate diffstat with a given width"
+msgstr "使用给定的长度生成差异统计"
-#: fetch-pack.c:952
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "服务器支持 allow-reachable-sha1-in-want"
+#: diff.c:5328
+msgid "generate diffstat with a given name width"
+msgstr "使用给定的文件名长度生成差异统计"
-#: fetch-pack.c:962
-msgid "Server supports ofs-delta"
-msgstr "服务器支持 ofs-delta"
+#: diff.c:5331
+msgid "generate diffstat with a given graph width"
+msgstr "使用给定的图形长度生成差异统计"
-#: fetch-pack.c:969
-#, c-format
-msgid "Server version is %.*s"
-msgstr "服务器版本 %.*s"
+#: diff.c:5333
+msgid "<count>"
+msgstr "<次数>"
-#: fetch-pack.c:975
-msgid "Server does not support --shallow-since"
-msgstr "服务器不支持 --shallow-since"
+#: diff.c:5334
+msgid "generate diffstat with limited lines"
+msgstr "生成有限行数的差异统计"
-#: fetch-pack.c:979
-msgid "Server does not support --shallow-exclude"
-msgstr "服务器不支持 --shallow-exclude"
+#: diff.c:5337
+msgid "generate compact summary in diffstat"
+msgstr "生成差异统计的简洁摘要"
-#: fetch-pack.c:981
-msgid "Server does not support --deepen"
-msgstr "服务器不支持 --deepen"
+#: diff.c:5340
+msgid "output a binary diff that can be applied"
+msgstr "输出一个可以应用的二进制差异"
-#: fetch-pack.c:992
-msgid "no common commits"
-msgstr "没有共同的提交"
+#: diff.c:5343
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr "在 \"index\" 行显示完整的前后对象名称"
-#: fetch-pack.c:1004
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-packï¼\9aè\8e·å\8f\96失败ã\80\82"
+#: diff.c:5345
+msgid "show colored diff"
+msgstr "æ\98¾ç¤ºå¸¦é¢\9cè\89²ç\9a\84å·®å¼\82"
-#: fetch-pack.c:1166
-msgid "no matching remote head"
-msgstr "没有匹配的远程分支"
+#: diff.c:5346
+msgid "<kind>"
+msgstr "<类型>"
-#: fetch-pack.c:1188
-#, c-format
-msgid "no such remote ref %s"
-msgstr "没有这样的远程引用 %s"
+#: diff.c:5347
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
-#: fetch-pack.c:1191
-#, c-format
-msgid "Server does not allow request for unadvertised object %s"
-msgstr "服务器不允许请求未公开的对象 %s"
+#: diff.c:5350
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
+"符"
-#: gpg-interface.c:181
-msgid "gpg failed to sign the data"
-msgstr "gpg 无法为数据签名"
+#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+msgid "<prefix>"
+msgstr "<前缀>"
-#: gpg-interface.c:211
-msgid "could not create temporary file"
-msgstr "不能创建临时文件"
+#: diff.c:5354
+msgid "show the given source prefix instead of \"a/\""
+msgstr "显示给定的源前缀取代 \"a/\""
-#: gpg-interface.c:214
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "无法将分离式签名写入 '%s'"
+#: diff.c:5357
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "显示给定的目标前缀取代 \"b/\""
-#: graph.c:97
-#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
+#: diff.c:5360
+msgid "prepend an additional prefix to every line of output"
+msgstr "输出的每一行附加前缀"
-#: grep.c:1970
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s'：无法读取 %s"
+#: diff.c:5363
+msgid "do not show any source or destination prefix"
+msgstr "不显示任何源和目标前缀"
-#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "对 '%s' 调用 stat 失败"
+#: diff.c:5366
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr "显示指定行数的差异块间的上下文"
-#: grep.c:1998
-#, c-format
-msgid "'%s': short read"
-msgstr "'%s'：读取不完整"
+#: diff.c:5370 diff.c:5375 diff.c:5380
+msgid "<char>"
+msgstr "<字符>"
-#: help.c:179
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "在 '%s' 下可用的 git 命令"
+#: diff.c:5371
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "指定一个字符取代 '+' 来表示新的一行"
-#: help.c:186
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
+#: diff.c:5376
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "指定一个字符取代 '-' 来表示旧的一行"
-#: help.c:217
-msgid "These are common Git commands used in various situations:"
-msgstr "这些是各种场合常见的 Git 命令："
+#: diff.c:5381
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "指定一个字符取代 ' ' 来表示一行上下文"
-#: help.c:281
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
-msgstr ""
-"'%s' 像是一个 git 命令，但却无法运行。\n"
-"可能是 git-%s 受损？"
+#: diff.c:5384
+msgid "Diff rename options"
+msgstr "差异重命名选项"
-#: help.c:336
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "唉呀，您的系统中未发现 Git 命令。"
+#: diff.c:5385
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
-#: help.c:358
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
+#: diff.c:5386
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "将完全重写的变更打破为成对的删除和创建"
-#: help.c:363
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "假定你想要的是 '%s' 并继续。"
+#: diff.c:5390
+msgid "detect renames"
+msgstr "检测重命名"
-#: help.c:368
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
+#: diff.c:5394
+msgid "omit the preimage for deletes"
+msgstr "省略删除操作的差异输出"
-#: help.c:376
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
+#: diff.c:5397
+msgid "detect copies"
+msgstr "检测拷贝"
-#: help.c:380
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-"\n"
-"最相似的命令是"
-msgstr[1] ""
-"\n"
-"最相似的命令是"
+#: diff.c:5401
+msgid "use unmodified files as source to find copies"
+msgstr "使用未修改的文件做为发现拷贝的源"
-#: help.c:395
-msgid "git version [<options>]"
-msgstr "git version [<选项>]"
+#: diff.c:5403
+msgid "disable rename detection"
+msgstr "禁用重命名探测"
-#: help.c:456
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s：%s - %s"
+#: diff.c:5406
+msgid "use empty blobs as rename source"
+msgstr "使用空的数据对象做为重命名的源"
-#: help.c:460
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"您指的是这个么？"
-msgstr[1] ""
-"\n"
-"您指的是这其中的某一个么？"
+#: diff.c:5408
+msgid "continue listing the history of a file beyond renames"
+msgstr "继续列出文件重命名以外的历史记录"
-#: ident.c:342
+#: diff.c:5411
msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-" git config --global user.email \"you@example.com\"\n"
-" git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-"\n"
-"*** 请告诉我你是谁。\n"
-"\n"
-"运行\n"
-"\n"
-" git config --global user.email \"you@example.com\"\n"
-" git config --global user.name \"Your Name\"\n"
-"\n"
-"来设置您账号的缺省身份标识。\n"
-"如果仅在本仓库设置身份标识，则省略 --global 参数。\n"
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
-#: ident.c:366
-msgid "no email was given and auto-detection is disabled"
-msgstr "未提供邮件地址且自动探测被禁用"
+#: diff.c:5413
+msgid "Diff algorithm options"
+msgstr "差异算法选项"
-#: ident.c:371
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr "无法自动探测邮件地址（得到 '%s'）"
+#: diff.c:5415
+msgid "produce the smallest possible diff"
+msgstr "生成尽可能小的差异"
-#: ident.c:381
-msgid "no name was given and auto-detection is disabled"
-msgstr "未提供姓名且自动探测被禁用"
+#: diff.c:5418
+msgid "ignore whitespace when comparing lines"
+msgstr "行比较时忽略空白字符"
-#: ident.c:387
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr "无法自动探测姓名（得到 '%s'）"
+#: diff.c:5421
+msgid "ignore changes in amount of whitespace"
+msgstr "忽略空白字符的变更"
-#: ident.c:395
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr "不允许空的姓名（对于 <%s>）"
+#: diff.c:5424
+msgid "ignore changes in whitespace at EOL"
+msgstr "忽略行尾的空白字符变更"
-#: ident.c:401
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr "姓名中仅包含禁用字符：%s"
+#: diff.c:5427
+msgid "ignore carrier-return at the end of line"
+msgstr "忽略行尾的回车符（CR）"
-#: ident.c:416 builtin/commit.c:616
-#, c-format
-msgid "invalid date format: %s"
-msgstr "无效的日期格式：%s"
+#: diff.c:5430
+msgid "ignore changes whose lines are all blank"
+msgstr "忽略整行都是空白的变更"
-#: lockfile.c:151
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr ""
-"无法创建 '%s.lock'：%s。\n"
-"\n"
-"似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n"
-"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n"
-"可能之前有一个 git 进程在这个仓库中异常退出：\n"
-"手动删除这个文件再继续。"
+#: diff.c:5433
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "启发式转换差异边界以便阅读"
-#: lockfile.c:159
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "不能创建 '%s.lock'：%s"
+#: diff.c:5436
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "使用 \"patience diff\" 算法生成差异"
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "无法读取缓存"
+#: diff.c:5440
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "使用 \"histogram diff\" 算法生成差异"
-#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
-#: builtin/checkout.c:595 builtin/clone.c:754
-msgid "unable to write new index file"
-msgstr "无法写新的索引文件"
+#: diff.c:5442
+msgid "<algorithm>"
+msgstr "<算法>"
-#: merge-recursive.c:235
-msgid "(bad commit)\n"
-msgstr "（坏提交）\n"
+#: diff.c:5443
+msgid "choose a diff algorithm"
+msgstr "选择一个差异算法"
-#: merge-recursive.c:257 merge-recursive.c:265
-#, c-format
-msgid "addinfo_cache failed for path '%s'"
-msgstr "为路径 '%s' addinfo_cache 失败"
+#: diff.c:5445
+msgid "<text>"
+msgstr "<文本>"
-#: merge-recursive.c:329
-msgid "error building trees"
-msgstr "无法创建树"
+#: diff.c:5446
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "使用 \"anchored diff\" 算法生成差异"
-#: merge-recursive.c:752
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "无法创建路径 '%s'%s"
+#: diff.c:5448 diff.c:5457 diff.c:5460
+msgid "<mode>"
+msgstr "<模式>"
-#: merge-recursive.c:763
-#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "删除 %s 以便为子目录留出空间\n"
+#: diff.c:5449
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
-#: merge-recursive.c:777 merge-recursive.c:796
-msgid ": perhaps a D/F conflict?"
-msgstr "：可能是一个目录/文件冲突？"
+#: diff.c:5451 diff.c:5454 diff.c:5499
+msgid "<regex>"
+msgstr "<正则>"
-#: merge-recursive.c:786
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
+#: diff.c:5452
+msgid "use <regex> to decide what a word is"
+msgstr "使用 <正则表达式> 确定何为一个词"
-#: merge-recursive.c:828 builtin/cat-file.c:37
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "不能读取对象 %s '%s'"
+#: diff.c:5455
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
-#: merge-recursive.c:830
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "%s '%s' 应为数据对象"
+#: diff.c:5458
+msgid "moved lines of code are colored differently"
+msgstr "移动的代码行用不同方式着色"
-#: merge-recursive.c:854
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "无法打开 '%s'：%s"
+#: diff.c:5461
+msgid "how white spaces are ignored in --color-moved"
+msgstr "在 --color-moved 下如何忽略空白字符"
-#: merge-recursive.c:865
-#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "无法创建符号链接 '%s'：%s"
+#: diff.c:5464
+msgid "Other diff options"
+msgstr "其它差异选项"
-#: merge-recursive.c:870
-#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "不知道如何处理 %06o %s '%s'"
+#: diff.c:5466
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
-#: merge-recursive.c:1010
-msgid "Failed to execute internal merge"
-msgstr "æ\97 æ³\95æ\89§è¡\8cå\86\85é\83¨å\90\88并"
+#: diff.c:5470
+msgid "treat all files as text"
+msgstr "æ\8a\8aæ\89\80æ\9c\89æ\96\87件å½\93å\81\9aæ\96\87æ\9c¬å¤\84ç\90\86"
-#: merge-recursive.c:1014
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "不能添加 %s 至对象库"
+#: diff.c:5472
+msgid "swap two inputs, reverse the diff"
+msgstr "交换两个输入，反转差异"
-#: merge-recursive.c:1117
-#, 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 版"
-"本被保留。"
+#: diff.c:5474
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "有差异时退出码为 1，否则为 0"
-#: merge-recursive.c:1122
-#, 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 版本被保留。"
+#: diff.c:5476
+msgid "disable all output of the program"
+msgstr "禁用本程序的所有输出"
-#: merge-recursive.c:1129
-#, c-format
+#: diff.c:5478
+msgid "allow an external diff helper to be executed"
+msgstr "允许执行一个外置的差异助手"
+
+#: diff.c:5480
+msgid "run external text conversion filters when comparing binary files"
+msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
+
+#: diff.c:5482
+msgid "<when>"
+msgstr "<何时>"
+
+#: diff.c:5483
+msgid "ignore changes to submodules in the diff generation"
+msgstr "在生成差异时，忽略子模组的更改"
+
+#: diff.c:5486
+msgid "<format>"
+msgstr "<格式>"
+
+#: diff.c:5487
+msgid "specify how differences in submodules are shown"
+msgstr "指定子模组的差异如何显示"
+
+#: diff.c:5491
+msgid "hide 'git add -N' entries from the index"
+msgstr "隐藏索引中 'git add -N' 条目"
+
+#: diff.c:5494
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "将索引中 'git add -N' 条目当做真实的"
+
+#: diff.c:5496
+msgid "<string>"
+msgstr "<字符串>"
+
+#: diff.c:5497
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 中。"
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr "查找改变了指定字符串出现次数的差异"
-#: merge-recursive.c:1134
-#, c-format
+#: diff.c:5500
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 中。"
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr "查找改变指定正则匹配出现次数的差异"
-#: merge-recursive.c:1168
-msgid "rename"
-msgstr "重命名"
+#: diff.c:5503
+msgid "show all changes in the changeset with -S or -G"
+msgstr "显示使用 -S 或 -G 的变更集的所有变更"
-#: merge-recursive.c:1168
-msgid "renamed"
-msgstr "重命名"
+#: diff.c:5506
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
-#: merge-recursive.c:1225
-#, c-format
-msgid "%s is a directory in %s adding as %s instead"
-msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
+#: diff.c:5509
+msgid "control the order in which files appear in the output"
+msgstr "控制输出中的文件显示顺序"
-#: merge-recursive.c:1250
-#, c-format
+#: diff.c:5510
+msgid "<object-id>"
+msgstr "<对象 ID>"
+
+#: diff.c:5511
msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
-msgstr ""
-"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
-"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr "查找改变指定对象出现次数的差异"
-#: merge-recursive.c:1255
-msgid " (left unresolved)"
-msgstr "（留下未解决）"
+#: diff.c:5513
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: merge-recursive.c:1317
-#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
-msgstr ""
-"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
-"%5$s"
+#: diff.c:5514
+msgid "select files by diff type"
+msgstr "通过差异类型选择文件"
-#: merge-recursive.c:1350
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"
+#: diff.c:5516
+msgid "<file>"
+msgstr "<文件>"
-#: merge-recursive.c:1553
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
+#: diff.c:5517
+msgid "Output to a specific file"
+msgstr "输出到一个指定的文件"
-#: merge-recursive.c:1568
-#, c-format
-msgid "Adding merged %s"
-msgstr "添加合并后的 %s"
+#: diff.c:6150
+msgid "inexact rename detection was skipped due to too many files."
+msgstr "因为文件太多，略过不严格的重命名检查。"
-#: merge-recursive.c:1575 merge-recursive.c:1805
-#, c-format
-msgid "Adding as %s instead"
-msgstr "而是以 %s 为名添加"
+#: diff.c:6153
+msgid "only found copies from modified paths due to too many files."
+msgstr "因为文件太多，只在修改的路径中查找拷贝。"
-#: merge-recursive.c:1632
+#: diff.c:6156
#, c-format
-msgid "cannot read object %s"
-msgstr "不能读取对象 %s"
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
-#: merge-recursive.c:1635
+#: dir.c:537
#, c-format
-msgid "object %s is not a blob"
-msgstr "对象 %s 不是一个数据对象"
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
-#: merge-recursive.c:1704
-msgid "modify"
-msgstr "修改"
+#: dir.c:926
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "不能将 %s 用作排除文件"
-#: merge-recursive.c:1704
-msgid "modified"
-msgstr "修改"
+#: dir.c:1843
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "不能打开目录 '%s'"
-#: merge-recursive.c:1714
-msgid "content"
-msgstr "内容"
+#: dir.c:2085
+msgid "failed to get kernel name and information"
+msgstr "无法获得内核名称和信息"
-#: merge-recursive.c:1721
-msgid "add/add"
-msgstr "添加/添加"
+#: dir.c:2209
+msgid "untracked cache is disabled on this system or location"
+msgstr "缓存未跟踪文件在本系统或位置中被禁用"
-#: merge-recursive.c:1757
+#: dir.c:3013
#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "略过 %s（已经做过相同合并）"
+msgid "index file corrupt in repo %s"
+msgstr "仓库 %s 中的索引文件损坏"
-#: merge-recursive.c:1771
+#: dir.c:3058 dir.c:3063
#, c-format
-msgid "Auto-merging %s"
-msgstr "自动合并 %s"
-
-#: merge-recursive.c:1775 git-submodule.sh:944
-msgid "submodule"
-msgstr "子模组"
+msgid "could not create directories for %s"
+msgstr "不能为 %s 创建目录"
-#: merge-recursive.c:1776
+#: dir.c:3092
#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "冲突（%s）：合并冲突于 %s"
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
-#: merge-recursive.c:1870
+#: editor.c:73
#, c-format
-msgid "Removing %s"
-msgstr "删除 %s"
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "提示：等待您的编辑器关闭文件...%c"
-#: merge-recursive.c:1896
-msgid "file/directory"
-msgstr "文件/目录"
-
-#: merge-recursive.c:1902
-msgid "directory/file"
-msgstr "目录/文件"
+#: entry.c:178
+msgid "Filtering content"
+msgstr "过滤内容"
-#: merge-recursive.c:1908
+#: entry.c:476
#, 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"
+msgid "could not stat file '%s'"
+msgstr "不能对文件 '%s' 调用 stat"
-#: merge-recursive.c:1917
+#: environment.c:150
#, c-format
-msgid "Adding %s"
-msgstr "添加 %s"
+msgid "bad git namespace path \"%s\""
+msgstr "错误的 git 名字空间路径 \"%s\""
-#: merge-recursive.c:1954
-msgid "Already up to date!"
-msgstr "已经是最新的！"
+#: environment.c:332
+#, c-format
+msgid "could not set GIT_DIR to '%s'"
+msgstr "不能设置 GIT_DIR 为 '%s'"
-#: merge-recursive.c:1963
+#: exec-cmd.c:363
#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "æ\97 æ³\95å\90\88并æ \91 %s å\92\8c %s"
+msgid "too many args to run %s"
+msgstr "æ\89§è¡\8c %s ç\9a\84å\8f\82æ\95°å¤ªå¤\9a"
-#: merge-recursive.c:2060
-msgid "Merging:"
-msgstr "合并："
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr "远程未设置 URL"
-#: merge-recursive.c:2073
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] "发现 %u 个共同祖先："
-msgstr[1] "发现 %u 个共同祖先："
+#: fetch-pack.c:151
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack：应为 shallow 列表"
-#: merge-recursive.c:2112
-msgid "merge returned no commit"
-msgstr "合并未返回提交"
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"
+
+#: fetch-pack.c:165
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"
-#: merge-recursive.c:2175
+#: fetch-pack.c:185
#, c-format
-msgid "Could not parse object '%s'"
-msgstr "不能解析对象 '%s'"
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
-msgid "Unable to write index."
-msgstr "不能写入索引。"
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr "无法写到远程"
-#: notes-merge.c:272
-#, c-format
-msgid ""
-"You have not concluded your previous notes merge (%s exists).\n"
-"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
-"commit/abort the previous merge before you start a new notes merge."
-msgstr ""
-"您的前一次注释合并尚未结束（存在 %s）。\n"
-"在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "
-"notes merge --abort' 来提交/终止前一次合并。"
+#: fetch-pack.c:258
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: notes-merge.c:279
+#: fetch-pack.c:360 fetch-pack.c:1271
#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr "您尚未结束注释合并（存在 %s）。"
-
-#: notes-utils.c:42
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "不能提交未初始化/未引用的注解树"
+msgid "invalid shallow line: %s"
+msgstr "无效的 shallow 信息：%s"
-#: notes-utils.c:101
+#: fetch-pack.c:366 fetch-pack.c:1277
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "坏的 notes.rewriteMode 值：'%s'"
+msgid "invalid unshallow line: %s"
+msgstr "无效的 unshallow 信息：%s"
-#: notes-utils.c:111
+#: fetch-pack.c:368 fetch-pack.c:1279
#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
+msgid "object not found: %s"
+msgstr "对象未找到：%s"
-#. TRANSLATORS: The first %s is the name of
-#. the environment variable, the second %s is
-#. its value.
-#.
-#: notes-utils.c:141
+#: fetch-pack.c:371 fetch-pack.c:1282
#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "å\9d\8fç\9a\84 %s å\80¼ï¼\9a'%s'"
+msgid "error in object: %s"
+msgstr "对象ä¸å\87ºé\94\99ï¼\9a%s"
-#: object.c:239
+#: fetch-pack.c:373 fetch-pack.c:1284
#, c-format
-msgid "unable to parse object: %s"
-msgstr "不能解析对象：%s"
+msgid "no shallow found: %s"
+msgstr "未发现 shallow：%s"
-#: packfile.c:556
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
+#: fetch-pack.c:376 fetch-pack.c:1288
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "应为 shallow/unshallow，却得到 %s"
-#: packfile.c:1683
+#: fetch-pack.c:417
#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "å\81\8f移é\87\8få\9c¨ %s ç\9a\84å\8c\85ç´¢å¼\95å¼\80å§\8bä¹\8bå\89\8dï¼\88æ\8d\9få\9d\8fç\9a\84ç´¢å¼\95ï¼\9fï¼\89"
+msgid "got %s %d %s"
+msgstr "å¾\97å\88° %s %d %s"
-#: packfile.c:1687
+#: fetch-pack.c:434
#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
+msgid "invalid commit %s"
+msgstr "无效提交 %s"
-#: parse-options.c:573
-msgid "..."
-msgstr "..."
+#: fetch-pack.c:465
+msgid "giving up"
+msgstr "放弃"
+
+#: fetch-pack.c:477 progress.c:284
+msgid "done"
+msgstr "完成"
-#: parse-options.c:592
+#: fetch-pack.c:489
#, c-format
-msgid "usage: %s"
-msgstr "用法：%s"
+msgid "got %s (%d) %s"
+msgstr "得到 %s (%d) %s"
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:598
+#: fetch-pack.c:535
#, c-format
-msgid " or: %s"
-msgstr " 或：%s"
+msgid "Marking %s as complete"
+msgstr "标记 %s 为完成"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:601
+#: fetch-pack.c:744
#, c-format
-msgid " %s"
-msgstr " %s"
+msgid "already have %s (%s)"
+msgstr "已经有 %s（%s）"
-#: parse-options.c:640
-msgid "-NUM"
-msgstr "-数字"
+#: fetch-pack.c:783
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack：无法派生 sideband 多路输出"
+
+#: fetch-pack.c:791
+msgid "protocol error: bad pack header"
+msgstr "协议错误：坏的包头"
-#: parse-options-cb.c:108
+#: fetch-pack.c:859
#, c-format
-msgid "malformed object name '%s'"
-msgstr "非法的对象名 '%s'"
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack：无法派生进程 %s"
-#: path.c:891
+#: fetch-pack.c:875
#, c-format
-msgid "Could not make %s writable by group"
-msgstr "不能设置 %s 为组可写"
+msgid "%s failed"
+msgstr "%s 失败"
-#: pathspec.c:129
-msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
+#: fetch-pack.c:877
+msgid "error in sideband demultiplexer"
+msgstr "sideband 多路输出出错"
-#: pathspec.c:147
-msgid "Only one 'attr:' specification is allowed."
-msgstr "只允许一个 'attr:' 规格。"
+#: fetch-pack.c:906
+msgid "Server does not support shallow clients"
+msgstr "服务器不支持 shalllow 客户端"
-#: pathspec.c:150
-msgid "attr spec must not be empty"
-msgstr "属性规格不能为空"
+#: fetch-pack.c:910
+msgid "Server supports multi_ack_detailed"
+msgstr "服务器支持 multi_ack_detailed"
-#: pathspec.c:193
-#, c-format
-msgid "invalid attribute name %s"
-msgstr "无效的属性名 %s"
+#: fetch-pack.c:913
+msgid "Server supports no-done"
+msgstr "服务器支持 no-done"
-#: pathspec.c:258
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
+#: fetch-pack.c:919
+msgid "Server supports multi_ack"
+msgstr "服务器支持 multi_ack"
-#: pathspec.c:265
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
+#: fetch-pack.c:923
+msgid "Server supports side-band-64k"
+msgstr "服务器支持 side-band-64k"
-#: pathspec.c:305
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "路径规格包含无效的神奇前缀"
+#: fetch-pack.c:927
+msgid "Server supports side-band"
+msgstr "服务器支持 side-band"
-#: pathspec.c:326
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
+#: fetch-pack.c:931
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "服务器支持 allow-tip-sha1-in-want"
-#: pathspec.c:331
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
+#: fetch-pack.c:935
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "服务器支持 allow-reachable-sha1-in-want"
+
+#: fetch-pack.c:945
+msgid "Server supports ofs-delta"
+msgstr "服务器支持 ofs-delta"
-#: pathspec.c:369
+#: fetch-pack.c:951 fetch-pack.c:1144
+msgid "Server supports filter"
+msgstr "服务器支持 filter"
+
+#: fetch-pack.c:959
#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
+msgid "Server version is %.*s"
+msgstr "服务器版本 %.*s"
+
+#: fetch-pack.c:965
+msgid "Server does not support --shallow-since"
+msgstr "服务器不支持 --shallow-since"
+
+#: fetch-pack.c:969
+msgid "Server does not support --shallow-exclude"
+msgstr "服务器不支持 --shallow-exclude"
+
+#: fetch-pack.c:971
+msgid "Server does not support --deepen"
+msgstr "服务器不支持 --deepen"
+
+#: fetch-pack.c:988
+msgid "no common commits"
+msgstr "没有共同的提交"
+
+#: fetch-pack.c:1000 fetch-pack.c:1449
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack：获取失败。"
+
+#: fetch-pack.c:1138
+msgid "Server does not support shallow requests"
+msgstr "服务器不支持 shalllow 请求"
-#: pathspec.c:428
+#: fetch-pack.c:1171
+msgid "unable to write request to remote"
+msgstr "无法将请求写到远程"
+
+#: fetch-pack.c:1189
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s：'literal' 和 'glob' 不兼容"
+msgid "error reading section header '%s'"
+msgstr "读取节标题 '%s' 出错"
-#: pathspec.c:441
+#: fetch-pack.c:1195
#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s：'%s' 在仓库之外"
+msgid "expected '%s', received '%s'"
+msgstr "预期 '%s'，得到 '%s'"
-#: pathspec.c:515
+#: fetch-pack.c:1234
#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr "'%s'（助记符：'%c'）"
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "意外的确认行：'%s'"
-#: pathspec.c:525
+#: fetch-pack.c:1239
#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
+msgid "error processing acks: %d"
+msgstr "处理 ack 出错：%d"
-#: pathspec.c:571
-msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please "
-"use . instead if you meant to match all paths"
-msgstr ""
-"在下一个版本中，使用空字符串作为路径规格将被视作非法。如果要匹配所有路径，\n"
-"请代之以 ."
+#: fetch-pack.c:1249
+msgid "expected packfile to be sent after 'ready'"
+msgstr "预期在 'ready' 之后发送 packfile"
+
+#: fetch-pack.c:1251
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr "在没有 'ready' 不应该发送其它小节"
-#: pathspec.c:595
+#: fetch-pack.c:1293
#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "路径规格 '%s' 位于符号链接中"
+msgid "error processing shallow info: %d"
+msgstr "处理浅克隆信息出错：%d"
-#: pretty.c:962
-msgid "unable to parse --pretty format"
-msgstr "不能解析 --pretty 格式"
+#: fetch-pack.c:1340
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "预期 wanted-ref，得到 '%s'"
-#: read-cache.c:1443
+#: fetch-pack.c:1345
#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"设置了 index.version，但是取值无效。\n"
-"使用版本 %i"
+msgid "unexpected wanted-ref: '%s'"
+msgstr "意外的 wanted-ref：'%s'"
-#: read-cache.c:1453
+#: fetch-pack.c:1350
#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
-"使用版本 %i"
+msgid "error processing wanted refs: %d"
+msgstr "处理要获取的引用出错：%d"
-#: read-cache.c:2316 builtin/merge.c:1046
-#, c-format
-msgid "could not close '%s'"
-msgstr "不能关闭 '%s'"
+#: fetch-pack.c:1676
+msgid "no matching remote head"
+msgstr "没有匹配的远程分支"
-#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
-#, c-format
-msgid "could not stat '%s'"
-msgstr "不能对 '%s' 调用 stat"
+#: fetch-pack.c:1699 builtin/clone.c:673
+msgid "remote did not send all necessary objects"
+msgstr "远程没有发送所有必需的对象"
-#: read-cache.c:2407
+#: fetch-pack.c:1726
#, c-format
-msgid "unable to open git dir: %s"
-msgstr "不能打开 git 目录：%s"
+msgid "no such remote ref %s"
+msgstr "没有这样的远程引用 %s"
-#: read-cache.c:2419
+#: fetch-pack.c:1729
#, c-format
-msgid "unable to unlink: %s"
-msgstr "æ\97 æ³\95å\88 é\99¤ï¼\9a%s"
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "æ\9c\8då\8a¡å\99¨ä¸\8då\85\81许请æ±\82æ\9cªå\85¬å¼\80ç\9a\84对象 %s"
-#: refs.c:638
-#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "无法打开 '%s' 进行写入"
+#: gpg-interface.c:318
+msgid "gpg failed to sign the data"
+msgstr "gpg 无法为数据签名"
-#: refs.c:1792
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "在隔离环境中禁止更新引用"
+#: gpg-interface.c:344
+msgid "could not create temporary file"
+msgstr "不能创建临时文件"
-#: refs/files-backend.c:1136
+#: gpg-interface.c:347
#, c-format
-msgid "could not remove reference %s"
-msgstr "æ\97 æ³\95å\88 é\99¤å¼\95ç\94¨ %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "æ\97 æ³\95å°\86å\88\86离å¼\8fç¾å\90\8då\86\99å\85¥ '%s'"
-#: refs/files-backend.c:1150 refs/packed-backend.c:1430
-#: refs/packed-backend.c:1440
+#: graph.c:97
#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "无法删除引用 %s：%s"
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
-#: refs/files-backend.c:1153 refs/packed-backend.c:1443
+#: grep.c:2113
#, c-format
-msgid "could not delete references: %s"
-msgstr "无法删除引用：%s"
-
-#: ref-filter.c:35 wt-status.c:1811
-msgid "gone"
-msgstr "丢失"
+msgid "'%s': unable to read %s"
+msgstr "'%s'：无法读取 %s"
-#: ref-filter.c:36
+#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
-msgid "ahead %d"
-msgstr "领先 %d"
+msgid "failed to stat '%s'"
+msgstr "对 '%s' 调用 stat 失败"
-#: ref-filter.c:37
+#: grep.c:2141
#, c-format
-msgid "behind %d"
-msgstr "落后 %d"
+msgid "'%s': short read"
+msgstr "'%s'：读取不完整"
-#: ref-filter.c:38
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr "领先 %d，落后 %d"
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
+msgstr "开始一个工作区（参见：git help tutorial）"
-#: ref-filter.c:105
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "期望的格式：%%(color:<color>)"
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
+msgstr "在当前变更上工作（参见：git help everyday）"
-#: ref-filter.c:107
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "未能识别的颜色：%%(color:%s)"
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "检查历史和状态（参见：git help revisions）"
-#: ref-filter.c:127
-#, c-format
-msgid "Integer value expected refname:lstrip=%s"
-msgstr "期望整数值 refname:lstrip=%s"
+#: help.c:26
+msgid "grow, mark and tweak your common history"
+msgstr "扩展、标记和调校您的历史记录"
-#: ref-filter.c:131
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr "期望整数值 refname:rstrip=%s"
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
+msgstr "协同（参见：git help workflows）"
-#: ref-filter.c:133
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr "未能识别的 %%(%s) 参数：%s"
+#: help.c:31
+msgid "Main Porcelain Commands"
+msgstr "主要的上层命令"
-#: ref-filter.c:173
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) 不带参数"
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
+msgstr "辅助命令/操作者"
-#: ref-filter.c:180
-#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) 不带参数"
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
+msgstr "辅助命令/询问者"
-#: ref-filter.c:198
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr "未知的 %%(trailers) 参数：%s"
+#: help.c:34
+msgid "Interacting with Others"
+msgstr "与其它系统交互"
-#: ref-filter.c:221
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "期望一个正数 contents:lines=%s"
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr "低级命令/操作者"
-#: ref-filter.c:223
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "未能识别的 %%(contents) 参数：%s"
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr "低级命令/询问者"
-#: ref-filter.c:236
-#, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "期望一个正数 objectname:short=%s"
+#: help.c:37
+msgid "Low-level Commands / Synching Repositories"
+msgstr "低级命令/同步仓库"
-#: ref-filter.c:240
-#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "未能识别的 %%(objectname) 参数：%s"
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr "低级命令/内部助手"
-#: ref-filter.c:267
+#: help.c:298
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "期望的格式：%%(align:<width>,<position>)"
+msgid "available git commands in '%s'"
+msgstr "在 '%s' 下可用的 git 命令"
-#: ref-filter.c:279
-#, c-format
-msgid "unrecognized position:%s"
-msgstr "未能识别的位置：%s"
+#: help.c:305
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
-#: ref-filter.c:283
-#, c-format
-msgid "unrecognized width:%s"
-msgstr "未能识别的宽度：%s"
+#: help.c:314
+msgid "These are common Git commands used in various situations:"
+msgstr "这些是各种场合常见的 Git 命令："
-#: ref-filter.c:289
+#: help.c:363 git.c:97
#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "未能识别的 %%(align) 参数：%s"
+msgid "unsupported command listing type '%s'"
+msgstr "不支持的命令列表类型 '%s'"
-#: ref-filter.c:293
-#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "元素 %%(align) 需要一个正数的宽度"
+#: help.c:403
+msgid "The common Git guides are:"
+msgstr "最常用的 Git 向导有："
-#: ref-filter.c:308
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "未能识别的 %%(if) 参数：%s"
+#: help.c:512
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "执行 'git help <command>' 来查看特定子命令"
-#: ref-filter.c:398
-#, c-format
-msgid "malformed field name: %.*s"
-msgstr "非法的字段名：%.*s"
+#: help.c:517
+msgid "External commands"
+msgstr "外部命令"
-#: ref-filter.c:424
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr "未知的字段名：%.*s"
+#: help.c:532
+msgid "Command aliases"
+msgstr "命令别名"
-#: ref-filter.c:536
+#: help.c:596
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"'%s' 像是一个 git 命令，但却无法运行。\n"
+"可能是 git-%s 受损？"
-#: ref-filter.c:596
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
+#: help.c:655
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "唉呀，您的系统中未发现 Git 命令。"
-#: ref-filter.c:598
+#: help.c:677
#, c-format
-msgid "format: %%(then) atom used more than once"
-msgstr "格式：%%(then) 元素用了多次"
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
-#: ref-filter.c:600
+#: help.c:682
#, c-format
-msgid "format: %%(then) atom used after %%(else)"
-msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "假定你想要的是 '%s' 并继续。"
-#: ref-filter.c:626
+#: help.c:687
#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
-#: ref-filter.c:628
+#: help.c:695
#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
-#: ref-filter.c:630
-#, c-format
-msgid "format: %%(else) atom used more than once"
-msgstr "格式：%%(else) 元素用了多次"
+#: help.c:699
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"最相似的命令是"
+msgstr[1] ""
+"\n"
+"最相似的命令是"
-#: ref-filter.c:643
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
+#: help.c:714
+msgid "git version [<options>]"
+msgstr "git version [<选项>]"
-#: ref-filter.c:698
+#: help.c:782
#, c-format
-msgid "malformed format string %s"
-msgstr "非法的格式化字符串 %s"
+msgid "%s: %s - %s"
+msgstr "%s：%s - %s"
+
+#: help.c:786
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"您指的是这个么？"
+msgstr[1] ""
+"\n"
+"您指的是这其中的某一个么？"
+
+#: ident.c:349
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** 请告诉我你是谁。\n"
+"\n"
+"运行\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Your Name\"\n"
+"\n"
+"来设置您账号的缺省身份标识。\n"
+"如果仅在本仓库设置身份标识，则省略 --global 参数。\n"
+
+#: ident.c:379
+msgid "no email was given and auto-detection is disabled"
+msgstr "未提供邮件地址且自动探测被禁用"
-#: ref-filter.c:1283
+#: ident.c:384
#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "（非分支，正变基 %s）"
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "无法自动探测邮件地址（得到 '%s'）"
+
+#: ident.c:401
+msgid "no name was given and auto-detection is disabled"
+msgstr "未提供姓名且自动探测被禁用"
-#: ref-filter.c:1286
+#: ident.c:407
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "（非分支，二分查找开始于 %s）"
+msgid "unable to auto-detect name (got '%s')"
+msgstr "无法自动探测姓名（得到 '%s'）"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1294
+#: ident.c:415
#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "（头指针分离于 %s）"
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "不允许空的姓名（对于 <%s>）"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1301
+#: ident.c:421
#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "（头指针分离自 %s）"
+msgid "name consists only of disallowed characters: %s"
+msgstr "姓名中仅包含禁用字符：%s"
-#: ref-filter.c:1305
-msgid "(no branch)"
-msgstr "（非分支）"
+#: ident.c:436 builtin/commit.c:608
+#, c-format
+msgid "invalid date format: %s"
+msgstr "无效的日期格式：%s"
-#: ref-filter.c:1454 ref-filter.c:1485
+#: list-objects.c:129
#, c-format
-msgid "missing object %s for %s"
-msgstr "缺失 %2$s 的对象 %1$s"
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性，但不是一个树对象"
-#: ref-filter.c:1457 ref-filter.c:1488
+#: list-objects.c:142
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性，但不是一个数据对象"
-#: ref-filter.c:1788
+#: list-objects.c:378
#, c-format
-msgid "malformed object at '%s'"
-msgstr "非法的对象于 '%s'"
+msgid "unable to load root tree for commit %s"
+msgstr "无法为提交 %s 加载根树"
-#: ref-filter.c:1855
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "忽略带有错误名称 %s 的引用"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr "不能混用多种过滤规格"
-#: ref-filter.c:1860
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "忽略损坏的引用 %s"
+#: list-objects-filter-options.c:58
+msgid "expected 'tree:<depth>'"
+msgstr "期望 'tree:<深度>'"
-#: ref-filter.c:2122
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "格式：缺少 %%(end) 元素"
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse:path 过滤器支持已被删除"
-#: ref-filter.c:2216
-#, c-format
-msgid "malformed object name %s"
-msgstr "非法的对象名 %s"
+#: list-objects-filter-options.c:158
+msgid "cannot change partial clone promisor remote"
+msgstr "无法修改部分克隆的 promisor 远程仓库"
-#: remote.c:750
+#: lockfile.c:151
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "不能同时获取 %s 和 %s 至 %s"
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"无法创建 '%s.lock'：%s。\n"
+"\n"
+"似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n"
+"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n"
+"可能之前有一个 git 进程在这个仓库中异常退出：\n"
+"手动删除这个文件再继续。"
-#: remote.c:754
+#: lockfile.c:159
#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s 通常跟踪 %s，而非 %s"
+msgid "Unable to create '%s.lock': %s"
+msgstr "不能创建 '%s.lock'：%s"
-#: remote.c:758
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s 同时跟踪 %s 和 %s"
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "读取缓存失败"
-#: remote.c:766
-msgid "Internal error"
-msgstr "内部错误"
+#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
+#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
+#: builtin/stash.c:264
+msgid "unable to write new index file"
+msgstr "无法写新的索引文件"
-#: remote.c:1681 remote.c:1783
-msgid "HEAD does not point to a branch"
-msgstr "HEAD 没有指向一个分支"
+#: merge-recursive.c:322
+msgid "(bad commit)\n"
+msgstr "（坏提交）\n"
-#: remote.c:1690
+#: merge-recursive.c:345
#, c-format
-msgid "no such branch: '%s'"
-msgstr "没有此分支：'%s'"
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"
-#: remote.c:1693
+#: merge-recursive.c:354
#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "尚未给分支 '%s' 设置上游"
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"
+
+#: merge-recursive.c:437
+msgid "error building trees"
+msgstr "创建树出错"
-#: remote.c:1699
+#: merge-recursive.c:861
#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
+msgid "failed to create path '%s'%s"
+msgstr "创建路径 '%s'%s 失败"
-#: remote.c:1714
+#: merge-recursive.c:872
#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "删除 %s 以便为子目录留出空间\n"
+
+#: merge-recursive.c:886 merge-recursive.c:905
+msgid ": perhaps a D/F conflict?"
+msgstr "：可能是一个目录/文件冲突？"
-#: remote.c:1726
+#: merge-recursive.c:895
#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "分支 '%s' 没有设置要推送的远程服务器"
+msgid "refusing to lose untracked file at '%s'"
+msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
-#: remote.c:1737
+#: merge-recursive.c:936 builtin/cat-file.c:40
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "向 '%s' 推送引用规格未包含 '%s'"
+msgid "cannot read object %s '%s'"
+msgstr "不能读取对象 %s '%s'"
-#: remote.c:1750
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "推送无目标（push.default 是 'nothing'）"
+#: merge-recursive.c:939
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "%s '%s' 应为数据对象"
-#: remote.c:1772
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "无法解析 'simple' 推送至一个单独的目标"
+#: merge-recursive.c:963
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "打开 '%s' 失败：%s"
-#: remote.c:2076
+#: merge-recursive.c:974
#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
+msgid "failed to symlink '%s': %s"
+msgstr "创建符号链接 '%s' 失败：%s"
-#: remote.c:2080
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
+#: merge-recursive.c:979
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "不知道如何处理 %06o %s '%s'"
-#: remote.c:2083
+#: merge-recursive.c:1175
#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr "æ\82¨ç\9a\84å\88\86æ\94¯ä¸\8eä¸\8a游å\88\86æ\94¯ '%s' ä¸\80è\87´ã\80\82\n"
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "æ\97 æ³\95å\90\88并å\90模ç»\84 %s ï¼\88没æ\9c\89æ£\80å\87ºï¼\89"
-#: remote.c:2087
+#: merge-recursive.c:1182
#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
-msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "无法合并子模组 %s（提交不存在）"
-#: remote.c:2093
-msgid " (use \"git push\" to publish your local commits)\n"
-msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
+#: merge-recursive.c:1189
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr "无法合并子模组 %s （提交未跟随合并基线）"
-#: remote.c:2096
+#: merge-recursive.c:1197 merge-recursive.c:1209
#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
-msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "子模组 %s 快进到如下提交："
-# 译者：注意保持前导空格
-#: remote.c:2104
-msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
+#: merge-recursive.c:1200 merge-recursive.c:1212
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "快进子模组 %s"
-#: remote.c:2107
+#: merge-recursive.c:1235
#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-"您的分支和 '%s' 出现了偏离，\n"
-"并且分别有 %d 和 %d 处不同的提交。\n"
-msgstr[1] ""
-"您的分支和 '%s' 出现了偏离，\n"
-"并且分别有 %d 和 %d 处不同的提交。\n"
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr "无法合并子模组 %s （没发现合并跟随的提交）"
-# 译者：注意保持前导空格
-#: remote.c:2117
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr " （使用 \"git pull\" 来合并远程分支）\n"
+#: merge-recursive.c:1239
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "无法合并子模组 %s（非快进）"
-#: revision.c:2256
-msgid "your current branch appears to be broken"
-msgstr "æ\82¨ç\9a\84å½\93å\89\8då\88\86æ\94¯å¥½å\83\8f被æ\8d\9få\9d\8f"
+#: merge-recursive.c:1240
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "æ\89¾å\88°å\90模ç»\84ç\9a\84ä¸\80个å\8f¯è\83½ç\9a\84å\90\88并æ\96¹æ¡\88ï¼\9a\n"
-#: revision.c:2259
+#: merge-recursive.c:1243
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "您的当前分支 '%s' 尚无任何提交"
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"如果这个正确，将其添加到索引，例如使用命令：\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"以接受此建议。\n"
-#: revision.c:2453
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent 与 --bisect 不兼容"
+#: merge-recursive.c:1252
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "无法合并子模组 %s （发现多个合并）"
-#: run-command.c:644
-msgid "open /dev/null failed"
-msgstr "不能打开 /dev/null"
+#: merge-recursive.c:1325
+msgid "Failed to execute internal merge"
+msgstr "无法执行内部合并"
-#: send-pack.c:151
+#: merge-recursive.c:1330
#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr "不能解析远程解包状态：%s"
+msgid "Unable to add %s to database"
+msgstr "不能添加 %s 至对象库"
-#: send-pack.c:153
+#: merge-recursive.c:1362
#, c-format
-msgid "remote unpack failed: %s"
-msgstr "远程解包失败：%s"
-
-#: send-pack.c:316
-msgid "failed to sign the push certificate"
-msgstr "无法为推送证书签名"
+msgid "Auto-merging %s"
+msgstr "自动合并 %s"
-#: send-pack.c:429
-msgid "the receiving end does not support --signed push"
-msgstr "接收端不支持签名推送"
+#: merge-recursive.c:1385
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"
-#: send-pack.c:431
+#: merge-recursive.c:1457
+#, c-format
msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr "未发送推送证书，因为接收端不支持签名推送"
-
-#: send-pack.c:443
-msgid "the receiving end does not support --atomic push"
-msgstr "接收端不支持原子推送"
-
-#: send-pack.c:448
-msgid "the receiving end does not support push options"
-msgstr "接收端不支持推送选项"
-
-#: sequencer.c:218
-msgid "revert"
-msgstr "还原"
-
-#: sequencer.c:220
-msgid "cherry-pick"
-msgstr "拣选"
-
-#: sequencer.c:222
-msgid "rebase -i"
-msgstr "rebase -i"
+"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 版"
+"本被保留。"
-#: sequencer.c:224
+#: merge-recursive.c:1462
#, c-format
-msgid "Unknown action: %d"
-msgstr "未知动作：%d"
+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 版本被保留。"
-#: sequencer.c:281
+#: merge-recursive.c:1469
+#, c-format
msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
msgstr ""
-"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
-"命令标记修正后的文件"
+"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
+"本保留在 %8$s 中。"
-#: sequencer.c:284
+#: merge-recursive.c:1474
+#, c-format
msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'\n"
-"and commit the result with 'git commit'"
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree at %s."
msgstr ""
-"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
-"对修正后的文件做标记，然后用 'git commit' 提交"
+"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
+"%7$s 版本保留在 %9$s 中。"
+
+#: merge-recursive.c:1509
+msgid "rename"
+msgstr "重命名"
+
+#: merge-recursive.c:1509
+msgid "renamed"
+msgstr "重命名"
-#: sequencer.c:297 sequencer.c:1704
+#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
#, c-format
-msgid "could not lock '%s'"
-msgstr "不能锁定 '%s'"
+msgid "Refusing to lose dirty file at %s"
+msgstr "拒绝丢失脏文件 '%s'"
-#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
-#: sequencer.c:2733 sequencer.c:2749
+#: merge-recursive.c:1599
#, c-format
-msgid "could not write to '%s'"
-msgstr "不能写入 '%s'"
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
-#: sequencer.c:304
+#: merge-recursive.c:1657
#, c-format
-msgid "could not write eol to '%s'"
-msgstr "不能将换行符写入 '%s'"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
-#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
+#: merge-recursive.c:1687
#, c-format
-msgid "failed to finalize '%s'."
-msgstr "无法完成 '%s'。"
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
-#: builtin/commit.c:754 builtin/merge.c:1044
+#: merge-recursive.c:1692
#, c-format
-msgid "could not read '%s'"
-msgstr "不能读取 '%s'"
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"
-#: sequencer.c:358
+#: merge-recursive.c:1711
#, c-format
-msgid "your local changes would be overwritten by %s."
-msgstr "您的本地修改将被%s覆盖。"
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
+"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-#: sequencer.c:362
-msgid "commit your changes or stash them to proceed."
-msgstr "提交您的修改或贮藏后再继续。"
+#: merge-recursive.c:1716
+msgid " (left unresolved)"
+msgstr "（留下未解决）"
-#: sequencer.c:391
+#: merge-recursive.c:1825
#, c-format
-msgid "%s: fast-forward"
-msgstr "%s：快进"
+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"
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
-#.
-#: sequencer.c:474
+#: merge-recursive.c:2030
#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s：无法写入新索引文件"
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
+"其它目录，没有目录包含大部分文件。"
-#: sequencer.c:493
-msgid "could not resolve HEAD commit\n"
-msgstr "不能解析 HEAD 提交\n"
+#: merge-recursive.c:2062
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
+msgstr ""
+"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
+"在：%s。"
-#: sequencer.c:513
-msgid "unable to update cache tree\n"
-msgstr "不能更新缓存树\n"
+#: merge-recursive.c:2072
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
+msgstr ""
+"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"
+"径放置于此：%s"
-#: sequencer.c:597
+#: merge-recursive.c:2164
#, c-format
msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit %s\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
msgstr ""
-"您的工作区中存在已暂存的修改\n"
-"如果这些修改需要被并入前一个提交，执行：\n"
-"\n"
-" git commit --amend %s\n"
-"\n"
-"如果这些修改要形成一个新提交，执行：\n"
-"\n"
-" git commit %s\n"
-"\n"
-"无论哪种情况，当您完成提交，继续执行：\n"
-"\n"
-" git rebase --continue\n"
-
-#: sequencer.c:699
-#, c-format
-msgid "could not parse commit %s\n"
-msgstr "不能解析提交 %s\n"
-
-#: sequencer.c:704
-#, c-format
-msgid "could not parse parent commit %s\n"
-msgstr "不能解析父提交 %s\n"
+"冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
+"%4$s->%5$s"
-#: sequencer.c:826
+#: merge-recursive.c:2408
#, c-format
msgid ""
-"unexpected 1st line of squash message:\n"
-"\n"
-"\t%.*s"
-msgstr ""
-"意外的压缩提交首行提交信息：\n"
-"\n"
-"\t%.*s"
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
-#: sequencer.c:832
+#: merge-recursive.c:2929
#, c-format
-msgid ""
-"invalid 1st line of squash message:\n"
-"\n"
-"\t%.*s"
-msgstr ""
-"压缩提交的首行提交信息无效：\n"
-"\n"
-"\t%.*s"
+msgid "cannot read object %s"
+msgstr "不能读取对象 %s"
-#: sequencer.c:838 sequencer.c:863
+#: merge-recursive.c:2932
#, c-format
-msgid "This is a combination of %d commits."
-msgstr "这是一个 %d 个提交的组合。"
+msgid "object %s is not a blob"
+msgstr "对象 %s 不是一个数据对象"
-#: sequencer.c:847 sequencer.c:2681
-msgid "need a HEAD to fixup"
-msgstr "需要一个 HEAD 来修复"
+#: merge-recursive.c:2996
+msgid "modify"
+msgstr "修改"
-#: sequencer.c:849
-msgid "could not read HEAD"
-msgstr "ä¸\8dè\83½è¯»å\8f\96 HEAD"
+#: merge-recursive.c:2996
+msgid "modified"
+msgstr "ä¿®æ\94¹"
-#: sequencer.c:851
-msgid "could not read HEAD's commit message"
-msgstr "不能读取 HEAD 的提交说明"
+#: merge-recursive.c:3008
+msgid "content"
+msgstr "内容"
-#: sequencer.c:857
+#: merge-recursive.c:3012
+msgid "add/add"
+msgstr "添加/添加"
+
+#: merge-recursive.c:3035
#, c-format
-msgid "cannot write '%s'"
-msgstr "不能写 '%s'"
+msgid "Skipped %s (merged same as existing)"
+msgstr "略过 %s（已经做过相同合并）"
-#: sequencer.c:866 git-rebase--interactive.sh:446
-msgid "This is the 1st commit message:"
-msgstr "这是第一个提交说明："
+#: merge-recursive.c:3057 git-submodule.sh:937
+msgid "submodule"
+msgstr "子模组"
-#: sequencer.c:874
+#: merge-recursive.c:3058
#, c-format
-msgid "could not read commit message of %s"
-msgstr "不能读取 %s 的提交说明"
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "冲突（%s）：合并冲突于 %s"
-#: sequencer.c:881
+#: merge-recursive.c:3088
#, c-format
-msgid "This is the commit message #%d:"
-msgstr "è¿\99æ\98¯æ\8f\90交说æ\98\8e #%dï¼\9a"
+msgid "Adding as %s instead"
+msgstr "è\80\8cæ\98¯ä»¥ %s 为å\90\8dæ·»å\8a "
-#: sequencer.c:886
+#: merge-recursive.c:3170
#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "提交说明 #%d 将被跳过："
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
-#: sequencer.c:891
+#: merge-recursive.c:3173
#, c-format
-msgid "unknown command: %d"
-msgstr "未知命令：%d"
+msgid ""
+"CONFLICT (file location): %s added in %s inside a directory that was renamed "
+"in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
+"到 %s。"
-#: sequencer.c:957
-msgid "your index file is unmerged."
-msgstr "您的索引文件未完成合并。"
+#: merge-recursive.c:3177
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
+"动到 %5$s。"
-#: sequencer.c:975
+#: merge-recursive.c:3180
#, c-format
-msgid "commit %s is a merge but no -m option was given."
-msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
+msgid ""
+"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
+"was renamed in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"
+"建议将其移动到 %5$s。"
-#: sequencer.c:983
+#: merge-recursive.c:3294
#, c-format
-msgid "commit %s does not have parent %d"
-msgstr "提交 %s 没有第 %d 个父提交"
+msgid "Removing %s"
+msgstr "删除 %s"
+
+#: merge-recursive.c:3317
+msgid "file/directory"
+msgstr "文件/目录"
-#: sequencer.c:987
+#: merge-recursive.c:3322
+msgid "directory/file"
+msgstr "目录/文件"
+
+#: merge-recursive.c:3329
#, c-format
-msgid "mainline was specified but commit %s is not a merge."
-msgstr "指定了主线，但是提交 %s 不是一个合并提交。"
+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"
-#: sequencer.c:993
+#: merge-recursive.c:3338
#, c-format
-msgid "cannot get commit message for %s"
-msgstr "不能得到 %s 的提交说明"
+msgid "Adding %s"
+msgstr "添加 %s"
-#. TRANSLATORS: The first %s will be a "todo" command like
-#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1014
+#: merge-recursive.c:3347
#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s：不能解析父提交 %s"
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "冲突（add/add）：合并冲突于 %s"
-#: sequencer.c:1077 sequencer.c:1853
+#: merge-recursive.c:3385
#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr "不能将 '%s' 重命名为 '%s'"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+"您对下列文件的本地修改将被合并操作覆盖：\n"
+" %s"
+
+#: merge-recursive.c:3396
+msgid "Already up to date!"
+msgstr "已经是最新的！"
-#: sequencer.c:1128
+#: merge-recursive.c:3405
#, c-format
-msgid "could not revert %s... %s"
-msgstr "不能还原 %s... %s"
+msgid "merging of trees %s and %s failed"
+msgstr "无法合并树 %s 和 %s"
+
+#: merge-recursive.c:3504
+msgid "Merging:"
+msgstr "合并："
-#: sequencer.c:1129
+#: merge-recursive.c:3517
#, c-format
-msgid "could not apply %s... %s"
-msgstr "不能应用 %s... %s"
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "发现 %u 个共同祖先："
+msgstr[1] "发现 %u 个共同祖先："
-#: sequencer.c:1171
-msgid "empty commit set passed"
-msgstr "提供了空的提交集"
+#: merge-recursive.c:3556
+msgid "merge returned no commit"
+msgstr "合并未返回提交"
-#: sequencer.c:1181
+#: merge-recursive.c:3622
#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s：无法读取索引"
+msgid "Could not parse object '%s'"
+msgstr "不能解析对象 '%s'"
+
+#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+msgid "Unable to write index."
+msgstr "不能写入索引。"
-#: sequencer.c:1188
+#: midx.c:66
#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s：无法刷新索引"
+msgid "multi-pack-index file %s is too small"
+msgstr "多包索引文件 %s 太小"
-#: sequencer.c:1308
+#: midx.c:82
#, c-format
-msgid "invalid line %d: %.*s"
-msgstr "无效行 %d：%.*s"
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
-#: sequencer.c:1316
+#: midx.c:87
#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr "没有父提交的情况下不能 '%s'"
+msgid "multi-pack-index version %d not recognized"
+msgstr "multi-pack-index 版本 %d 不能被识别"
-#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
-#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
+#: midx.c:92
#, c-format
-msgid "could not read '%s'."
-msgstr "不能读取 '%s'。"
+msgid "hash version %u does not match"
+msgstr "散列版本 %u 不匹配"
-#: sequencer.c:1361
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "请用 'git rebase --edit-todo' 来修改。"
+#: midx.c:106
+msgid "invalid chunk offset (too large)"
+msgstr "无效的块偏移（太大）"
-#: sequencer.c:1363
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr "不可用的指令清单：'%s'"
+#: midx.c:130
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgstr "终止多包索引块 id 出现时间早于预期"
-#: sequencer.c:1368
-msgid "no commits parsed."
-msgstr "没有解析提交。"
+#: midx.c:143
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "多包索引缺少必需的包名块"
-#: sequencer.c:1379
-msgid "cannot cherry-pick during a revert."
-msgstr "不能在回退中执行拣选。"
+#: midx.c:145
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "多包索引缺少必需的对象 ID 扇出块"
-#: sequencer.c:1381
-msgid "cannot revert during a cherry-pick."
-msgstr "不能在拣选中执行回退。"
+#: midx.c:147
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "多包索引缺少必需的对象 ID 查询块"
-#: sequencer.c:1448
-#, c-format
-msgid "invalid key: %s"
-msgstr "无效键名：%s"
+#: midx.c:149
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "多包索引缺少必需的对象偏移块"
-#: sequencer.c:1451
+#: midx.c:163
#, c-format
-msgid "invalid value for %s: %s"
-msgstr "%s 的值无效：%s"
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
-#: sequencer.c:1517
+#: midx.c:208
#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr "é\9d\9eæ³\95ç\9a\84é\80\89项æ¸\85å\8d\95ï¼\9a'%s'"
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "é\94\99ç\9a\84 pack-int-idï¼\9a%uï¼\88å\85±æ\9c\89 %u 个å\8c\85ï¼\89"
-#: sequencer.c:1555
-msgid "a cherry-pick or revert is already in progress"
-msgstr "一个拣选或还原操作已在进行"
+#: midx.c:258
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
-#: sequencer.c:1556
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
+#: midx.c:286
+msgid "error preparing packfile from multi-pack-index"
+msgstr "从多包索引准备 packfile 出错"
-#: sequencer.c:1559
+#: midx.c:457
#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr "不能创建序列目录 '%s'"
-
-#: sequencer.c:1574
-msgid "could not lock HEAD"
-msgstr "不能锁定 HEAD"
+msgid "failed to add packfile '%s'"
+msgstr "添加包文件 '%s' 失败"
-#: sequencer.c:1632 sequencer.c:2211
-msgid "no cherry-pick or revert in progress"
-msgstr "拣选或还原操作并未进行"
-
-#: sequencer.c:1634
-msgid "cannot resolve HEAD"
-msgstr "不能解析 HEAD"
+#: midx.c:463
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "打开包索引 '%s' 失败"
-#: sequencer.c:1636 sequencer.c:1671
-msgid "cannot abort from a branch yet to be born"
-msgstr "不能从尚未建立的分支终止"
+#: midx.c:557
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "在包文件中定位对象 %d 失败"
-#: sequencer.c:1657 builtin/grep.c:711
+#: midx.c:993
#, c-format
-msgid "cannot open '%s'"
-msgstr "不能打开 '%s'"
+msgid "failed to clear multi-pack-index at %s"
+msgstr "清理位于 %s 的多包索引失败"
+
+#: midx.c:1048
+msgid "Looking for referenced packfiles"
+msgstr "正在查找引用的包文件"
-#: sequencer.c:1659
+#: midx.c:1063
#, c-format
-msgid "cannot read '%s': %s"
-msgstr "不能读取 '%s'：%s"
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: sequencer.c:1660
-msgid "unexpected end of file"
-msgstr "æ\84\8få¤\96ç\9a\84æ\96\87件ç»\93æ\9d\9f"
+#: midx.c:1067
+msgid "Verifying OID order in MIDX"
+msgstr "æ£å\9c¨æ ¡éª\8c MIDX ä¸ç\9a\84对象 ID 顺åº\8f"
-#: sequencer.c:1666
+#: midx.c:1076
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
-#: sequencer.c:1677
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
+#: midx.c:1095
+msgid "Sorting objects by packfile"
+msgstr "通过包文件为对象排序"
-#: sequencer.c:1818 sequencer.c:2109
-msgid "cannot read HEAD"
-msgstr "不能读取 HEAD"
+#: midx.c:1101
+msgid "Verifying object offsets"
+msgstr "校验对象偏移"
-#: sequencer.c:1858 builtin/difftool.c:640
+#: midx.c:1117
#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr "不能拷贝 '%s' 至 '%s'"
-
-#: sequencer.c:1874
-msgid "could not read index"
-msgstr "不能读取索引"
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "为 oid[%d] = %s 加载包条目失败"
-# 译者：注意保持前导空格
-#: sequencer.c:1879
+#: midx.c:1123
#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
-msgstr ""
-"执行失败：%s\n"
-"%s您可以改正该问题，然后运行\n"
-"\n"
-" git rebase --continue\n"
-"\n"
+msgid "failed to load pack-index for packfile %s"
+msgstr "为包文件 %s 加载包索引失败"
-#: sequencer.c:1885
-msgid "and made changes to the index and/or the working tree\n"
-msgstr "并且修改索引和/或工作区\n"
+#: midx.c:1132
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
-#: sequencer.c:1891
+#: name-hash.c:531
#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
-msgstr ""
-"执行成功：%s\n"
-"但是在索引和/或工作区中存在变更\n"
-"提交或贮藏修改，然后运行\n"
-"\n"
-" git rebase --continue\n"
-"\n"
+msgid "unable to create lazy_dir thread: %s"
+msgstr "不能创建 lazy_dir 线程：%s"
-#: sequencer.c:1948
+#: name-hash.c:553
#, c-format
-msgid "Applied autostash.\n"
-msgstr "已应用 autostash。\n"
+msgid "unable to create lazy_name thread: %s"
+msgstr "不能创建 lazy_name 线程：%s"
-#: sequencer.c:1960
+#: name-hash.c:559
#, c-format
-msgid "cannot store %s"
-msgstr "ä¸\8dè\83½å\98å\82¨ %s"
+msgid "unable to join lazy_name thread: %s"
+msgstr "ä¸\8dè\83½å\8a å\85¥ lasy_name 线ç¨\8bï¼\9a%s"
-#: sequencer.c:1963 git-rebase.sh:175
+#: notes-merge.c:277
#, c-format
msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-"应用 autostash 导致冲突。\n"
-"您的修改安全地保存在贮藏区中。\n"
-"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
+"您的前一次注释合并尚未结束（存在 %s）。\n"
+"在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "
+"notes merge --abort' 来提交/终止前一次合并。"
-#: sequencer.c:2045
+#: notes-merge.c:284
#, c-format
-msgid "Stopped at %s... %.*s\n"
-msgstr "停止在 %s... %.*s\n"
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "您尚未结束注释合并（存在 %s）。"
-#: sequencer.c:2087
-#, c-format
-msgid "unknown command %d"
-msgstr "未知命令 %d"
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "不能提交未初始化/未引用的注解树"
-#: sequencer.c:2117
-msgid "could not read orig-head"
-msgstr "不能读取 orig-head"
-
-#: sequencer.c:2122 sequencer.c:2678
-msgid "could not read 'onto'"
-msgstr "不能读取 'onto'"
-
-#: sequencer.c:2129
+#: notes-utils.c:105
#, c-format
-msgid "could not update %s"
-msgstr "不能更新 %s"
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "坏的 notes.rewriteMode 值：'%s'"
-#: sequencer.c:2136
+#: notes-utils.c:115
#, c-format
-msgid "could not update HEAD to %s"
-msgstr "不能更新 HEAD 为 %s"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
-#: sequencer.c:2220
-msgid "cannot rebase: You have unstaged changes."
-msgstr "不能变基：您有未暂存的变更。"
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:145
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "坏的 %s 值：'%s'"
-#: sequencer.c:2225
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "不能删除 CHERRY_PICK_HEAD"
+#: object.c:54
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "无效的对象类型 \"%s\""
-#: sequencer.c:2234
-msgid "cannot amend non-existing commit"
-msgstr "不能修补不存在的提交"
+#: object.c:174
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "对象 %s 是一个 %s，不是一个 %s"
-#: sequencer.c:2236
+#: object.c:234
#, c-format
-msgid "invalid file: '%s'"
-msgstr "无效文件：'%s'"
+msgid "object %s has unknown type id %d"
+msgstr "对象 %s 有未知的类型 id %d"
-#: sequencer.c:2238
+#: object.c:247
#, c-format
-msgid "invalid contents: '%s'"
-msgstr "无效内容：'%s'"
+msgid "unable to parse object: %s"
+msgstr "不能解析对象：%s"
-#: sequencer.c:2241
-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'。"
+#: object.c:267 object.c:278
+#, c-format
+msgid "hash mismatch %s"
+msgstr "哈希值与 %s 不匹配"
-#: sequencer.c:2251
-msgid "could not commit staged changes."
-msgstr "不能提交暂存的修改。"
+#: packfile.c:617
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
-#: sequencer.c:2331
+#: packfile.c:1868
#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s：不能拣选一个%s"
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
-#: sequencer.c:2335
+#: packfile.c:1872
#, c-format
-msgid "%s: bad revision"
-msgstr "%s：错误的版本"
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
-#: sequencer.c:2368
-msgid "can't revert as initial commit"
-msgstr "不能作为初始提交回退"
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "%s 需要一个值"
-#: sequencer.c:2471
-msgid "make_script: unhandled options"
-msgstr "make_script：有未能处理的选项"
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s 与 %s 不兼容"
-#: sequencer.c:2474
-msgid "make_script: error preparing revisions"
-msgstr "make_script：准备版本时错误"
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s：和其它的不兼容"
-#: sequencer.c:2510
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "不可用的待办列表：'%s'"
+msgid "%s takes no value"
+msgstr "%s 不取值"
-#: sequencer.c:2516
+#: parse-options.c:94
#, c-format
-msgid "unable to open '%s' for writing"
-msgstr "无法以写入方式打开 '%s'"
+msgid "%s isn't available"
+msgstr "%s 不可用"
-#: sequencer.c:2561
+#: parse-options.c:219
#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
-#: sequencer.c:2641
+#: parse-options.c:389
#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"警告：一些提交可能被意外丢弃。\n"
-"丢弃的提交（从新到旧）：\n"
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"
-#: sequencer.c:2648
+#: parse-options.c:423 parse-options.c:431
#, c-format
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"
-"\n"
-"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
-"可选值有：ignore、warn、error。\n"
-"\n"
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr "你的意思是 `--%s`（有两个短线？）"
-#: sequencer.c:2660
+#: parse-options.c:859
#, c-format
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"
-"或者您可以用 'git rebase --abort' 终止变基。\n"
+msgid "unknown option `%s'"
+msgstr "未知选项 `%s'"
-#: sequencer.c:2708
+#: parse-options.c:861
#, c-format
-msgid "could not parse commit '%s'"
-msgstr "不能解析提交 '%s'"
+msgid "unknown switch `%c'"
+msgstr "未知开关 `%c'"
-#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:775
+#: parse-options.c:863
#, c-format
-msgid "could not open '%s' for writing"
-msgstr "无法打开 '%s' 进行写入"
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "字符串中未知的非 ascii 字符选项：`%s'"
-#: sequencer.c:2756
+#: parse-options.c:887
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:906
#, c-format
-msgid "could not truncate '%s'"
-msgstr "无法截断 '%s'"
+msgid "usage: %s"
+msgstr "用法：%s"
-#: sequencer.c:2848
-msgid "the script was already rearranged."
-msgstr "脚本已经重新编排。"
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:912
+#, c-format
+msgid " or: %s"
+msgstr " 或：%s"
-#: sequencer.c:2953
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#: parse-options.c:915
#, c-format
-msgid "could not finish '%s'"
-msgstr "无法结束 '%s'"
+msgid " %s"
+msgstr " %s"
+
+#: parse-options.c:954
+msgid "-NUM"
+msgstr "-数字"
-#: setup.c:171
+#: parse-options.c:968
#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
-msgstr ""
-"%s：工作区中无此路径。\n"
-"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
+msgid "alias of --%s"
+msgstr "--%s 的别名"
-#: setup.c:184
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"有歧义的参数 '%s'：未知的版本或路径不存在于工作区中。\n"
-"使用 '--' 来分隔版本和路径，例如：\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+msgid "option `%s' expects a numerical value"
+msgstr "选项 `%s' 期望一个数字值"
-#: setup.c:252
+#: parse-options-cb.c:41
#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"有歧义的参数 '%s'：可同时是版本和文件\n"
-"使用 '--' 来分隔版本和路径，例如：\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+msgid "malformed expiration date '%s'"
+msgstr "格式错误的到期时间：'%s'"
-#: setup.c:499
+#: parse-options-cb.c:54
#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "期望 git 仓库版本 <= %d，却得到 %d"
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
-#: setup.c:507
-msgid "unknown repository extensions found:"
-msgstr "发现未知的仓库扩展："
+#: parse-options-cb.c:130 parse-options-cb.c:147
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "格式错误的对象名 '%s'"
-#: setup.c:806
+#: path.c:897
#, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "不是一个 git 仓库（或者任何父目录）：%s"
+msgid "Could not make %s writable by group"
+msgstr "不能设置 %s 为组可写"
-#: setup.c:808 builtin/index-pack.c:1653
-msgid "Cannot come back to cwd"
-msgstr "无法返回当前工作目录"
+#: pathspec.c:128
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
-#: setup.c:1046
-msgid "Unable to read current working directory"
-msgstr "不能读取当前工作目录"
+#: pathspec.c:146
+msgid "Only one 'attr:' specification is allowed."
+msgstr "只允许一个 'attr:' 规格。"
-#: setup.c:1058 setup.c:1064
-#, c-format
-msgid "Cannot change to '%s'"
-msgstr "不能切换到 '%s'"
+#: pathspec.c:149
+msgid "attr spec must not be empty"
+msgstr "属性规格不能为空"
-#: setup.c:1077
+#: pathspec.c:192
#, c-format
+msgid "invalid attribute name %s"
+msgstr "无效的属性名 %s"
+
+#: pathspec.c:257
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
+
+#: pathspec.c:264
msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
-"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
-msgstr ""
-"不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"
-"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
+
+#: pathspec.c:304
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "路径规格包含无效的神奇前缀"
-#: setup.c:1159
+#: pathspec.c:325
#, c-format
-msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
-msgstr ""
-"参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"
-"文件属主必须始终拥有读写权限。"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
-#: sha1_file.c:528
+#: pathspec.c:330
#, c-format
-msgid "path '%s' does not exist"
-msgstr "路径 '%s' 不存在"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
-#: sha1_file.c:554
+#: pathspec.c:368
#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
-#: sha1_file.c:560
+#: pathspec.c:427
#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "参考仓库 '%s' 不是一个本地仓库。"
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s：'literal' 和 'glob' 不兼容"
-#: sha1_file.c:566
+#: pathspec.c:440
#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "参考仓库 '%s' 是一个浅克隆"
+msgid "%s: '%s' is outside repository"
+msgstr "%s：'%s' 在仓库之外"
-#: sha1_file.c:574
+#: pathspec.c:514
#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "参考仓库 '%s' 已被嫁接"
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s'（助记符：'%c'）"
-#: sha1_name.c:420
+#: pathspec.c:524
#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "短 SHA1 %s 存在歧义"
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
-#: sha1_name.c:431
-msgid "The candidates are:"
-msgstr "候选者有："
+#: pathspec.c:591
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "路径规格 '%s' 位于符号链接中"
-#: sha1_name.c:590
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n"
-"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"
-"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
-"命令关闭本消息通知。"
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "无法写 flush 包"
-#: submodule.c:93 submodule.c:127
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "无法写 delim 包"
-#: submodule.c:97 submodule.c:131
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
+#: pkt-line.c:106
+msgid "flush packet write failed"
+msgstr "flush 包写错误"
-#: submodule.c:105
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "不能更新 .gitmodules 条目 %s"
+#: pkt-line.c:146 pkt-line.c:232
+msgid "protocol error: impossibly long line"
+msgstr "协议错误：不可能的长行"
-#: submodule.c:138
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "无法移除 %s 的 .gitmodules 条目"
+#: pkt-line.c:162 pkt-line.c:164
+msgid "packet write with format failed"
+msgstr "格式化包写入错误"
-#: submodule.c:149
-msgid "staging updated .gitmodules failed"
-msgstr "将更新后 .gitmodules 添加暂存区失败"
+#: pkt-line.c:196
+msgid "packet write failed - data exceeds max packet size"
+msgstr "写数据包失败：数据超过了包的最大长度"
+
+#: pkt-line.c:203 pkt-line.c:210
+msgid "packet write failed"
+msgstr "数据包写入失败"
-#: submodule.c:309
+#: pkt-line.c:295
+msgid "read error"
+msgstr "读取错误"
+
+#: pkt-line.c:303
+msgid "the remote end hung up unexpectedly"
+msgstr "远端意外挂断了"
+
+#: pkt-line.c:331
#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "位于未检出的子模组 '%s'"
+msgid "protocol error: bad line length character: %.4s"
+msgstr "协议错误：错误的行长度字符串：%.4s"
-#: submodule.c:340
+#: pkt-line.c:341 pkt-line.c:346
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
+msgid "protocol error: bad line length %d"
+msgstr "协议错误：错误的行长度 %d"
-#: submodule.c:799
+#: pkt-line.c:362
#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
+msgid "remote error: %s"
+msgstr "远程错误：%s"
-#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "æ\97 æ³\95å°\86 HEAD 解æ\9e\90为æ\9c\89æ\95\88å¼\95ç\94¨ã\80\82"
+#: preload-index.c:119
+msgid "Refreshing index"
+msgstr "æ£å\9c¨å\88·æ\96°ç´¢å¼\95"
-#: submodule.c:1304
+#: preload-index.c:138
#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr "无法将 '%s' 识别为一个 git 仓库"
+msgid "unable to create threaded lstat: %s"
+msgstr "无法创建线程 lstat：%s"
+
+#: pretty.c:966
+msgid "unable to parse --pretty format"
+msgstr "不能解析 --pretty 格式"
+
+#: range-diff.c:56
+msgid "could not start `log`"
+msgstr "不能启动 `log`"
-#: submodule.c:1442
+#: range-diff.c:59
+msgid "could not read `log` output"
+msgstr "不能读取 `log` 的输出"
+
+#: range-diff.c:74 sequencer.c:4897
#, c-format
-msgid "could not start 'git status' in submodule '%s'"
-msgstr "无法在子模组 '%s' 中启动 'git status'"
+msgid "could not parse commit '%s'"
+msgstr "不能解析提交 '%s'"
+
+#: range-diff.c:224
+msgid "failed to generate diff"
+msgstr "生成 diff 失败"
-#: submodule.c:1455
+#: range-diff.c:455 range-diff.c:457
#, c-format
-msgid "could not run 'git status' in submodule '%s'"
-msgstr "无法在子模组 '%s' 中执行 'git status'"
+msgid "could not parse log for '%s'"
+msgstr "不能解析 '%s' 的日志"
-#: submodule.c:1548
+#: read-cache.c:680
#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr "å\90模ç»\84 '%s' ä¸æ\9c\89è\84\8fç´¢å¼\95"
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "å°\86ä¸\8dä¼\9aæ·»å\8a æ\96\87件å\88«å\90\8d '%s'ï¼\88'%s' å·²ç»\8få\98å\9c¨äº\8eç´¢å¼\95ä¸ï¼\89"
-#: submodule.c:1809
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
+msgstr "不能在对象数据库中创建空的数据对象"
+
+#: read-cache.c:718
#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr "%s：只能添加常规文件、符号链接或 git 目录"
-#: submodule.c:1821 submodule.c:1877
+#: read-cache.c:723
#, c-format
-msgid "could not lookup name for submodule '%s'"
-msgstr "不能查询子模组 '%s' 的名称"
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' 没有检出一个提交"
-#: submodule.c:1825 builtin/submodule--helper.c:671
-#: builtin/submodule--helper.c:681
+#: read-cache.c:775
#, c-format
-msgid "could not create directory '%s'"
-msgstr "不能创建目录 '%s'"
+msgid "unable to index file '%s'"
+msgstr "无法索引文件 '%s'"
-#: submodule.c:1828
+#: read-cache.c:794
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "无法在索引中添加 '%s'"
+
+#: read-cache.c:805
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "无法对 %s 执行 stat"
+
+#: read-cache.c:1314
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' 看起来既是文件又是目录"
+
+#: read-cache.c:1499
+msgid "Refresh index"
+msgstr "刷新索引"
+
+#: read-cache.c:1613
#, c-format
msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-"将 '%s%s' 的 git 目录从\n"
-"'%s' 迁移至\n"
-"'%s'\n"
+"设置了 index.version，但是取值无效。\n"
+"使用版本 %i"
-#: submodule.c:1912
+#: read-cache.c:1623
#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "无法递归进子模组路径 '%s'"
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
+"使用版本 %i"
-#: submodule.c:1956
-msgid "could not start ls-files in .."
-msgstr "无法在 .. 中启动 ls-files"
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "坏的签名 0x%08x"
-#: submodule.c:1976
-msgid "BUG: returned path string doesn't match cwd?"
-msgstr "BUG：返回的路径和当前路径不匹配？"
+#: read-cache.c:1682
+#, c-format
+msgid "bad index version %d"
+msgstr "坏的索引版本 %d"
+
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
+msgstr "坏的索引文件 sha1 签名"
-#: submodule.c:1995
+#: read-cache.c:1721
#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr "ls-tree 返回未知返回值 %d"
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "索引使用不被支持的 %.4s 扩展"
-#: submodule-config.c:263
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "submodule.fetchjobs 不允许为负值"
+#
+#: read-cache.c:1723
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "忽略 %.4s 扩展"
-#: submodule-config.c:436
+#: read-cache.c:1760
#, c-format
-msgid "invalid value for %s"
-msgstr "%s 的值无效"
+msgid "unknown index entry format 0x%08x"
+msgstr "未知的索引条目格式 0x%08x"
-#: trailer.c:238
+#: read-cache.c:1776
#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "执行 trailer 命令 '%s' 失败"
+msgid "malformed name field in the index, near path '%s'"
+msgstr "索引中靠近路径 '%s' 有错误的名称字段"
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
+msgstr "索引中有未排序的暂存条目"
+
+#: read-cache.c:1836
#, c-format
-msgid "unknown value '%s' for key '%s'"
-msgstr "键 '%2$s' 的未知取值 '%1$s'"
+msgid "multiple stage entries for merged file '%s'"
+msgstr "合并文件 '%s' 有多个暂存条目"
-#: trailer.c:539 trailer.c:544 builtin/remote.c:290
+#: read-cache.c:1839
#, c-format
-msgid "more than one %s"
-msgstr "多于一个 %s"
+msgid "unordered stage entries for '%s'"
+msgstr "'%s' 的未排序暂存条目"
-#: trailer.c:730
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358
+#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
+#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
+#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
+#: builtin/submodule--helper.c:330
+msgid "index file corrupt"
+msgstr "索引文件损坏"
+
+#: read-cache.c:2087
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "签名 '%.*s' 的键为空"
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "无法创建 load_cache_entries 线程：%s"
-#: trailer.c:750
+#: read-cache.c:2100
#, c-format
-msgid "could not read input file '%s'"
-msgstr "不能读取输入文件 '%s'"
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "无法加入 load_cache_entries 线程：%s"
-#: trailer.c:753
-msgid "could not read from stdin"
-msgstr "不能自标准输入读取"
+#: read-cache.c:2133
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s：打开索引文件失败"
-#: trailer.c:1008 builtin/am.c:46
+#: read-cache.c:2137
#, c-format
-msgid "could not stat %s"
-msgstr "不能对 %s 调用 stat"
+msgid "%s: cannot stat the open index"
+msgstr "%s：不能对打开的索引执行 stat 操作"
-#: trailer.c:1010
+#: read-cache.c:2141
#, c-format
-msgid "file %s is not a regular file"
-msgstr "文件 %s 不是一个正规文件"
+msgid "%s: index file smaller than expected"
+msgstr "%s：索引文件比预期的小"
-#: trailer.c:1012
+#: read-cache.c:2145
#, c-format
-msgid "file %s is not writable by user"
-msgstr "文件 %s 用户不可写"
+msgid "%s: unable to map index file"
+msgstr "%s：无法对索引文件执行 map 操作"
-#: trailer.c:1024
-msgid "could not open temporary file"
-msgstr "不能打开临时文件"
+#: read-cache.c:2187
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "无法创建 load_index_extensions 线程：%s"
-#: trailer.c:1064
+#: read-cache.c:2214
#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "不能重命名临时文件为 %s"
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "无法加入 load_index_extensions 线程：%s"
-#: transport.c:62
+#: read-cache.c:2246
#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
+msgid "could not freshen shared index '%s'"
+msgstr "无法刷新共享索引 '%s'"
-#: transport.c:151
+#: read-cache.c:2293
#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "传输：无效的深度选项 '%s'"
+msgid "broken index, expect %s in %s, got %s"
+msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
+
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
+#, c-format
+msgid "could not close '%s'"
+msgstr "不能关闭 '%s'"
+
+#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
+#, c-format
+msgid "could not stat '%s'"
+msgstr "不能对 '%s' 调用 stat"
+
+#: read-cache.c:3105
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "不能打开 git 目录：%s"
+
+#: read-cache.c:3117
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "无法删除：%s"
+
+#: read-cache.c:3142
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "不能修复 '%s' 的权限位"
+
+#: read-cache.c:3291
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s：不能落到暂存区 #0"
-#: transport.c:888
+#: rebase-interactive.c:26
#, c-format
msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
+
+#: rebase-interactive.c:35
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <command> = run command (the rest of the line) using shell\n"
+"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"命令:\n"
+"p, pick <提交> = 使用提交\n"
+"r, reword <提交> = 使用提交，但修改提交说明\n"
+"e, edit <提交> = 使用提交，进入 shell 以便进行提交修补\n"
+"s, squash <提交> = 使用提交，但融合到前一个提交\n"
+"f, fixup <提交> = 类似于 \"squash\"，但丢弃提交说明日志\n"
+"x, exec <命令> = 使用 shell 运行命令（此行剩余部分）\n"
+"b, break = 在此处停止（使用 'git rebase --continue' 继续变基）\n"
+"d, drop <提交> = 删除提交\n"
+"l, label <label> = 为当前 HEAD 打上标记\n"
+"t, reset <label> = 重置 HEAD 到该标记\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"
+". 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"
+". -c <提交> 可以编辑提交说明。\n"
+"\n"
+"可以对这些行重新排序，将从上至下执行。\n"
-#: transport.c:892
+#: rebase-interactive.c:56
#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "变基 %s 到 %s（%d 个提交）"
+msgstr[1] "变基 %s 到 %s（%d 个提交）"
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
msgid ""
"\n"
-"Please try\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
"\n"
-"\tgit push --recurse-submodules=on-demand\n"
+"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
+
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
+msgid ""
"\n"
-"or cd to the path and use\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
"\n"
-"\tgit push\n"
+"如果您在这里删除一行，对应的提交将会丢失。\n"
+
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816
+msgid ""
"\n"
-"to push them to a remote.\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
"\n"
msgstr ""
"\n"
-"请尝试\n"
+"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基，\n"
+"请执行：\n"
+" git rebase --continue\n"
"\n"
-"\tgit push --recurse-submodules=on-demand\n"
+
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
+msgid ""
"\n"
-"或者进入到子目录执行\n"
+"However, if you remove everything, the rebase will be aborted.\n"
"\n"
-"\tgit push\n"
+msgstr ""
"\n"
-"以推送至远程。\n"
+"然而，如果您删除全部内容，变基操作将会终止。\n"
"\n"
-#: transport.c:900
-msgid "Aborting."
-msgstr "æ£å\9c¨ç»\88æ¢ã\80\82"
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
+msgstr "注æ\84\8f空æ\8f\90交已被注é\87\8aæ\8e\89"
-#: transport-helper.c:1071
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
+#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
-msgid "Could not read ref %s"
-msgstr "不能读取引用 %s"
-
-#: tree-walk.c:31
-msgid "too-short tree object"
-msgstr "太短的树对象"
-
-#: tree-walk.c:37
-msgid "malformed mode in tree entry"
-msgstr "树对象中的条目模式错误"
-
-#: tree-walk.c:41
-msgid "empty filename in tree entry"
-msgstr "树对象条目中空的文件名"
+msgid "could not write '%s'"
+msgstr "不能写入 '%s'"
-#: tree-walk.c:114
-msgid "too-short tree file"
-msgstr "太短的树文件"
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr "不能拷贝 '%s' 至 '%s'。"
-#: unpack-trees.c:106
+#: rebase-interactive.c:173
#, c-format
msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%sPlease commit your changes or stash them before you switch branches."
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
msgstr ""
-"您对下列文件的本地修改将被检出操作覆盖：\n"
-"%%s请在切换分支前提交或贮藏您的修改。"
+"警告：一些提交可能被意外丢弃。\n"
+"丢弃的提交（从新到旧）：\n"
-#: unpack-trees.c:108
+#: rebase-interactive.c:180
#, c-format
msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
msgstr ""
-"您对下列文件的本地修改将被检出操作覆盖：\n"
-"%%s"
+"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"
+"\n"
+"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
+"可选值有：ignore、warn、error。\n"
+"\n"
-#: unpack-trees.c:111
+#: refs.c:192
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
-msgstr ""
-"您对下列文件的本地修改将被合并操作覆盖：\n"
-"%%s请在合并前提交或贮藏您的修改。"
+msgid "%s does not point to a valid object!"
+msgstr "%s 没有指向一个有效的对象！"
-#: unpack-trees.c:113
+#: refs.c:597
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"您对下列文件的本地修改将被合并操作覆盖：\n"
-"%%s"
+msgid "ignoring dangling symref %s"
+msgstr "忽略悬空符号引用 %s"
-#: unpack-trees.c:116
+#: refs.c:599 ref-filter.c:1982
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
-msgstr ""
-"您对下列文件的本地修改将被 %s 覆盖：\n"
-"%%s请在 %s 之前提交或贮藏您的修改。"
+msgid "ignoring broken ref %s"
+msgstr "忽略损坏的引用 %s"
-#: unpack-trees.c:118
+#: refs.c:734
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"您对下列文件的本地修改将被 %s 覆盖：\n"
-"%%s"
+msgid "could not open '%s' for writing: %s"
+msgstr "无法为写入打开 '%s'：%s"
-#: unpack-trees.c:123
+#: refs.c:744 refs.c:795
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr ""
-"更新如下目录将会丢失其中未跟踪的文件：\n"
-"%s"
+msgid "could not read ref '%s'"
+msgstr "无法读取引用 '%s'"
-#: unpack-trees.c:127
+#: refs.c:750
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
-"%%s请在切换分支之前移动或删除。"
+msgid "ref '%s' already exists"
+msgstr "引用 '%s' 已经存在"
-#: unpack-trees.c:129
+#: refs.c:755
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
-"%%s"
+msgid "unexpected object ID when writing '%s'"
+msgstr "写入 '%s' 时意外的对象 ID"
-#: unpack-trees.c:132
+#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
+#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
-"%%s请在合并前移动或删除。"
+msgid "could not write to '%s'"
+msgstr "不能写入 '%s'"
-#: unpack-trees.c:134
+#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
-"%%s"
+msgid "could not open '%s' for writing"
+msgstr "无法打开 '%s' 进行写入"
-#: unpack-trees.c:137
+#: refs.c:797
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
-"%%s请在 %s 前移动或删除。"
+msgid "unexpected object ID when deleting '%s'"
+msgstr "删除 '%s' 时意外的对象 ID"
-#: unpack-trees.c:139
+#: refs.c:928
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
-"%%s"
+msgid "log for ref %s has gap after %s"
+msgstr "引用 %s 的日志在 %s 之后有缺口"
-#: unpack-trees.c:144
+#: refs.c:934
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
-"%%s请在切换分支前移动或删除。"
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "引用 %s 的日志意外终止于 %s "
-#: unpack-trees.c:146
+#: refs.c:993
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
-"%%s"
+msgid "log for %s is empty"
+msgstr "%s 的日志为空"
-#: unpack-trees.c:149
+#: refs.c:1085
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
-"%%s请在合并前移动或删除。"
+msgid "refusing to update ref with bad name '%s'"
+msgstr "拒绝更新有错误名称 '%s' 的引用"
-#: unpack-trees.c:151
+#: refs.c:1161
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
-"%%s"
+msgid "update_ref failed for ref '%s': %s"
+msgstr "对引用 '%s' 执行 update_ref 失败：%s"
-#: unpack-trees.c:154
+#: refs.c:1942
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
-"%%s请在 %s 前移动或删除。"
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "不允许对引用 '%s' 多次更新"
+
+#: refs.c:1974
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "在隔离环境中禁止更新引用"
-#: unpack-trees.c:156
+#: refs.c:2070 refs.c:2100
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
-"%%s"
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' 已存在，无法创建 '%s'"
-#: unpack-trees.c:163
+#: refs.c:2076 refs.c:2111
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr "æ\9d¡ç\9b® '%s' å\92\8c '%s' é\87\8då\8f ã\80\82æ\97 æ³\95å\90\88并ã\80\82"
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "æ\97 æ³\95å\90\8cæ\97¶å¤\84ç\90\86 '%s' å\92\8c '%s'"
-#: unpack-trees.c:166
+#: refs/files-backend.c:1234
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
-msgstr ""
-"无法更新稀疏检出：如下条目不是最新：\n"
-"%s"
+msgid "could not remove reference %s"
+msgstr "无法删除引用 %s"
-#: unpack-trees.c:168
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"工作区中下列文件将被稀疏检出更新所覆盖：\n"
-"%s"
+msgid "could not delete reference %s: %s"
+msgstr "无法删除引用 %s：%s"
-#: unpack-trees.c:170
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"工作区中下列文件将被稀疏检出更新所删除：\n"
-"%s"
+msgid "could not delete references: %s"
+msgstr "无法删除引用：%s"
-#: unpack-trees.c:172
+#: refspec.c:137
#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr ""
-"无法更新子模组：\n"
-"%s"
+msgid "invalid refspec '%s'"
+msgstr "无效的引用表达式：'%s'"
+
+#: ref-filter.c:39 wt-status.c:1909
+msgid "gone"
+msgstr "丢失"
-#: unpack-trees.c:249
+#: ref-filter.c:40
#, c-format
-msgid "Aborting\n"
-msgstr "终止中\n"
+msgid "ahead %d"
+msgstr "领先 %d"
-#: unpack-trees.c:331
-msgid "Checking out files"
-msgstr "正在检出文件"
+#: ref-filter.c:41
+#, c-format
+msgid "behind %d"
+msgstr "落后 %d"
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
+#: ref-filter.c:42
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "领先 %d，落后 %d"
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#: ref-filter.c:138
#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "æ\97 æ\95\88ç\9a\84 %XX 转ä¹\89åº\8få\88\97"
+msgid "expected format: %%(color:<color>)"
+msgstr "æ\9c\9fæ\9c\9bç\9a\84æ ¼å¼\8fï¼\9a%%(color:<é¢\9cè\89²>)"
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr "缺失主机名且 URL 方案不是 'file:'"
+#: ref-filter.c:140
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "未能识别的颜色：%%(color:%s)"
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr "一个 'file:' URL 不应该包含端口号"
+#: ref-filter.c:162
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "期望整数值 refname:lstrip=%s"
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr "主机名中包含无效的字符"
+#: ref-filter.c:166
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "期望整数值 refname:rstrip=%s"
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr "无效的端口号"
+#: ref-filter.c:168
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "未能识别的 %%(%s) 参数：%s"
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr "无效的 '..' 路径片段"
+#: ref-filter.c:223
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) 不带参数"
-#: worktree.c:245
+#: ref-filter.c:245
#, c-format
-msgid "failed to read '%s'"
-msgstr "æ\97 æ³\95读å\8f\96 '%s'"
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "æ\9cªè\83½è¯\86å\88«ç\9a\84 %%(objectsize) å\8f\82æ\95°ï¼\9a%s"
-#: wrapper.c:223 wrapper.c:393
+#: ref-filter.c:253
#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "无法打开 '%s' 进行读写"
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) 不带参数"
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
-#: builtin/am.c:858 builtin/merge.c:1041
+#: ref-filter.c:265
#, c-format
-msgid "could not open '%s' for reading"
-msgstr "无法打开 '%s' 进行读取"
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) 不带参数"
-#: wrapper.c:424 wrapper.c:624
+#: ref-filter.c:274
#, c-format
-msgid "unable to access '%s'"
-msgstr "不能访问 '%s'"
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) 不带参数"
-#: wrapper.c:632
-msgid "unable to get current working directory"
-msgstr "不能获取当前工作目录"
+#: ref-filter.c:296
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "未知的 %%(trailers) 参数：%s"
-#: wrapper.c:656
+#: ref-filter.c:325
#, c-format
-msgid "could not write to %s"
-msgstr "不能写入 %s"
+msgid "positive value expected contents:lines=%s"
+msgstr "期望一个正数 contents:lines=%s"
-#: wrapper.c:658
+#: ref-filter.c:327
#, c-format
-msgid "could not close %s"
-msgstr "不能关闭 %s"
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "未能识别的 %%(contents) 参数：%s"
-#: wt-status.c:150
-msgid "Unmerged paths:"
-msgstr "未合并的路径："
+#: ref-filter.c:342
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "期望一个正数 objectname:short=%s"
-# 译者：注意保持前导空格
-#: wt-status.c:177 wt-status.c:204
+#: ref-filter.c:346
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "未能识别的 %%(objectname) 参数：%s"
-# 译者：注意保持前导空格
-#: wt-status.c:179 wt-status.c:206
-msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"
+#: ref-filter.c:376
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "期望的格式：%%(align:<宽度>,<位置>)"
-# 译者：注意保持前导空格
-#: wt-status.c:183
-msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr " （使用 \"git add <文件>...\" 标记解决方案）"
+#: ref-filter.c:388
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "未能识别的位置：%s"
-# 译者：注意保持前导空格
-#: wt-status.c:185 wt-status.c:189
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
+#: ref-filter.c:395
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "未能识别的宽度：%s"
-# 译者：注意保持前导空格
-#: wt-status.c:187
-msgid " (use \"git rm <file>...\" to mark resolution)"
-msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
+#: ref-filter.c:404
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "未能识别的 %%(align) 参数：%s"
-#: wt-status.c:198 wt-status.c:979
-msgid "Changes to be committed:"
-msgstr "要提交的变更："
+#: ref-filter.c:412
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "元素 %%(align) 需要一个正数的宽度"
-#: wt-status.c:216 wt-status.c:988
-msgid "Changes not staged for commit:"
-msgstr "尚未暂存以备提交的变更："
+#: ref-filter.c:430
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "未能识别的 %%(if) 参数：%s"
-# 译者：注意保持前导空格
-#: wt-status.c:220
-msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"
+#: ref-filter.c:531
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "格式错误的字段名：%.*s"
-# 译者：注意保持前导空格
-#: wt-status.c:222
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
+#: ref-filter.c:558
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "未知的字段名：%.*s"
-# 译者：注意保持前导空格
-#: wt-status.c:223
+#: ref-filter.c:562
+#, c-format
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
-msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr "不是一个 git 仓库，但是字段 '%.*s' 需要访问对象数据"
-# 译者：注意保持前导空格
-#: wt-status.c:225
-msgid " (commit or discard the untracked or modified content in submodules)"
-msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
+#: ref-filter.c:686
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"
-# 译者：注意保持前导空格
-#: wt-status.c:237
+#: ref-filter.c:749
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
-#: wt-status.c:252
-msgid "both deleted:"
-msgstr "双方删除："
+#: ref-filter.c:751
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "格式：%%(then) 元素用了多次"
-#: wt-status.c:254
-msgid "added by us:"
-msgstr "由我们添加："
-
-#: wt-status.c:256
-msgid "deleted by them:"
-msgstr "由他们删除："
+#: ref-filter.c:753
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
-#: wt-status.c:258
-msgid "added by them:"
-msgstr "由他们添加："
+#: ref-filter.c:781
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
-#: wt-status.c:260
-msgid "deleted by us:"
-msgstr "由我们删除："
+#: ref-filter.c:783
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"
-#: wt-status.c:262
-msgid "both added:"
-msgstr "双方添加："
+#: ref-filter.c:785
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "格式：%%(else) 元素用了多次"
-#: wt-status.c:264
-msgid "both modified:"
-msgstr "双方修改："
+#: ref-filter.c:800
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
-#: wt-status.c:274
-msgid "new file:"
-msgstr "新文件："
+#: ref-filter.c:857
+#, c-format
+msgid "malformed format string %s"
+msgstr "错误的格式化字符串 %s"
-#: wt-status.c:276
-msgid "copied:"
-msgstr "拷贝："
+#: ref-filter.c:1453
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "（非分支，正变基 %s）"
-#: wt-status.c:278
-msgid "deleted:"
-msgstr "删除："
+#: ref-filter.c:1456
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "（非分支，正变基分离头指针 %s）"
-#: wt-status.c:280
-msgid "modified:"
-msgstr "修改："
+#: ref-filter.c:1459
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "（非分支，二分查找开始于 %s）"
-#: wt-status.c:282
-msgid "renamed:"
-msgstr "重命名："
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1467
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "（头指针分离于 %s）"
-#: wt-status.c:284
-msgid "typechange:"
-msgstr "类型变更："
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1474
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "（头指针分离自 %s）"
-#: wt-status.c:286
-msgid "unknown:"
-msgstr "未知："
+#: ref-filter.c:1478
+msgid "(no branch)"
+msgstr "（非分支）"
-#: wt-status.c:288
-msgid "unmerged:"
-msgstr "未合并："
+#: ref-filter.c:1512 ref-filter.c:1669
+#, c-format
+msgid "missing object %s for %s"
+msgstr "缺失 %2$s 的对象 %1$s"
-# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:370
-msgid "new commits, "
-msgstr "新提交, "
+#: ref-filter.c:1522
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:372
-msgid "modified content, "
-msgstr "修改的内容, "
+#: ref-filter.c:1888
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "格式错误的对象 '%s'"
-# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:374
-msgid "untracked content, "
-msgstr "未跟踪的内容, "
+#: ref-filter.c:1977
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "忽略带有错误名称 %s 的引用"
-#: wt-status.c:819
+#: ref-filter.c:2263
#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] "您的贮藏区当前有 %d 条记录"
-msgstr[1] "您的贮藏区当前有 %d 条记录"
+msgid "format: %%(end) atom missing"
+msgstr "格式：缺少 %%(end) 元素"
-#: wt-status.c:851
-msgid "Submodules changed but not updated:"
-msgstr "子模组已修改但尚未更新："
+#: ref-filter.c:2363
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr "选项 `%s' 和 --merged 不兼容"
-#: wt-status.c:853
-msgid "Submodule changes to be committed:"
-msgstr "要提交的子模组变更："
+#: ref-filter.c:2366
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr "选项 `%s' 和 --no-merged 不兼容"
-#: wt-status.c:935
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-"不要改动或删除上面的一行。\n"
-"其下所有内容都将被忽略。"
+#: ref-filter.c:2376
+#, c-format
+msgid "malformed object name %s"
+msgstr "格式错误的对象名 %s"
-#: wt-status.c:1048
-msgid "You have unmerged paths."
-msgstr "您有尚未合并的路径。"
+#: ref-filter.c:2381
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "选项 `%s' 必须指向一个提交"
-# 译者：注意保持前导空格
-#: wt-status.c:1051
-msgid " (fix conflicts and run \"git commit\")"
-msgstr " （解决冲突并运行 \"git commit\"）"
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "配置的远程短名称不能以 '/' 开始：%s"
-# 译者：注意保持前导空格
-#: wt-status.c:1053
-msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr " （使用 \"git merge --abort\" 终止合并）"
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr "提供了一个以上的 receivepack，使用第一个"
-#: wt-status.c:1058
-msgid "All conflicts fixed but you are still merging."
-msgstr "æ\89\80æ\9c\89å\86²çª\81已解å\86³ä½\86æ\82¨ä»\8då¤\84äº\8eå\90\88并ä¸ã\80\82"
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr "æ\8f\90ä¾\9bäº\86ä¸\80个以ä¸\8aç\9a\84 uploadpackï¼\8c使ç\94¨ç¬¬ä¸\80个"
-# 译者：注意保持前导空格
-#: wt-status.c:1061
-msgid " (use \"git commit\" to conclude merge)"
-msgstr " （使用 \"git commit\" 结束合并）"
+#: remote.c:608
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "不能同时获取 %s 和 %s 至 %s"
-#: wt-status.c:1071
-msgid "You are in the middle of an am session."
-msgstr "您正处于 am 操作过程中。"
+#: remote.c:612
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s 通常跟踪 %s，而非 %s"
-#: wt-status.c:1074
-msgid "The current patch is empty."
-msgstr "当前的补丁为空。"
+#: remote.c:616
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s 同时跟踪 %s 和 %s"
-# 译者：注意保持前导空格
-#: wt-status.c:1078
-msgid " (fix conflicts and then run \"git am --continue\")"
-msgstr " （解决冲突，然后运行 \"git am --continue\"）"
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "模式的键 '%s' 没有 '*'"
-# 译者：注意保持前导空格
-#: wt-status.c:1080
-msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " （使用 \"git am --skip\" 跳过此补丁）"
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "模式的值 '%s' 没有 '*'"
-# 译者：注意保持前导空格
-#: wt-status.c:1082
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr " （使用 \"git am --abort\" 恢复原有分支）"
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "源引用表达式 %s 没有匹配"
-#: wt-status.c:1214
-msgid "git-rebase-todo is missing."
-msgstr "git-rebase-todo 丢失。"
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "源引用表达式 %s 匹配超过一个"
-#: wt-status.c:1216
-msgid "No commands done."
-msgstr "没有命令被执行。"
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+" refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"您提供的目标不是一个完整的引用名称（即以 \"refs/\" 开头）。我们\n"
+"试着猜测您的想法：\n"
+"\n"
+"- 在远端查询和 '%s' 匹配的引用。\n"
+"- 检查要推送的 <src>（'%s'）是不是在 \"refs/{heads,tags}/\" 中的\n"
+" 引用。如果是，我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
+"\n"
+"都不行，所以我们已放弃。您必须给出完整的引用。"
-#: wt-status.c:1219
+#: remote.c:1040
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "最后一条命令已完成（%d 条命令被执行）："
-msgstr[1] "最后的命令已完成（%d 条命令被执行）："
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
+"'%s:refs/heads/%s' 推送么？"
-#: wt-status.c:1230
+#: remote.c:1045
#, c-format
-msgid " (see more in file %s)"
-msgstr " （更多参见文件 %s）"
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
+"'%s:refs/tags/%s' 推送么？"
-#: wt-status.c:1235
-msgid "No commands remaining."
-msgstr "未剩下任何命令。"
+#: remote.c:1050
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
+"'%s:refs/tags/%s' 推送么？"
-#: wt-status.c:1238
+#: remote.c:1055
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："
-msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
+"'%s:refs/tags/%s' 推送么？"
-# 译者：注意保持前导空格
-#: wt-status.c:1246
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s 无法被解析为分支"
-#: wt-status.c:1259
+#: remote.c:1102
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "æ\82¨å\9c¨æ\89§è¡\8cå°\86å\88\86æ\94¯ '%s' å\8f\98å\9fºå\88° '%s' ç\9a\84æ\93\8dä½\9cã\80\82"
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "æ\97 æ³\95å\88 é\99¤ '%s'ï¼\9aè¿\9cç¨\8bå¼\95ç\94¨ä¸\8då\98å\9c¨"
-#: wt-status.c:1264
-msgid "You are currently rebasing."
-msgstr "您在执行变基操作。"
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "目标引用表达式 %s 匹配超过一个"
-# 译者：注意保持前导空格
-#: wt-status.c:1278
-msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "目标引用 %s 接收超过一个源"
-# 译者：注意保持前导空格
-#: wt-status.c:1280
-msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
+#: remote.c:1624 remote.c:1725
+msgid "HEAD does not point to a branch"
+msgstr "HEAD 没有指向一个分支"
-# 译者：注意保持前导空格
-#: wt-status.c:1282
-msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
+#: remote.c:1633
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "没有此分支：'%s'"
-# 译者：注意保持前导空格
-#: wt-status.c:1288
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
-msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
+#: remote.c:1636
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "尚未给分支 '%s' 设置上游"
-#: wt-status.c:1292
+#: remote.c:1642
#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: wt-status.c:1297
-msgid "You are currently splitting a commit during a rebase."
-msgstr "您在执行变基操作时拆分提交。"
+#: remote.c:1657
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
-# 译者：注意保持前导空格
-#: wt-status.c:1300
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
+#: remote.c:1669
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "分支 '%s' 没有设置要推送的远程服务器"
-#: wt-status.c:1304
+#: remote.c:1679
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "向 '%s' 推送引用规格未包含 '%s'"
-#: wt-status.c:1309
-msgid "You are currently editing a commit during a rebase."
-msgstr "æ\82¨å\9c¨æ\89§è¡\8cå\8f\98å\9fºæ\93\8dä½\9cæ\97¶ç¼\96è¾\91æ\8f\90交ã\80\82"
+#: remote.c:1692
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "æ\8e¨é\80\81æ\97 ç\9b®æ \87ï¼\88push.default æ\98¯ 'nothing'ï¼\89"
-# 译者：注意保持前导空格
-#: wt-status.c:1312
-msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr " （使用 \"git commit --amend\" 修补当前提交）"
+#: remote.c:1714
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "无法解析 'simple' 推送至一个单独的目标"
-# 译者：注意保持前导空格
-#: wt-status.c:1314
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "无法找到远程引用 %s"
-#: wt-status.c:1324
+#: remote.c:1853
#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "您在执行拣选提交 %s 的操作。"
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* 在本地忽略可笑的引用 '%s'"
-# 译者：注意保持前导空格
-#: wt-status.c:1329
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
+#: remote.c:2016
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
-# 译者：注意保持前导空格
-#: wt-status.c:1332
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
+#: remote.c:2020
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
-# 译者：注意保持前导空格
-#: wt-status.c:1334
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
+#: remote.c:2023
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: wt-status.c:1343
+#: remote.c:2027
#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "您在执行反转提交 %s 的操作。"
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "您的分支和 '%s' 指向不同的提交。\n"
-# 译者：注意保持前导空格
-#: wt-status.c:1348
-msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr " （解决冲突并运行 \"git revert --continue\"）"
+#: remote.c:2030
+#, c-format
+msgid " (use \"%s\" for details)\n"
+msgstr " （使用 \"%s\" 查看详情）\n"
-# 译者：注意保持前导空格
-#: wt-status.c:1351
-msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"
+#: remote.c:2034
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
+msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
-# 译者：注意保持前导空格
-#: wt-status.c:1353
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
+#: remote.c:2040
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
-#: wt-status.c:1364
+#: remote.c:2043
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
-
-#: wt-status.c:1368
-msgid "You are currently bisecting."
-msgstr "您在执行二分查找操作。"
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
+msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
# 译者：注意保持前导空格
-#: wt-status.c:1371
-msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
+#: remote.c:2051
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
-#: wt-status.c:1568
-msgid "On branch "
-msgstr "位于分支 "
+#: remote.c:2054
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"您的分支和 '%s' 出现了偏离，\n"
+"并且分别有 %d 和 %d 处不同的提交。\n"
+msgstr[1] ""
+"您的分支和 '%s' 出现了偏离，\n"
+"并且分别有 %d 和 %d 处不同的提交。\n"
-#: wt-status.c:1574
-msgid "interactive rebase in progress; onto "
-msgstr "交互式变基操作正在进行中；至 "
+# 译者：注意保持前导空格
+#: remote.c:2064
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr " （使用 \"git pull\" 来合并远程分支）\n"
-#: wt-status.c:1576
-msgid "rebase in progress; onto "
-msgstr "变基操作正在进行中；至 "
+#: remote.c:2247
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "无法解析期望的对象名 '%s'"
-#: wt-status.c:1581
-msgid "HEAD detached at "
-msgstr "头指针分离于 "
+#: replace-object.c:21
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "错误的替换引用名称：%s"
-#: wt-status.c:1583
-msgid "HEAD detached from "
-msgstr "头指针分离自 "
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "重复的替换引用：%s"
-#: wt-status.c:1586
-msgid "Not currently on any branch."
-msgstr "当前不在任何分支上。"
+#: replace-object.c:73
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "对象 %s 的替换层级太深"
-#: wt-status.c:1606
-msgid "Initial commit"
-msgstr "初始提交"
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
+msgstr "损坏的 MERGE_RR"
-#: wt-status.c:1607
-msgid "No commits yet"
-msgstr "尚无提交"
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
+msgstr "无法写入 rerere 记录"
-#: wt-status.c:1621
-msgid "Untracked files"
-msgstr "未跟踪的文件"
+#: rerere.c:495
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "写入 '%s' (%s) 时出错"
-#: wt-status.c:1623
-msgid "Ignored files"
-msgstr "忽略的文件"
+#: rerere.c:498
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "刷新 '%s' 失败"
-#: wt-status.c:1627
+#: rerere.c:503 rerere.c:1039
#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr ""
-"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
-"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
+msgid "could not parse conflict hunks in '%s'"
+msgstr "不能解析 '%s' 中的冲突块"
-#: wt-status.c:1633
+#: rerere.c:684
#, c-format
-msgid "Untracked files not listed%s"
-msgstr "未跟踪的文件没有列出%s"
+msgid "failed utime() on '%s'"
+msgstr "在 '%s' 上调用 utime() 失败"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1635
-msgid " (use -u option to show untracked files)"
-msgstr "（使用 -u 参数显示未跟踪的文件）"
+#: rerere.c:694
+#, c-format
+msgid "writing '%s' failed"
+msgstr "写入 '%s' 失败"
-#: wt-status.c:1641
-msgid "No changes"
-msgstr "没有修改"
+#: rerere.c:714
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "使用之前的解决方案暂存 '%s'。"
-#: wt-status.c:1646
+#: rerere.c:753
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
+msgid "Recorded resolution for '%s'."
+msgstr "已记录 '%s' 的解决方案。"
-#: wt-status.c:1649
+#: rerere.c:788
#, c-format
-msgid "no changes added to commit\n"
-msgstr "ä¿®æ\94¹å°\9aæ\9cªå\8a å\85¥æ\8f\90交\n"
+msgid "Resolved '%s' using previous resolution."
+msgstr "使ç\94¨ä¹\8bå\89\8dç\9a\84解å\86³æ\96¹æ¡\88解å\86³ '%s'ã\80\82"
-#: wt-status.c:1652
+#: rerere.c:803
#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
+msgid "cannot unlink stray '%s'"
+msgstr "不能删除 stray '%s'"
-#: wt-status.c:1655
+#: rerere.c:807
#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "提交为空，但是存在尚未跟踪的文件\n"
+msgid "Recorded preimage for '%s'"
+msgstr "为 '%s' 记录 preimage"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1658
+#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
+msgid "could not create directory '%s'"
+msgstr "不能创建目录 '%s'"
-#: wt-status.c:1661 wt-status.c:1666
+#: rerere.c:1057
#, c-format
-msgid "nothing to commit\n"
-msgstr "æ\97 æ\96\87件è¦\81æ\8f\90交\n"
+msgid "failed to update conflicted state in '%s'"
+msgstr "æ\9b´æ\96° '%s' ä¸ç\9a\84å\86²çª\81ç\8a¶æ\80\81失败"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1664
+#: rerere.c:1068 rerere.c:1075
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "æ\97 æ\96\87件è¦\81æ\8f\90交ï¼\88使ç\94¨ -u æ\98¾ç¤ºæ\9cªè·\9f踪ç\9a\84æ\96\87件ï¼\89\n"
+msgid "no remembered resolution for '%s'"
+msgstr "没æ\9c\89为 '%s' è®°å¿\86ç\9a\84解å\86³æ\96¹æ¡\88"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1668
+#: rerere.c:1077
#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "无文件要提交，干净的工作区\n"
+msgid "cannot unlink '%s'"
+msgstr "不能删除 '%s'"
-#: wt-status.c:1780
-msgid "No commits yet on "
-msgstr "尚无提交在 "
+#: rerere.c:1087
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "已为 '%s' 更新 preimage"
-#: wt-status.c:1784
-msgid "HEAD (no branch)"
-msgstr "HEAD（非分支）"
+#: rerere.c:1096
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "忘记 '%s' 的解决方案\n"
-# 译者：注意保持句尾空格
-#: wt-status.c:1813 wt-status.c:1821
-msgid "behind "
-msgstr "落后 "
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
+msgstr "不能打开 rr-cache 目录"
-#: wt-status.c:1816 wt-status.c:1819
-msgid "ahead "
-msgstr "领先 "
+#: revision.c:2476
+msgid "your current branch appears to be broken"
+msgstr "您的当前分支好像被损坏"
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2311
+#: revision.c:2479
#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr "不能%s：您有未暂存的变更。"
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "您的当前分支 '%s' 尚无任何提交"
-#: wt-status.c:2317
-msgid "additionally, your index contains uncommitted changes."
-msgstr "另外，您的索引中包含未提交的变更。"
+#: revision.c:2679
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent 与 --bisect 不兼容"
+
+#: revision.c:2683
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
+
+#: run-command.c:763
+msgid "open /dev/null failed"
+msgstr "不能打开 /dev/null"
-#: wt-status.c:2319
+#: run-command.c:1269
#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
-msgstr "不能%s：您的索引中包含未提交的变更。"
+msgid "cannot create async thread: %s"
+msgstr "不能创建 async 线程：%s"
-#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#: run-command.c:1333
#, c-format
-msgid "failed to unlink '%s'"
-msgstr "无法删除 '%s'"
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
+"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
-#: builtin/add.c:24
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<选项>] [--] <路径规格>..."
+#: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "读取远程解包状态时收到意外的 flush 包"
-#: builtin/add.c:82
+#: send-pack.c:143
#, c-format
-msgid "unexpected diff status %c"
-msgstr "意外的差异状态 %c"
-
-#: builtin/add.c:87 builtin/commit.c:291
-msgid "updating files failed"
-msgstr "更新文件失败"
+msgid "unable to parse remote unpack status: %s"
+msgstr "不能解析远程解包状态：%s"
-#: builtin/add.c:97
+#: send-pack.c:145
#, c-format
-msgid "remove '%s'\n"
-msgstr "删除 '%s'\n"
+msgid "remote unpack failed: %s"
+msgstr "远程解包失败：%s"
-#: builtin/add.c:153
-msgid "Unstaged changes after refreshing the index:"
-msgstr "刷新索引之后尚未被暂存的变更："
+#: send-pack.c:306
+msgid "failed to sign the push certificate"
+msgstr "为推送证书签名失败"
-#: builtin/add.c:213 builtin/rev-parse.c:888
-msgid "Could not read the index"
-msgstr "不能读取索引"
+#: send-pack.c:420
+msgid "the receiving end does not support --signed push"
+msgstr "接收端不支持签名推送"
-#: builtin/add.c:224
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "无法打开 '%s' 进行写入。"
+#: send-pack.c:422
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr "未发送推送证书，因为接收端不支持签名推送"
-#: builtin/add.c:228
-msgid "Could not write patch"
-msgstr "ä¸\8dè\83½ç\94\9fæ\88\90è¡¥ä¸\81"
+#: send-pack.c:434
+msgid "the receiving end does not support --atomic push"
+msgstr "æ\8e¥æ\94¶ç«¯ä¸\8dæ\94¯æ\8c\81å\8e\9få\90æ\8e¨é\80\81"
-#: builtin/add.c:231
-msgid "editing patch failed"
-msgstr "编辑补丁失败"
+#: send-pack.c:439
+msgid "the receiving end does not support push options"
+msgstr "接收端不支持推送选项"
-#: builtin/add.c:234
+#: sequencer.c:187
#, c-format
-msgid "Could not stat '%s'"
-msgstr "不能对 '%s' 调用 stat"
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "无效的提交信息清理模式 '%s'"
-#: builtin/add.c:236
-msgid "Empty patch. Aborted."
-msgstr "空补丁。异常终止。"
-
-#: builtin/add.c:241
+#: sequencer.c:292
#, c-format
-msgid "Could not apply '%s'"
-msgstr "不能应用 '%s'"
-
-#: builtin/add.c:251
-msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
+msgid "could not delete '%s'"
+msgstr "无法删除 '%s'"
-#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
-msgid "dry run"
-msgstr "演习"
+#: sequencer.c:318
+msgid "revert"
+msgstr "还原"
-#: builtin/add.c:274
-msgid "interactive picking"
-msgstr "交互式拣选"
+#: sequencer.c:320
+msgid "cherry-pick"
+msgstr "拣选"
-#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
-msgid "select hunks interactively"
-msgstr "交互式挑选数据块"
+#: sequencer.c:322
+msgid "rebase -i"
+msgstr "rebase -i"
-#: builtin/add.c:276
-msgid "edit current diff and apply"
-msgstr "编辑当前差异并应用"
+#: sequencer.c:324
+#, c-format
+msgid "unknown action: %d"
+msgstr "未知动作：%d"
-#: builtin/add.c:277
-msgid "allow adding otherwise ignored files"
-msgstr "允许添加忽略的文件"
+#: sequencer.c:382
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
+"命令标记修正后的文件"
-#: builtin/add.c:278
-msgid "update tracked files"
-msgstr "更新已跟踪的文件"
+#: sequencer.c:385
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'\n"
+"and commit the result with 'git commit'"
+msgstr ""
+"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
+"对修正后的文件做标记，然后用 'git commit' 提交"
-#: builtin/add.c:279
-msgid "record only the fact that the path will be added later"
-msgstr "只记录，该路径稍后再添加"
+#: sequencer.c:398 sequencer.c:2801
+#, c-format
+msgid "could not lock '%s'"
+msgstr "不能锁定 '%s'"
-#: builtin/add.c:280
-msgid "add changes from all tracked and untracked files"
-msgstr "添加所有改变的已跟踪文件和未跟踪文件"
+#: sequencer.c:405
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "不能将换行符写入 '%s'"
-#: builtin/add.c:283
-msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
+#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
+#: sequencer.c:3084
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "无法完成 '%s'"
-#: builtin/add.c:285
-msgid "don't add, only refresh the index"
-msgstr "不添加，只刷新索引"
+#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
+#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
+#: builtin/merge.c:1115 builtin/rebase.c:567
+#, c-format
+msgid "could not read '%s'"
+msgstr "不能读取 '%s'"
-#: builtin/add.c:286
-msgid "just skip files which cannot be added because of errors"
-msgstr "跳过因出错不能添加的文件"
+#: sequencer.c:459
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "您的本地修改将被%s覆盖。"
-#: builtin/add.c:287
-msgid "check if - even missing - files are ignored in dry run"
-msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
+#: sequencer.c:463
+msgid "commit your changes or stash them to proceed."
+msgstr "提交您的修改或贮藏后再继续。"
+
+#: sequencer.c:495
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s：快进"
-#: builtin/add.c:288 builtin/update-index.c:954
-msgid "(+/-)x"
-msgstr "(+/-)x"
+#: sequencer.c:534 builtin/tag.c:555
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "无效的清理模式 %s"
-#: builtin/add.c:288 builtin/update-index.c:955
-msgid "override the executable bit of the listed files"
-msgstr "覆盖列表里文件的可执行位"
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#.
+#: sequencer.c:629
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s：无法写入新索引文件"
-#: builtin/add.c:290
-msgid "warn when adding an embedded repository"
-msgstr "创建一个嵌入式仓库时给予警告"
+#: sequencer.c:646
+msgid "unable to update cache tree"
+msgstr "不能更新缓存树"
-#: builtin/add.c:305
+#: sequencer.c:660
+msgid "could not resolve HEAD commit"
+msgstr "不能解析 HEAD 提交"
+
+#: sequencer.c:740
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "在 '%.*s' 中没有 key"
+
+#: sequencer.c:751
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "无法为 '%s' 的值去引号"
+
+#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "无法打开 '%s' 进行读取"
+
+#: sequencer.c:798
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "已经给出 'GIT_AUTHOR_NAME'"
+
+#: sequencer.c:803
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
+
+#: sequencer.c:808
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "已经给出 'GIT_AUTHOR_DATE'"
+
+#: sequencer.c:812
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "未知变量 '%s'"
+
+#: sequencer.c:817
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "缺少 'GIT_AUTHOR_NAME'"
+
+#: sequencer.c:819
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "缺少 'GIT_AUTHOR_EMAIL'"
+
+#: sequencer.c:821
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "缺少 'GIT_AUTHOR_DATE'"
+
+#: sequencer.c:881
+#, c-format
+msgid "invalid date format '%s' in '%s'"
+msgstr "'%2$s' 中无效的日期格式 '%1$s'"
+
+#: sequencer.c:898
#, c-format
msgid ""
-"You've added another git repository inside your current repository.\n"
-"Clones of the outer repository will not contain the contents of\n"
-"the embedded repository and will not know how to obtain it.\n"
-"If you meant to add a submodule, use:\n"
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
"\n"
-"\tgit submodule add <url> %s\n"
+" git commit --amend %s\n"
"\n"
-"If you added this path by mistake, you can remove it from the\n"
-"index with:\n"
+"If they are meant to go into a new commit, run:\n"
"\n"
-"\tgit rm --cached %s\n"
+" git commit %s\n"
"\n"
-"See \"git help submodule\" for more information."
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
msgstr ""
-"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容，并"
-"且不知道该如何获取它。\n"
-"如果您要添加一个子模组，使用：\n"
+"您的工作区中存在已暂存的修改\n"
+"如果这些修改需要被并入前一个提交，执行：\n"
"\n"
-"\tgit submodule add <url> %s\n"
+" git commit --amend %s\n"
"\n"
-"如果您不小心添加了这个路径，可以用下面的命令将其从索引中删除：\n"
+"如果这些修改要形成一个新提交，执行：\n"
"\n"
-"\tgit rm --cached %s\n"
+" git commit %s\n"
"\n"
-"参见 \"git help submodule\" 获取更多信息。"
+"无论哪种情况，当您完成提交，继续执行：\n"
+"\n"
+" git rebase --continue\n"
-#: builtin/add.c:333
-#, c-format
-msgid "adding embedded git repository: %s"
-msgstr "正在添加嵌入式 git 仓库：%s"
+#: sequencer.c:992
+msgid "writing root commit"
+msgstr "写根提交"
-#: builtin/add.c:351
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "使用 -f 参数如果您确实要添加它们。\n"
+#: sequencer.c:1213
+msgid "'prepare-commit-msg' hook failed"
+msgstr "'prepare-commit-msg' 钩子失败"
-#: builtin/add.c:359
-msgid "adding files failed"
-msgstr "添加文件失败"
+#: sequencer.c:1220
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
+msgstr ""
+"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
+"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
+"中编辑您的配置文件：\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
+"\n"
+" git commit --amend --reset-author\n"
-#: builtin/add.c:396
-msgid "-A and -u are mutually incompatible"
-msgstr "-A 和 -u 选项互斥"
+#: sequencer.c:1233
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
+msgstr ""
+"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
+"与否。您可以对其进行设置以免再出现本提示信息：\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
+"\n"
+" git commit --amend --reset-author\n"
-#: builtin/add.c:403
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
+#: sequencer.c:1275
+msgid "couldn't look up newly created commit"
+msgstr "无法找到新创建的提交"
-#: builtin/add.c:407
-#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
-msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
+#: sequencer.c:1277
+msgid "could not parse newly created commit"
+msgstr "不能解析新创建的提交"
-#: builtin/add.c:422
-#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr "没有指定文件，也没有文件被添加。\n"
+#: sequencer.c:1323
+msgid "unable to resolve HEAD after creating commit"
+msgstr "创建提交后，不能解析 HEAD"
+
+#: sequencer.c:1325
+msgid "detached HEAD"
+msgstr "分离头指针"
-#: builtin/add.c:423
+# 译者：中文字符串拼接，可删除前导空格
+#: sequencer.c:1329
+msgid " (root-commit)"
+msgstr "（根提交）"
+
+#: sequencer.c:1350
+msgid "could not parse HEAD"
+msgstr "不能解析 HEAD"
+
+#: sequencer.c:1352
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "也许您想要执行 'git add .'？\n"
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s 不是一个提交！"
-#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350
-#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271
-#: builtin/submodule--helper.c:243
-msgid "index file corrupt"
-msgstr "索引文件损坏"
+#: sequencer.c:1356 builtin/commit.c:1551
+msgid "could not parse HEAD commit"
+msgstr "不能解析 HEAD 提交"
-#: builtin/am.c:414
-msgid "could not parse author script"
-msgstr "不能解析作者脚本"
+#: sequencer.c:1408 sequencer.c:2001
+msgid "unable to parse commit author"
+msgstr "不能解析提交作者"
+
+#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree 无法写入树对象"
-#: builtin/am.c:498
+#: sequencer.c:1435 sequencer.c:1496
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "'%s' 被 applypatch-msg 钩子删除"
+msgid "unable to read commit message from '%s'"
+msgstr "不能从 '%s' 读取提交说明"
+
+#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882
+#: builtin/merge.c:906
+msgid "failed to write commit object"
+msgstr "写提交对象失败"
-#: builtin/am.c:539
+#: sequencer.c:1523
#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "非法的输入行：'%s'。"
+msgid "could not parse commit %s"
+msgstr "不能解析提交 %s"
-#: builtin/am.c:576
+#: sequencer.c:1528
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "ä»\8e '%s' æ\8b·è´\9d注解å\88° '%s' æ\97¶å¤±è´¥"
+msgid "could not parse parent commit %s"
+msgstr "ä¸\8dè\83½è§£æ\9e\90ç\88¶æ\8f\90交 %s"
-#: builtin/am.c:602
-msgid "fseek failed"
-msgstr "fseek 失败"
+#: sequencer.c:1602 sequencer.c:1712
+#, c-format
+msgid "unknown command: %d"
+msgstr "未知命令：%d"
-#: builtin/am.c:786
+#: sequencer.c:1659 sequencer.c:1684
#, c-format
-msgid "could not parse patch '%s'"
-msgstr "无法解析补丁 '%s'"
+msgid "This is a combination of %d commits."
+msgstr "这是一个 %d 个提交的组合。"
-#: builtin/am.c:851
-msgid "Only one StGIT patch series can be applied at once"
-msgstr "一次只能有一个 StGIT 补丁队列被应用"
+#: sequencer.c:1669
+msgid "need a HEAD to fixup"
+msgstr "需要一个 HEAD 来修复"
-#: builtin/am.c:899
-msgid "invalid timestamp"
-msgstr "无效的时间戳"
+#: sequencer.c:1671 sequencer.c:3111
+msgid "could not read HEAD"
+msgstr "不能读取 HEAD"
-#: builtin/am.c:904 builtin/am.c:916
-msgid "invalid Date line"
-msgstr "无效的日期行"
+#: sequencer.c:1673
+msgid "could not read HEAD's commit message"
+msgstr "不能读取 HEAD 的提交说明"
-#: builtin/am.c:911
-msgid "invalid timezone offset"
-msgstr "无效的时区偏移值"
+#: sequencer.c:1679
+#, c-format
+msgid "cannot write '%s'"
+msgstr "不能写 '%s'"
-#: builtin/am.c:1004
-msgid "Patch format detection failed."
-msgstr "è¡¥ä¸\81æ ¼å¼\8fæ\8e¢æµ\8b失败ã\80\82"
+#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+msgid "This is the 1st commit message:"
+msgstr "è¿\99æ\98¯ç¬¬ä¸\80个æ\8f\90交说æ\98\8eï¼\9a"
-#: builtin/am.c:1009 builtin/clone.c:402
+#: sequencer.c:1694
#, c-format
-msgid "failed to create directory '%s'"
-msgstr "无法创建目录 '%s'"
+msgid "could not read commit message of %s"
+msgstr "不能读取 %s 的提交说明"
-#: builtin/am.c:1013
-msgid "Failed to split patches."
-msgstr "无法拆分补丁。"
+#: sequencer.c:1701
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "这是提交说明 #%d："
-#: builtin/am.c:1142 builtin/commit.c:376
-msgid "unable to write index file"
-msgstr "无法写入索引文件"
+#: sequencer.c:1707
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "提交说明 #%d 将被跳过："
+
+#: sequencer.c:1795
+msgid "your index file is unmerged."
+msgstr "您的索引文件未完成合并。"
+
+#: sequencer.c:1802
+msgid "cannot fixup root commit"
+msgstr "不能修复根提交"
-#: builtin/am.c:1193
+#: sequencer.c:1821
#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "当您解决这一问题，执行 \"%s --continue\"。"
+msgid "commit %s is a merge but no -m option was given."
+msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: builtin/am.c:1194
+#: sequencer.c:1829 sequencer.c:1837
#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
+msgid "commit %s does not have parent %d"
+msgstr "提交 %s 没有第 %d 个父提交"
-#: builtin/am.c:1195
+#: sequencer.c:1843
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
+msgid "cannot get commit message for %s"
+msgstr "不能得到 %s 的提交说明"
-#: builtin/am.c:1302
-msgid "Patch is empty."
-msgstr "补丁为空。"
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1862
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s：不能解析父提交 %s"
-#: builtin/am.c:1368
+#: sequencer.c:1927
#, c-format
-msgid "invalid ident line: %.*s"
-msgstr "无效的身份标识：%.*s"
+msgid "could not rename '%s' to '%s'"
+msgstr "不能将 '%s' 重命名为 '%s'"
-#: builtin/am.c:1390
+#: sequencer.c:1982
#, c-format
-msgid "unable to parse commit %s"
-msgstr "ä¸\8dè\83½è§£æ\9e\90æ\8f\90交 %s"
+msgid "could not revert %s... %s"
+msgstr "ä¸\8dè\83½è¿\98å\8e\9f %s... %s"
-#: builtin/am.c:1584
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr "仓库缺乏必要的数据对象以进行三方合并。"
+#: sequencer.c:1983
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "不能应用 %s... %s"
-#: builtin/am.c:1586
-msgid "Using index info to reconstruct a base tree..."
-msgstr "使用索引来重建一个（三方合并的）基础目录树..."
+#: sequencer.c:2042
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s：无法读取索引"
-#: builtin/am.c:1605
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr ""
-"您是否曾手动编辑过您的补丁？\n"
-"无法应用补丁到索引中的数据对象上。"
+#: sequencer.c:2049
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s：无法刷新索引"
-#: builtin/am.c:1611
-msgid "Falling back to patching base and 3-way merge..."
-msgstr "回落到基础版本上打补丁及进行三方合并..."
+#: sequencer.c:2118
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s 不接受参数：'%s'"
-#: builtin/am.c:1636
-msgid "Failed to merge in the changes."
-msgstr "无法合并变更。"
+#: sequencer.c:2127
+#, c-format
+msgid "missing arguments for %s"
+msgstr "缺少 %s 的参数"
-#: builtin/am.c:1660 builtin/merge.c:641
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree 无法写入一树对象"
+#: sequencer.c:2164
+#, c-format
+msgid "could not parse '%.*s'"
+msgstr "无法解析 '%.*s'"
-#: builtin/am.c:1667
-msgid "applying to an empty history"
-msgstr "正应用到一个空历史上"
+#: sequencer.c:2226
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "无效行 %d：%.*s"
-#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
-#: builtin/merge.c:849
-msgid "failed to write commit object"
-msgstr "æ\97 æ³\95å\86\99æ\8f\90交对象"
+#: sequencer.c:2237
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "没æ\9c\89ç\88¶æ\8f\90交ç\9a\84æ\83\85å\86µä¸\8bä¸\8dè\83½ '%s'"
-#: builtin/am.c:1713 builtin/am.c:1717
+#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
-msgid "cannot resume: %s does not exist."
-msgstr "无法继续：%s 不存在。"
+msgid "could not read '%s'."
+msgstr "不能读取 '%s'。"
-#: builtin/am.c:1733
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "标准输入没有和终端关联，不能进行交互式操作。"
+#: sequencer.c:2360
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: builtin/am.c:1738
-msgid "Commit Body is:"
-msgstr "提交内容为："
+#: sequencer.c:2362
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "不可用的指令清单：'%s'"
-# 译者：注意保持句尾空格
-#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
-#. in your translation. The program will only accept English
-#. input at this point.
-#.
-#: builtin/am.c:1748
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
+#: sequencer.c:2367
+msgid "no commits parsed."
+msgstr "没有解析提交。"
-#: builtin/am.c:1798
-#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr "脏索引：不能应用补丁（脏文件：%s）"
+#: sequencer.c:2378
+msgid "cannot cherry-pick during a revert."
+msgstr "不能在回退中执行拣选。"
+
+#: sequencer.c:2380
+msgid "cannot revert during a cherry-pick."
+msgstr "不能在拣选中执行回退。"
-#: builtin/am.c:1838 builtin/am.c:1910
+#: sequencer.c:2462
#, c-format
-msgid "Applying: %.*s"
-msgstr "应用：%.*s"
+msgid "invalid value for %s: %s"
+msgstr "%s 的值无效：%s"
-#: builtin/am.c:1854
-msgid "No changes -- Patch already applied."
-msgstr "没有变更 —— 补丁已经应用过。"
+#: sequencer.c:2549
+msgid "unusable squash-onto"
+msgstr "不可用的 squash-onto"
-#: builtin/am.c:1862
+#: sequencer.c:2565
#, c-format
-msgid "Patch failed at %s %.*s"
-msgstr "æ\89\93è¡¥ä¸\81失败äº\8e %s %.*s"
+msgid "malformed options sheet: '%s'"
+msgstr "æ ¼å¼\8fé\94\99误ç\9a\84é\80\89项æ¸\85å\8d\95ï¼\9a'%s'"
-#: builtin/am.c:1868
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "失败的补丁文件副本位于：%s"
+#: sequencer.c:2648 sequencer.c:4227
+msgid "empty commit set passed"
+msgstr "提供了空的提交集"
-#: builtin/am.c:1913
-msgid ""
-"No changes - did you forget to use 'git add'?\n"
-"If there is nothing left to stage, chances are that something else\n"
-"already introduced the same changes; you might want to skip this patch."
-msgstr ""
-"没有变更 —— 您是不是忘了执行 'git add'？\n"
-"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
-"您也许想要跳过这个补丁。"
+#: sequencer.c:2656
+msgid "a cherry-pick or revert is already in progress"
+msgstr "一个拣选或还原操作已在进行"
-#: builtin/am.c:1920
-msgid ""
-"You still have unmerged paths in your index.\n"
-"You should 'git add' each file with resolved conflicts to mark them as "
-"such.\n"
-"You might run `git rm` on a file to accept \"deleted by them\" for it."
-msgstr ""
-"在您的索引中仍存在未合并的路径。\n"
-"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
-"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
+#: sequencer.c:2657
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
-#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
-#: builtin/reset.c:340
+#: sequencer.c:2660
#, c-format
-msgid "Could not parse object '%s'."
-msgstr "不能解析对象 '%s'。"
+msgid "could not create sequencer directory '%s'"
+msgstr "不能创建序列目录 '%s'"
-#: builtin/am.c:2081
-msgid "failed to clean index"
-msgstr "无法清空索引"
+#: sequencer.c:2674
+msgid "could not lock HEAD"
+msgstr "不能锁定 HEAD"
-#: builtin/am.c:2116
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
-msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
+#: sequencer.c:2729 sequencer.c:3979
+msgid "no cherry-pick or revert in progress"
+msgstr "拣选或还原操作并未进行"
-#: builtin/am.c:2179
-#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "无效的 --patch-format 值：%s"
+#: sequencer.c:2731
+msgid "cannot resolve HEAD"
+msgstr "不能解析 HEAD"
-#: builtin/am.c:2212
-msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
-msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
+#: sequencer.c:2733 sequencer.c:2768
+msgid "cannot abort from a branch yet to be born"
+msgstr "不能从尚未建立的分支终止"
-#: builtin/am.c:2213
-msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [<选项>] (--continue | --skip | --abort)"
+#: sequencer.c:2754 builtin/grep.c:732
+#, c-format
+msgid "cannot open '%s'"
+msgstr "不能打开 '%s'"
-#: builtin/am.c:2219
-msgid "run interactively"
-msgstr "以交互式方式运行"
+#: sequencer.c:2756
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "不能读取 '%s'：%s"
-#: builtin/am.c:2221
-msgid "historical option -- no-op"
-msgstr "老的参数 —— 无作用"
+#: sequencer.c:2757
+msgid "unexpected end of file"
+msgstr "意外的文件结束"
-#: builtin/am.c:2223
-msgid "allow fall back on 3way merging if needed"
-msgstr "如果必要，允许使用三方合并。"
+#: sequencer.c:2763
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
-msgid "be quiet"
-msgstr "静默模式"
+#: sequencer.c:2774
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-#: builtin/am.c:2226
-msgid "add a Signed-off-by line to the commit message"
-msgstr "在提交说明中添加一个 Signed-off-by 签名"
+#: sequencer.c:2903 sequencer.c:3894
+#, c-format
+msgid "could not update %s"
+msgstr "不能更新 %s"
-#: builtin/am.c:2229
-msgid "recode into utf8 (default)"
-msgstr "使ç\94¨ utf8 å\97符é\9b\86ï¼\88é»\98认ï¼\89"
+#: sequencer.c:2941 sequencer.c:3874
+msgid "cannot read HEAD"
+msgstr "ä¸\8dè\83½è¯»å\8f\96 HEAD"
-#: builtin/am.c:2231
-msgid "pass -k flag to git-mailinfo"
-msgstr "向 git-mailinfo 传递 -k 参数"
+#: sequencer.c:2958
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "无法拷贝 '%s' 至 '%s'"
-#: builtin/am.c:2233
-msgid "pass -b flag to git-mailinfo"
-msgstr "向 git-mailinfo 传递 -b 参数"
+#: sequencer.c:2966
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"您现在可以修补这个提交，使用\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"当您对变更感到满意，执行\n"
+"\n"
+" git rebase --continue\n"
-#: builtin/am.c:2235
-msgid "pass -m flag to git-mailinfo"
-msgstr "向 git-mailinfo 传递 -m 参数"
+#: sequencer.c:2976
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "不能应用 %s... %.*s"
-#: builtin/am.c:2237
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
+#: sequencer.c:2983
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "不能合并 %.*s"
-#: builtin/am.c:2240
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
+#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "不能拷贝 '%s' 至 '%s'"
-#: builtin/am.c:2243
-msgid "strip everything before a scissors line"
-msgstr "丢弃裁切线前的所有内容"
+#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580
+#: builtin/rebase.c:1940 builtin/rebase.c:1995
+msgid "could not read index"
+msgstr "不能读取索引"
-#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254
-#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266
-#: builtin/am.c:2272
-msgid "pass it through git-apply"
-msgstr "传递给 git-apply"
+# 译者：注意保持前导空格
+#: sequencer.c:3028
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"执行失败：%s\n"
+"%s您可以改正该问题，然后运行\n"
+"\n"
+" git rebase --continue\n"
+"\n"
-#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667
-#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197
-#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
-msgid "n"
-msgstr "n"
+#: sequencer.c:3034
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "并且修改索引和/或工作区\n"
-#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
-msgid "format"
-msgstr "格式"
+#: sequencer.c:3040
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"执行成功：%s\n"
+"但是在索引和/或工作区中存在变更\n"
+"提交或贮藏修改，然后运行\n"
+"\n"
+" git rebase --continue\n"
+"\n"
-#: builtin/am.c:2269
-msgid "format the patch(es) are in"
-msgstr "补丁的格式"
+#: sequencer.c:3101
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "非法的标签名称：'%.*s'"
-#: builtin/am.c:2275
-msgid "override error message when patch failure occurs"
-msgstr "打补丁失败时显示的错误信息"
+#: sequencer.c:3155
+msgid "writing fake root commit"
+msgstr "写伪根提交"
-#: builtin/am.c:2277
-msgid "continue applying patches after resolving a conflict"
-msgstr "å\86²çª\81解å\86³å\90\8e继ç»åº\94ç\94¨è¡¥ä¸\81"
+#: sequencer.c:3160
+msgid "writing squash-onto"
+msgstr "å\86\99å\85¥ squash-onto"
-#: builtin/am.c:2280
-msgid "synonyms for --continue"
-msgstr "和 --continue 同义"
+#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "无法找到 %s 指向的树。"
-#: builtin/am.c:2283
-msgid "skip the current patch"
-msgstr "跳过当前补丁"
+#: sequencer.c:3216 builtin/rebase.c:863
+msgid "could not write index"
+msgstr "不能写入索引"
-#: builtin/am.c:2286
-msgid "restore the original branch and abort the patching operation."
-msgstr "恢复原始分支并终止打补丁操作。"
+#: sequencer.c:3243
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "无法解析 '%s'"
-#: builtin/am.c:2290
-msgid "lie about committer date"
-msgstr "将作者日期作为提交日期"
+#: sequencer.c:3271
+msgid "cannot merge without a current revision"
+msgstr "没有当前版本不能合并"
-#: builtin/am.c:2292
-msgid "use current timestamp for author date"
-msgstr "用当前时间作为作者日期"
+#: sequencer.c:3293
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "无法解析 '%.*s'"
-#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
-msgid "key-id"
-msgstr "key-id"
+#: sequencer.c:3302
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "无可用合并：'%.*s'"
-#: builtin/am.c:2295
-msgid "GPG-sign commits"
-msgstr "使用 GPG 签名提交"
+#: sequencer.c:3314
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr "章鱼合并不能在一个新的根提交上执行"
-#: builtin/am.c:2298
-msgid "(internal use for git-rebase)"
-msgstr "（内部使用，用于 git-rebase）"
+#: sequencer.c:3329
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "不能获取 '%s' 的提交说明"
-#: builtin/am.c:2316
-msgid ""
-"The -b/--binary option has been a no-op for long time, and\n"
-"it will be removed. Please do not use it anymore."
-msgstr ""
-"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
-"请不要再使用它了。"
+#: sequencer.c:3478
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "甚至不能尝试合并 '%.*s'"
-#: builtin/am.c:2323
-msgid "failed to read the index"
-msgstr "无法读取索引"
+#: sequencer.c:3494
+msgid "merge: Unable to write new index file"
+msgstr "合并：无法写入新索引文件"
-#: builtin/am.c:2338
+#: sequencer.c:3562 builtin/rebase.c:711
#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
-msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
+msgid "Applied autostash.\n"
+msgstr "已应用 autostash。\n"
+
+#: sequencer.c:3574
+#, c-format
+msgid "cannot store %s"
+msgstr "不能存储 %s"
-#: builtin/am.c:2362
+#: sequencer.c:3577 builtin/rebase.c:727
#, c-format
msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-"发现了错误的 %s 目录。\n"
-"使用 \"git am --abort\" 删除它。"
-
-#: builtin/am.c:2368
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr "解决操作未进行，我们不会继续。"
+"应用 autostash 导致冲突。\n"
+"您的修改安全地保存在贮藏区中。\n"
+"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: builtin/apply.c:8
-msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<选项>] [<补丁>...]"
+#: sequencer.c:3638
+#, c-format
+msgid "could not checkout %s"
+msgstr "不能检出 %s"
-#: builtin/archive.c:17
+#: sequencer.c:3652
#, c-format
-msgid "could not create archive file '%s'"
-msgstr "不能创建归档文件 '%s'"
+msgid "%s: not a valid OID"
+msgstr "%s：不是一个有效的对象 ID"
-#: builtin/archive.c:20
-msgid "could not redirect output"
-msgstr "不能重定向输出"
+#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
+msgstr "不能分离头指针"
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
-msgstr "git archive：未提供远程 URL"
+#: sequencer.c:3672
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "停止在 HEAD\n"
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive：应为 ACK/NACK，却得到 EOF"
+#: sequencer.c:3674
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "停止在 %s\n"
-#: builtin/archive.c:61
+#: sequencer.c:3682
#, c-format
-msgid "git archive: NACK %s"
-msgstr "git archive：NACK %s"
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+" %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+" git rebase --edit-todo\n"
+" git rebase --continue\n"
+msgstr ""
+"无法执行待办命令\n"
+"\n"
+" %.*s\n"
+"已被重新安排，在继续之前编辑命令，请先编辑待办列表：\n"
+"\n"
+" git rebase --edit-todo\n"
+" git rebase --continue\n"
-#: builtin/archive.c:64
-msgid "git archive: protocol error"
-msgstr "git archive：协议错误"
+#: sequencer.c:3759
+#, c-format
+msgid "Stopped at %s... %.*s\n"
+msgstr "停止在 %s... %.*s\n"
-#: builtin/archive.c:68
-msgid "git archive: expected a flush"
-msgstr "git archive：应有一个 flush 刷新"
+#: sequencer.c:3837
+#, c-format
+msgid "unknown command %d"
+msgstr "未知命令 %d"
-#: builtin/bisect--helper.c:7
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
+#: sequencer.c:3882
+msgid "could not read orig-head"
+msgstr "不能读取 orig-head"
-#: builtin/bisect--helper.c:17
-msgid "perform 'git bisect next'"
-msgstr "执行 'git bisect next'"
+#: sequencer.c:3887
+msgid "could not read 'onto'"
+msgstr "不能读取 'onto'"
-#: builtin/bisect--helper.c:19
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "更新 BISECT_HEAD 而非检出当前提交"
+#: sequencer.c:3901
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "不能更新 HEAD 为 %s"
-#: builtin/blame.c:27
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
+#: sequencer.c:3991
+msgid "cannot rebase: You have unstaged changes."
+msgstr "不能变基：您有未暂存的变更。"
-#: builtin/blame.c:32
-msgid "<rev-opts> are documented in git-rev-list(1)"
-msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
+#: sequencer.c:4000
+msgid "cannot amend non-existing commit"
+msgstr "不能修补不存在的提交"
-#: builtin/blame.c:668
-msgid "Show blame entries as we find them, incrementally"
-msgstr "增量式地显示发现的 blame 条目"
+#: sequencer.c:4002
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "无效文件：'%s'"
-#: builtin/blame.c:669
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "边界提交显示空的 SHA-1（默认：关闭）"
+#: sequencer.c:4004
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "无效内容：'%s'"
-#: builtin/blame.c:670
-msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr "不把根提交作为边界（默认：关闭）"
+#: sequencer.c:4007
+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'。"
-#: builtin/blame.c:671
-msgid "Show work cost statistics"
-msgstr "显示命令消耗统计"
+#: sequencer.c:4043 sequencer.c:4081
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "不能写入文件：'%s'"
-#: builtin/blame.c:672
-msgid "Force progress reporting"
-msgstr "强制进度显示"
+#: sequencer.c:4096
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "不能删除 CHERRY_PICK_HEAD"
-#: builtin/blame.c:673
-msgid "Show output score for blame entries"
-msgstr "显示判断 blame 条目位移的得分诊断信息"
+#: sequencer.c:4103
+msgid "could not commit staged changes."
+msgstr "不能提交暂存的修改。"
-#: builtin/blame.c:674
-msgid "Show original filename (Default: auto)"
-msgstr "显示原始文件名（默认：自动）"
+#: sequencer.c:4204
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s：不能拣选一个%s"
-#: builtin/blame.c:675
-msgid "Show original linenumber (Default: off)"
-msgstr "显示原始的行号（默认：关闭）"
+#: sequencer.c:4208
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s：错误的版本"
-#: builtin/blame.c:676
-msgid "Show in a format designed for machine consumption"
-msgstr "显示为一个适合机器读取的格式"
+#: sequencer.c:4243
+msgid "can't revert as initial commit"
+msgstr "不能作为初始提交回退"
-#: builtin/blame.c:677
-msgid "Show porcelain format with per-line commit information"
-msgstr "为每一行显示机器适用的提交信息"
+#: sequencer.c:4686
+msgid "make_script: unhandled options"
+msgstr "make_script：有未能处理的选项"
-#: builtin/blame.c:678
-msgid "Use the same output mode as git-annotate (Default: off)"
-msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
+#: sequencer.c:4689
+msgid "make_script: error preparing revisions"
+msgstr "make_script：准备版本时错误"
-#: builtin/blame.c:679
-msgid "Show raw timestamp (Default: off)"
-msgstr "显示原始时间戳（默认：关闭）"
+#: sequencer.c:4847
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"
+"或者您可以用 'git rebase --abort' 终止变基。\n"
-#: builtin/blame.c:680
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "æ\98¾ç¤ºé\95¿ç\9a\84 SHA1 æ\8f\90交å\8f·ï¼\88é»\98认ï¼\9aå\85³é\97ï¼\89"
+#: sequencer.c:4959 sequencer.c:4976
+msgid "nothing to do"
+msgstr "æ\97 äº\8bå\8f¯å\81\9a"
-#: builtin/blame.c:681
-msgid "Suppress author name and timestamp (Default: off)"
-msgstr "é\9a\90è\97\8fä½\9cè\80\85å\90\8då\97å\92\8cæ\97¶é\97´æ\88³ï¼\88é»\98认ï¼\9aå\85³é\97ï¼\89"
+#: sequencer.c:4990
+msgid "could not skip unnecessary pick commands"
+msgstr "æ\97 æ³\95è·³è¿\87ä¸\8då¿\85è¦\81ç\9a\84æ\8b£é\80\89"
-#: builtin/blame.c:682
-msgid "Show author email instead of name (Default: off)"
-msgstr "显示作者的邮箱而不是名字（默认：关闭）"
+#: sequencer.c:5073
+msgid "the script was already rearranged."
+msgstr "脚本已经重新编排。"
-#: builtin/blame.c:683
-msgid "Ignore whitespace differences"
-msgstr "忽略空白差异"
+#: setup.c:123
+#, c-format
+msgid "'%s' is outside repository"
+msgstr "'%s' 在仓库之外"
-#: builtin/blame.c:690
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "使用一个试验性的启发式算法改进差异显示"
+#: setup.c:173
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s：工作区中无此路径。\n"
+"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
-#: builtin/blame.c:692
-msgid "Spend extra cycles to find better match"
-msgstr "花费额外的循环来找到更好的匹配"
+#: setup.c:186
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"有歧义的参数 '%s'：未知的版本或路径不存在于工作区中。\n"
+"使用 '--' 来分隔版本和路径，例如：\n"
+"'git <命令> [<版本>...] -- [<文件>...]'"
-#: builtin/blame.c:693
-msgid "Use revisions from <file> instead of calling git-rev-list"
-msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
+#: setup.c:235
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "选项 '%s' 必须在其他非选项参数之前"
-#: builtin/blame.c:694
-msgid "Use <file>'s contents as the final image"
-msgstr "使用 <文件> 的内容作为最终的图片"
+#: setup.c:254
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"有歧义的参数 '%s'：可同时是版本和文件\n"
+"使用 '--' 来分隔版本和路径，例如：\n"
+"'git <命令> [<版本>...] -- [<文件>...]'"
-#: builtin/blame.c:695 builtin/blame.c:696
-msgid "score"
-msgstr "得分"
+#: setup.c:390
+msgid "unable to set up work tree using invalid config"
+msgstr "无法使用无效配置来创建工作区"
-#: builtin/blame.c:695
-msgid "Find line copies within and across files"
-msgstr "找到文件内及跨文件的行拷贝"
+#: setup.c:394
+msgid "this operation must be run in a work tree"
+msgstr "该操作必须在一个工作区中运行"
-#: builtin/blame.c:696
-msgid "Find line movements within and across files"
-msgstr "找到文件内及跨文件的行移动"
+#: setup.c:540
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "期望 git 仓库版本 <= %d，却得到 %d"
-#: builtin/blame.c:697
-msgid "n,m"
-msgstr "n,m"
+#: setup.c:548
+msgid "unknown repository extensions found:"
+msgstr "发现未知的仓库扩展："
-#: builtin/blame.c:697
-msgid "Process only line range n,m, counting from 1"
-msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
+#: setup.c:567
+#, c-format
+msgid "error opening '%s'"
+msgstr "打开 '%s' 出错"
-#: builtin/blame.c:744
-msgid "--progress can't be used with --incremental or porcelain formats"
-msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
+#: setup.c:569
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "文件太大，无法作为 .git 文件：'%s'"
-#. TRANSLATORS: This string is used to tell us the
-#. maximum display width for a relative timestamp in
-#. "git blame" output. For C locale, "4 years, 11
-#. months ago", which 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:795
-msgid "4 years, 11 months ago"
-msgstr "4 年 11 个月前"
+#: setup.c:571
+#, c-format
+msgid "error reading %s"
+msgstr "读取 %s 出错"
-#: builtin/blame.c:882
+#: setup.c:573
#, c-format
-msgid "file %s has only %lu line"
-msgid_plural "file %s has only %lu lines"
-msgstr[0] "文件 %s 只有 %lu 行"
-msgstr[1] "文件 %s 只有 %lu 行"
+msgid "invalid gitfile format: %s"
+msgstr "无效的 gitfile 格式：%s"
-#: builtin/blame.c:928
-msgid "Blaming lines"
-msgstr "追踪代码行"
+#: setup.c:575
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "在 gitfile 中没有路径：%s"
-#: builtin/branch.c:27
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
+#: setup.c:577
+#, c-format
+msgid "not a git repository: %s"
+msgstr "不是一个 git 仓库：%s"
-#: builtin/branch.c:28
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
+#: setup.c:676
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' 太大"
-#: builtin/branch.c:29
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
-msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
+#: setup.c:690
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "不是一个 git 仓库：'%s'"
-#: builtin/branch.c:30
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
-msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
+#: setup.c:719 setup.c:721 setup.c:752
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "不能切换目录到 '%s'"
-#: builtin/branch.c:31
-msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
-msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+msgid "cannot come back to cwd"
+msgstr "无法返回当前工作目录"
-#: builtin/branch.c:32
-msgid "git branch [<options>] [-r | -a] [--points-at]"
-msgstr "git branch [<选项>] [-r | -a] [--points-at]"
+#: setup.c:851
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "获取 '%*s%s%s' 状态（stat）失败"
-#: builtin/branch.c:33
-msgid "git branch [<options>] [-r | -a] [--format]"
-msgstr "git branch [<选项>] [-r | -a] [--format]"
+#: setup.c:1083
+msgid "Unable to read current working directory"
+msgstr "不能读取当前工作目录"
-# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:146
+#: setup.c:1092 setup.c:1098
#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
-msgstr ""
-"将要删除的分支 '%s' 已经被合并到\n"
-" '%s'，但未合并到 HEAD。"
+msgid "cannot change to '%s'"
+msgstr "不能切换到 '%s'"
-# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:150
+#: setup.c:1103
#, c-format
-msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-" '%s', even though it is merged to HEAD."
-msgstr ""
-"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
-" 然而却尚未被合并到分支 '%s' 。"
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "不是一个 git 仓库（或者任何父目录）：%s"
-#: builtin/branch.c:164
+#: setup.c:1109
#, c-format
-msgid "Couldn't look up commit object for '%s'"
-msgstr "无法查询 '%s' 指向的提交对象"
+msgid ""
+"not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgstr ""
+"不是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
+"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
-#: builtin/branch.c:168
+#: setup.c:1220
#, c-format
msgid ""
-"The branch '%s' is not fully merged.\n"
-"If you are sure you want to delete it, run 'git branch -D %s'."
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
msgstr ""
-"å\88\86æ\94¯ '%s' 没æ\9c\89å®\8cå\85¨å\90\88并。\n"
-"如果您确认要删除它，执行 'git branch -D %s'。"
+"å\8f\82æ\95° core.sharedRepository ç\9a\84æ\96\87件å±\9eæ\80§å\80¼æ\9c\89é\97®é¢\98ï¼\880%.3oï¼\89。\n"
+"文件属主必须始终拥有读写权限。"
-#: builtin/branch.c:181
-msgid "Update of config-file failed"
-msgstr "更新配置文件失败"
+#: setup.c:1264
+msgid "open /dev/null or dup failed"
+msgstr "不能打开或者复制 /dev/null"
-#: builtin/branch.c:212
-msgid "cannot use -a with -d"
-msgstr "不能将 -a 和 -d 同时使用"
+#: setup.c:1279
+msgid "fork failed"
+msgstr "fork 失败"
-#: builtin/branch.c:218
-msgid "Couldn't look up commit object for HEAD"
-msgstr "无法查询 HEAD 指向的提交对象"
+#: setup.c:1284
+msgid "setsid failed"
+msgstr "setsid 失败"
-#: builtin/branch.c:232
+#: sha1-file.c:453
#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
-#: builtin/branch.c:247
+#: sha1-file.c:504
#, c-format
-msgid "remote-tracking branch '%s' not found."
-msgstr "æ\9cªè\83½æ\89¾å\88°è¿\9cç¨\8bè·\9f踪å\88\86æ\94¯ '%s'ã\80\82"
+msgid "unable to normalize alternate object path: %s"
+msgstr "æ\97 æ³\95è§\84è\8c\83å\8c\96å¤\87ç\94¨å¯¹è±¡è·¯å¾\84ï¼\9a%s"
-#: builtin/branch.c:248
+#: sha1-file.c:576
#, c-format
-msgid "branch '%s' not found."
-msgstr "分支 '%s' 未发现。"
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s：忽略备用对象库，嵌套太深"
-#: builtin/branch.c:263
+#: sha1-file.c:583
#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "无法删除远程跟踪分支 '%s'"
+msgid "unable to normalize object directory: %s"
+msgstr "无法规范化对象目录: %s"
+
+#: sha1-file.c:626
+msgid "unable to fdopen alternates lockfile"
+msgstr "无法 fdopen 替换锁文件"
+
+#: sha1-file.c:644
+msgid "unable to read alternates file"
+msgstr "无法读取替代文件"
-#: builtin/branch.c:264
+#: sha1-file.c:651
+msgid "unable to move new alternates file into place"
+msgstr "无法将新的替代文件移动到位"
+
+#: sha1-file.c:686
#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "无法删除分支 '%s'"
+msgid "path '%s' does not exist"
+msgstr "路径 '%s' 不存在"
-#: builtin/branch.c:271
+#: sha1-file.c:712
#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
-msgstr "å·²å\88 é\99¤è¿\9cç¨\8bè·\9f踪å\88\86æ\94¯ %sï¼\88æ\9b¾ä¸º %sï¼\89ã\80\82\n"
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "å°\9aä¸\8dæ\94¯æ\8c\81å°\86å\8f\82è\80\83ä»\93åº\93 '%s' ä½\9c为ä¸\80个é\93¾æ\8e¥æ£\80å\87ºã\80\82"
-#: builtin/branch.c:272
+#: sha1-file.c:718
#, c-format
-msgid "Deleted branch %s (was %s).\n"
-msgstr "å·²å\88 é\99¤å\88\86æ\94¯ %sï¼\88æ\9b¾ä¸º %sï¼\89ã\80\82\n"
+msgid "reference repository '%s' is not a local repository."
+msgstr "å\8f\82è\80\83ä»\93åº\93 '%s' ä¸\8dæ\98¯ä¸\80个æ\9c¬å\9c°ä»\93åº\93ã\80\82"
-#: builtin/branch.c:417 builtin/tag.c:58
-msgid "unable to parse format string"
-msgstr "不能解析格式化字符串"
+#: sha1-file.c:724
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "参考仓库 '%s' 是一个浅克隆"
-#: builtin/branch.c:450
+#: sha1-file.c:732
#, c-format
-msgid "Branch %s is being rebased at %s"
-msgstr "å\88\86æ\94¯ %s æ£è¢«å\8f\98å\9fºå\88° %s"
+msgid "reference repository '%s' is grafted"
+msgstr "å\8f\82è\80\83ä»\93åº\93 '%s' 已被移æ¤\8d"
-#: builtin/branch.c:454
+#: sha1-file.c:846
#, c-format
-msgid "Branch %s is being bisected at %s"
-msgstr "å\88\86æ\94¯ %s æ£è¢«äº\8cå\88\86æ\9f¥æ\89¾äº\8e %s"
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "å°\9dè¯\95 mmap %<PRIuMAX>ï¼\8cè¶\85è¿\87äº\86æ\9c\80大å\80¼ %<PRIuMAX>"
-#: builtin/branch.c:470
-msgid "cannot copy the current branch while not on any."
-msgstr "无法拷贝当前分支因为不处于任何分支上。"
+#: sha1-file.c:871
+msgid "mmap failed"
+msgstr "mmap 失败"
-#: builtin/branch.c:472
-msgid "cannot rename the current branch while not on any."
-msgstr "无法重命名当前分支因为不处于任何分支上。"
+#: sha1-file.c:1035
+#, c-format
+msgid "object file %s is empty"
+msgstr "对象文件 %s 为空"
-#: builtin/branch.c:483
+#: sha1-file.c:1159 sha1-file.c:2297
#, c-format
-msgid "Invalid branch name: '%s'"
-msgstr "æ\97 æ\95\88ç\9a\84å\88\86æ\94¯å\90\8dï¼\9a'%s'"
+msgid "corrupt loose object '%s'"
+msgstr "æ\8d\9få\9d\8fç\9a\84æ\9d¾æ\95£å¯¹è±¡ '%s'"
-#: builtin/branch.c:504
-msgid "Branch rename failed"
-msgstr "分支重命名失败"
+#: sha1-file.c:1161 sha1-file.c:2301
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "松散对象 '%s' 后面有垃圾数据"
-#: builtin/branch.c:506
-msgid "Branch copy failed"
-msgstr "分支拷贝失败"
+#: sha1-file.c:1203
+msgid "invalid object type"
+msgstr "无效的对象类型"
-#: builtin/branch.c:510
+#: sha1-file.c:1287
#, c-format
-msgid "Copied a misnamed branch '%s' away"
-msgstr "已将错误命名的分支 '%s' 复制"
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
-#: builtin/branch.c:513
+#: sha1-file.c:1290
#, c-format
-msgid "Renamed a misnamed branch '%s' away"
-msgstr "已将错误命名的分支 '%s' 重命名"
+msgid "unable to unpack %s header"
+msgstr "无法解开 %s 头部"
-#: builtin/branch.c:519
+#: sha1-file.c:1296
#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
-msgstr "分支重命名为 %s，但 HEAD 没有更新！"
-
-#: builtin/branch.c:528
-msgid "Branch is renamed, but update of config-file failed"
-msgstr "分支被重命名，但更新配置文件失败"
-
-#: builtin/branch.c:530
-msgid "Branch is copied, but update of config-file failed"
-msgstr "分支已拷贝，但更新配置文件失败"
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
-#: builtin/branch.c:546
+#: sha1-file.c:1299
#, c-format
-msgid ""
-"Please edit the description for the branch\n"
-" %s\n"
-"Lines starting with '%c' will be stripped.\n"
-msgstr ""
-"请编辑分支的描述\n"
-" %s\n"
-"以 '%c' 开头的行将被过滤。\n"
-
-#: builtin/branch.c:579
-msgid "Generic options"
-msgstr "通用选项"
+msgid "unable to parse %s header"
+msgstr "无法解析 %s 头部"
-#: builtin/branch.c:581
-msgid "show hash and subject, give twice for upstream branch"
-msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
+#: sha1-file.c:1490
+#, c-format
+msgid "failed to read object %s"
+msgstr "读取对象 %s 失败"
-#: builtin/branch.c:582
-msgid "suppress informational messages"
-msgstr "不显示信息"
+#: sha1-file.c:1494
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "找不到 %2$s 的替代 %1$s"
-#: builtin/branch.c:583
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "设置跟踪模式（参见 git-pull(1)）"
+#: sha1-file.c:1498
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "松散对象 %s（保存在 %s）已损坏"
-#: builtin/branch.c:585
-msgid "do not use"
-msgstr "不要使用"
+#: sha1-file.c:1502
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "打包对象 %s（保存在 %s）已损坏"
-#: builtin/branch.c:587
-msgid "upstream"
-msgstr "上游"
+#: sha1-file.c:1604
+#, c-format
+msgid "unable to write file %s"
+msgstr "无法写文件 %s"
-#: builtin/branch.c:587
-msgid "change the upstream info"
-msgstr "改变上游信息"
+#: sha1-file.c:1611
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "无法为 '%s' 设置权限"
-#: builtin/branch.c:588
-msgid "Unset the upstream info"
-msgstr "取消上游信息的设置"
+#: sha1-file.c:1618
+msgid "file write error"
+msgstr "文件写错误"
-#: builtin/branch.c:589
-msgid "use colored output"
-msgstr "使用彩色输出"
+#: sha1-file.c:1637
+msgid "error when closing loose object file"
+msgstr "关闭松散对象文件时出错"
-#: builtin/branch.c:590
-msgid "act on remote-tracking branches"
-msgstr "作用于远程跟踪分支"
+#: sha1-file.c:1702
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
-#: builtin/branch.c:592 builtin/branch.c:594
-msgid "print only branches that contain the commit"
-msgstr "只打印包含该提交的分支"
+#: sha1-file.c:1704
+msgid "unable to create temporary file"
+msgstr "无法创建临时文件"
-#: builtin/branch.c:593 builtin/branch.c:595
-msgid "print only branches that don't contain the commit"
-msgstr "只打印不包含该提交的分支"
+#: sha1-file.c:1728
+msgid "unable to write loose object file"
+msgstr "不能写松散对象文件"
-#: builtin/branch.c:598
-msgid "Specific git-branch actions:"
-msgstr "具体的 git-branch 动作："
+#: sha1-file.c:1734
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "不能压缩新对象 %s（%d）"
-#: builtin/branch.c:599
-msgid "list both remote-tracking and local branches"
-msgstr "列出远程跟踪及本地分支"
+#: sha1-file.c:1738
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
-#: builtin/branch.c:601
-msgid "delete fully merged branch"
-msgstr "删除完全合并的分支"
+#: sha1-file.c:1742
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "被 %s 的不稳定对象源数据搞糊涂了"
-#: builtin/branch.c:602
-msgid "delete branch (even if not merged)"
-msgstr "删除分支（即使没有合并）"
+#: sha1-file.c:1752 builtin/pack-objects.c:920
+#, c-format
+msgid "failed utime() on %s"
+msgstr "在 %s 上调用 utime() 失败"
-#: builtin/branch.c:603
-msgid "move/rename a branch and its reflog"
-msgstr "移动/重命名一个分支，以及它的引用日志"
+#: sha1-file.c:1827
+#, c-format
+msgid "cannot read object for %s"
+msgstr "不能读取对象 %s"
-#: builtin/branch.c:604
-msgid "move/rename a branch, even if target exists"
-msgstr "移动/重命名一个分支，即使目标已存在"
+#: sha1-file.c:1867
+msgid "corrupt commit"
+msgstr "损坏的提交"
-#: builtin/branch.c:605
-msgid "copy a branch and its reflog"
-msgstr "æ\8b·è´\9dä¸\80个å\88\86æ\94¯å\92\8cå®\83ç\9a\84å¼\95ç\94¨æ\97¥å¿\97"
+#: sha1-file.c:1875
+msgid "corrupt tag"
+msgstr "æ\8d\9få\9d\8fç\9a\84æ \87ç¾"
-#: builtin/branch.c:606
-msgid "copy a branch, even if target exists"
-msgstr "拷贝一个分支，即使目标已存在"
+#: sha1-file.c:1974
+#, c-format
+msgid "read error while indexing %s"
+msgstr "索引 %s 时读取错误"
-#: builtin/branch.c:607
-msgid "list branch names"
-msgstr "列出分支名"
+#: sha1-file.c:1977
+#, c-format
+msgid "short read while indexing %s"
+msgstr "索引 %s 时读入不完整"
-#: builtin/branch.c:608
-msgid "create the branch's reflog"
-msgstr "创建分支的引用日志"
+#: sha1-file.c:2050 sha1-file.c:2059
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s：插入数据库失败"
-#: builtin/branch.c:610
-msgid "edit the description for the branch"
-msgstr "标记分支的描述"
+#: sha1-file.c:2065
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s：不支持的文件类型"
-#: builtin/branch.c:611
-msgid "force creation, move/rename, deletion"
-msgstr "强制创建、移动/重命名、删除"
+#: sha1-file.c:2089
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s 不是一个有效的对象"
-#: builtin/branch.c:612
-msgid "print only branches that are merged"
-msgstr "只打印已经合并的分支"
+#: sha1-file.c:2091
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s 不是一个有效的 '%s' 对象"
-#: builtin/branch.c:613
-msgid "print only branches that are not merged"
-msgstr "只打印尚未合并的分支"
+#: sha1-file.c:2118 builtin/index-pack.c:154
+#, c-format
+msgid "unable to open %s"
+msgstr "不能打开 %s"
-#: builtin/branch.c:614
-msgid "list branches in columns"
-msgstr "以列的方式显示分支"
+#: sha1-file.c:2308 sha1-file.c:2360
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "%s 的哈希值不匹配（预期 %s）"
-#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
-msgid "key"
-msgstr "key"
+#: sha1-file.c:2332
+#, c-format
+msgid "unable to mmap %s"
+msgstr "不能 mmap %s"
-#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
-msgid "field name to sort on"
-msgstr "排序的字段名"
+#: sha1-file.c:2337
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "无法解压缩 %s 的头部"
-#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408
-#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:408
-msgid "object"
-msgstr "对象"
+#: sha1-file.c:2343
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "无法解析 %s 的头部"
-#: builtin/branch.c:619
-msgid "print only branches of the object"
-msgstr "只打印指向该对象的分支"
+#: sha1-file.c:2354
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "无法解压缩 %s 的内容"
-#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
-msgid "sorting and filtering are case insensitive"
-msgstr "排序和过滤属于大小写不敏感"
+#: sha1-name.c:490
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "短 SHA1 %s 存在歧义"
-#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
-#: builtin/verify-tag.c:39
-msgid "format to use for the output"
-msgstr "输出格式"
+#: sha1-name.c:501
+msgid "The candidates are:"
+msgstr "候选者有："
-#: builtin/branch.c:645 builtin/clone.c:729
-msgid "HEAD not found below refs/heads!"
-msgstr "HEAD 没有位于 /refs/heads 之下！"
+#: sha1-name.c:800
+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"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n"
+"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"
+"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
+"命令关闭本消息通知。"
-#: builtin/branch.c:668
-msgid "--column and --verbose are incompatible"
-msgstr "--column 和 --verbose 不兼容"
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
-#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
-msgid "branch name required"
-msgstr "必须提供分支名"
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
-#: builtin/branch.c:708
-msgid "Cannot give description to detached HEAD"
-msgstr "不能向分离头指针提供描述"
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "无法移除 %s 的 .gitmodules 条目"
-#: builtin/branch.c:713
-msgid "cannot edit description of more than one branch"
-msgstr "不能为一个以上的分支编辑描述"
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
+msgstr "将更新后 .gitmodules 添加暂存区失败"
-#: builtin/branch.c:720
+#: submodule.c:327
#, c-format
-msgid "No commit on branch '%s' yet."
-msgstr "分支 '%s' 尚无提交。"
+msgid "in unpopulated submodule '%s'"
+msgstr "位于未检出的子模组 '%s'"
-#: builtin/branch.c:723
+#: submodule.c:358
#, c-format
-msgid "No branch named '%s'."
-msgstr "没有分支 '%s'。"
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
-#: builtin/branch.c:738
-msgid "too many branches for a copy operation"
-msgstr "为拷贝操作提供了太多的分支名"
+#: submodule.c:910
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
-#: builtin/branch.c:747
-msgid "too many arguments for a rename operation"
-msgstr "为重命名操作提供了太多的参数"
+#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "无法将 HEAD 解析为有效引用。"
-#: builtin/branch.c:752
-msgid "too many arguments to set new upstream"
-msgstr "为设置新上游提供了太多的参数"
+#: submodule.c:1481
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr "无法访问子模组 '%s'"
-#: builtin/branch.c:756
+#: submodule.c:1651
#, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
-msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
+msgid "'%s' not recognized as a git repository"
+msgstr "无法将 '%s' 识别为一个 git 仓库"
-#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
+#: submodule.c:1789
#, c-format
-msgid "no such branch '%s'"
-msgstr "没æ\9c\89æ¤å\88\86æ\94¯ '%s'"
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "æ\97 æ³\95å\9c¨å\90模ç»\84 '%s' ä¸å\90¯å\8a¨ 'git status'"
-#: builtin/branch.c:763
+#: submodule.c:1802
#, c-format
-msgid "branch '%s' does not exist"
-msgstr "分支 '%s' 不存在"
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "无法在子模组 '%s' 中执行 'git status'"
-#: builtin/branch.c:775
-msgid "too many arguments to unset upstream"
-msgstr "为取消上游设置操作提供了太多的参数"
+#: submodule.c:1817
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
-#: builtin/branch.c:779
-msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
+#: submodule.c:1907
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "子模组 '%s' 中有脏索引"
-#: builtin/branch.c:785
+#: submodule.c:1959
#, c-format
-msgid "Branch '%s' has no upstream information"
-msgstr "å\88\86æ\94¯ '%s' 没æ\9c\89ä¸\8a游信æ\81¯"
+msgid "Submodule '%s' could not be updated."
+msgstr "å\90模ç»\84 '%s' æ\97 æ³\95被æ\9b´æ\96°ã\80\82"
-#: builtin/branch.c:797
-msgid "it does not make sense to create 'HEAD' manually"
-msgstr "手工创建 'HEAD' 没有意义"
+#: submodule.c:2008
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
-#: builtin/branch.c:803
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
+#: submodule.c:2020 submodule.c:2076
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "不能查询子模组 '%s' 的名称"
-#: builtin/branch.c:806
+#: submodule.c:2027
+#, c-format
msgid ""
-"the '--set-upstream' option is no longer supported. Please use '--track' or "
-"'--set-upstream-to' instead."
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
msgstr ""
-"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
+"将 '%s%s' 的 git 目录从\n"
+"'%s' 迁移至\n"
+"'%s'\n"
-#: builtin/bundle.c:45
+#: submodule.c:2111
#, c-format
-msgid "%s is okay\n"
-msgstr "%s 可以\n"
-
-#: builtin/bundle.c:58
-msgid "Need a repository to create a bundle."
-msgstr "需要一个仓库来创建包。"
+msgid "could not recurse into submodule '%s'"
+msgstr "无法递归进子模组路径 '%s'"
-#: builtin/bundle.c:62
-msgid "Need a repository to unbundle."
-msgstr "需要一个仓库来解包。"
+#: submodule.c:2155
+msgid "could not start ls-files in .."
+msgstr "无法在 .. 中启动 ls-files"
-#: builtin/cat-file.c:521
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
-msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
+#: submodule.c:2194
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree 返回未知返回值 %d"
-#: builtin/cat-file.c:522
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
-msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+#: submodule-config.c:232
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "忽略可疑的子模组名称：%s"
-#: builtin/cat-file.c:559
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
+#: submodule-config.c:299
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "submodule.fetchjobs 不允许为负值"
-#: builtin/cat-file.c:560
-msgid "show object type"
-msgstr "显示对象类型"
+#: submodule-config.c:397
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr "忽略可能被解析为命令行选项的 '%s'：%s"
-#: builtin/cat-file.c:561
-msgid "show object size"
-msgstr "显示对象大小"
+#: submodule-config.c:486
+#, c-format
+msgid "invalid value for %s"
+msgstr "%s 的值无效"
-#: builtin/cat-file.c:563
-msgid "exit with zero when there's no error"
-msgstr "当没有错误时退出并返回零"
+#: submodule-config.c:755
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "不能更新 .gitmodules 条目 %s"
-#: builtin/cat-file.c:564
-msgid "pretty-print object's content"
-msgstr "美观地打印对象的内容"
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "执行 trailer 命令 '%s' 失败"
-#: builtin/cat-file.c:566
-msgid "for blob objects, run textconv on object's content"
-msgstr "对于数据对象，对其内容做文本转换"
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "键 '%2$s' 的未知取值 '%1$s'"
-#: builtin/cat-file.c:568
-msgid "for blob objects, run filters on object's content"
-msgstr "对于数据对象，对其内容做过滤"
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#, c-format
+msgid "more than one %s"
+msgstr "多于一个 %s"
-#: builtin/cat-file.c:569 git-submodule.sh:943
-msgid "blob"
-msgstr "数据对象"
+#: trailer.c:730
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "签名 '%.*s' 的键为空"
-#: builtin/cat-file.c:570
-msgid "use a specific path for --textconv/--filters"
-msgstr "对于 --textconv/--filters 使用一个特定的路径"
+#: trailer.c:750
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "不能读取输入文件 '%s'"
-#: builtin/cat-file.c:572
-msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr "允许 -s 和 -t 对损坏的对象生效"
+#: trailer.c:753
+msgid "could not read from stdin"
+msgstr "不能自标准输入读取"
-#: builtin/cat-file.c:573
-msgid "buffer --batch output"
-msgstr "缓冲 --batch 的输出"
+#: trailer.c:1011 wrapper.c:701
+#, c-format
+msgid "could not stat %s"
+msgstr "不能对 %s 调用 stat"
-#: builtin/cat-file.c:575
-msgid "show info and content of objects fed from the standard input"
-msgstr "显示从标准输入提供的对象的信息和内容"
+#: trailer.c:1013
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "文件 %s 不是一个正规文件"
-#: builtin/cat-file.c:578
-msgid "show info about objects fed from the standard input"
-msgstr "显示从标准输入提供的对象的信息"
+#: trailer.c:1015
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "文件 %s 用户不可写"
-#: builtin/cat-file.c:581
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
+#: trailer.c:1027
+msgid "could not open temporary file"
+msgstr "不能打开临时文件"
-#: builtin/cat-file.c:583
-msgid "show all objects with --batch or --batch-check"
-msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
+#: trailer.c:1067
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "不能重命名临时文件为 %s"
-#: builtin/check-attr.c:12
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
-msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
-#: builtin/check-attr.c:13
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
-msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
+#: transport.c:142
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "无法读取 bundle '%s'"
-#: builtin/check-attr.c:20
-msgid "report all attributes set on file"
-msgstr "报告设置在文件上的所有属性"
+#: transport.c:208
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "传输：无效的深度选项 '%s'"
-#: builtin/check-attr.c:21
-msgid "use .gitattributes only from the index"
-msgstr "只使用索引中的 .gitattributes"
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
-msgid "read file names from stdin"
-msgstr "从标准输入读出文件名"
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
+msgstr "服务端选项需要版本 2 协议或更高"
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
-msgid "terminate input and output records by a NUL character"
-msgstr "输入和输出的记录使用 NUL 字符终结"
+#: transport.c:625
+msgid "could not parse transport.color.* config"
+msgstr "不能解析 transport.color.* 配置"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
-msgid "suppress progress reporting"
-msgstr "不显示进度报告"
+#: transport.c:698
+msgid "support for protocol v2 not implemented yet"
+msgstr "协议 v2 的支持尚未实现"
-#: builtin/check-ignore.c:28
-msgid "show non-matching input paths"
-msgstr "显示未匹配的输入路径"
+#: transport.c:825
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "配置 '%s' 的取值未知：%s"
-#: builtin/check-ignore.c:30
-msgid "ignore index when checking"
-msgstr "检查时忽略索引"
+#: transport.c:891
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "传输 '%s' 不允许"
-#: builtin/check-ignore.c:158
-msgid "cannot specify pathnames with --stdin"
-msgstr "不能同时指定路径及 --stdin 参数"
+#: transport.c:945
+msgid "git-over-rsync is no longer supported"
+msgstr "不再支持 git-over-rsync"
-#: builtin/check-ignore.c:161
-msgid "-z only makes sense with --stdin"
-msgstr "-z 需要和 --stdin 参数共用才有意义"
+#: transport.c:1040
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
-#: builtin/check-ignore.c:163
-msgid "no path specified"
-msgstr "未指定路径"
+#: transport.c:1044
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"请尝试\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"或者进入到子目录执行\n"
+"\n"
+"\tgit push\n"
+"\n"
+"以推送至远程。\n"
+"\n"
-#: builtin/check-ignore.c:167
-msgid "--quiet is only valid with a single pathname"
-msgstr "参数 --quiet 只在提供一个路径名时有效"
+#: transport.c:1052
+msgid "Aborting."
+msgstr "正在终止。"
-#: builtin/check-ignore.c:169
-msgid "cannot have both --quiet and --verbose"
-msgstr "不能同时提供 --quiet 和 --verbose 参数"
+#: transport.c:1193
+msgid "failed to push all needed submodules"
+msgstr "不能推送全部需要的子模组"
-#: builtin/check-ignore.c:172
-msgid "--non-matching is only valid with --verbose"
-msgstr "--non-matching 选项只在使用 --verbose 时有效"
+#: transport.c:1326 transport-helper.c:645
+msgid "operation not supported by protocol"
+msgstr "协议不支持该操作"
-#: builtin/check-mailmap.c:9
-msgid "git check-mailmap [<options>] <contact>..."
-msgstr "git check-mailmap [<选项>] <联系地址>..."
+#: transport.c:1430
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "解析备用引用时无效的行：%s"
-#: builtin/check-mailmap.c:14
-msgid "also read contacts from stdin"
-msgstr "还从标准输入读取联系地址"
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
+msgstr "完整写入远程助手失败"
-#: builtin/check-mailmap.c:25
+#: transport-helper.c:134
#, c-format
-msgid "unable to parse contact: %s"
-msgstr "不能解析联系地址：%s"
+msgid "unable to find remote helper for '%s'"
+msgstr "无法为 '%s' 找到远程助手"
-#: builtin/check-mailmap.c:48
-msgid "no contacts specified"
-msgstr "æ\9cªæ\8c\87å®\9aè\81\94ç³»å\9c°å\9d\80"
+#: transport-helper.c:150 transport-helper.c:559
+msgid "can't dup helper output fd"
+msgstr "æ\97 æ³\95å¤\8då\88¶å\8a©æ\89\8bè¾\93å\87ºæ\96\87件å\8f¥æ\9f\84"
-#: builtin/checkout-index.c:128
-msgid "git checkout-index [<options>] [--] [<file>...]"
-msgstr "git checkout-index [<选项>] [--] [<文件>...]"
+#: transport-helper.c:201
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr "未知的强制能力 %s，该远程助手可能需要新版本的Git"
-#: builtin/checkout-index.c:145
-msgid "stage should be between 1 and 3 or all"
-msgstr "索引值应该取值 1 到 3 或者 all"
+#: transport-helper.c:207
+msgid "this remote helper should implement refspec capability"
+msgstr "远程助手需要实现 refspec 能力"
-#: builtin/checkout-index.c:161
-msgid "check out all files in the index"
-msgstr "检出索引区的所有文件"
+#: transport-helper.c:274 transport-helper.c:414
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s 意外地说：'%s'"
-#: builtin/checkout-index.c:162
-msgid "force overwrite of existing files"
-msgstr "强制覆盖现有的文件"
+#: transport-helper.c:403
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s 也锁定了 %s"
-#: builtin/checkout-index.c:164
-msgid "no warning for existing files and files not in index"
-msgstr "存在或不在索引中的文件都没有警告"
+#: transport-helper.c:481
+msgid "couldn't run fast-import"
+msgstr "不能执行 fast-import"
-#: builtin/checkout-index.c:166
-msgid "don't checkout new files"
-msgstr "不检出新文件"
+#: transport-helper.c:504
+msgid "error while running fast-import"
+msgstr "执行 fast-import 出错"
-#: builtin/checkout-index.c:168
-msgid "update stat information in the index file"
-msgstr "更新索引中文件的状态信息"
+#: transport-helper.c:533 transport-helper.c:1099
+#, c-format
+msgid "could not read ref %s"
+msgstr "无法读取引用 %s"
-#: builtin/checkout-index.c:172
-msgid "read list of paths from the standard input"
-msgstr "从标准输入读取路径列表"
+#: transport-helper.c:578
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "连接时未知的响应：%s"
-#: builtin/checkout-index.c:174
-msgid "write the content to temporary files"
-msgstr "å°\86å\86\85容å\86\99å\85¥ä¸´æ\97¶æ\96\87件"
+#: transport-helper.c:600
+msgid "setting remote service path not supported by protocol"
+msgstr "å\8d\8fè®®ä¸\8dæ\94¯æ\8c\81设置è¿\9cç¨\8bæ\9c\8då\8a¡è·¯å¾\84"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
-#: builtin/worktree.c:498
-msgid "string"
-msgstr "字符串"
+#: transport-helper.c:602
+msgid "invalid remote service path"
+msgstr "无效的远程服务路径"
-#: builtin/checkout-index.c:176
-msgid "when creating files, prepend <string>"
-msgstr "在创建文件时，在前面加上 <字符串>"
+#: transport-helper.c:648
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "不能连接到子服务 %s"
-#: builtin/checkout-index.c:178
-msgid "copy out the files from named stage"
-msgstr "从指定暂存区中拷出文件"
+#: transport-helper.c:720
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "预期 ok/error，助手说 '%s'"
-#: builtin/checkout.c:26
-msgid "git checkout [<options>] <branch>"
-msgstr "git checkout [<选项>] <分支>"
+#: transport-helper.c:773
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "助手报告 %s 的意外状态"
-#: builtin/checkout.c:27
-msgid "git checkout [<options>] [<branch>] -- <file>..."
-msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
+#: transport-helper.c:834
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "助手 %s 不支持 dry-run"
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: transport-helper.c:837
#, c-format
-msgid "path '%s' does not have our version"
-msgstr "路径 '%s' 没有我们的版本"
+msgid "helper %s does not support --signed"
+msgstr "助手 %s 不支持 --signed"
-#: builtin/checkout.c:137 builtin/checkout.c:170
+#: transport-helper.c:840
#, c-format
-msgid "path '%s' does not have their version"
-msgstr "路径 '%s' 没有他们的版本"
+msgid "helper %s does not support --signed=if-asked"
+msgstr "助手 %s 不支持 --signed=if-asked"
-#: builtin/checkout.c:153
+#: transport-helper.c:847
#, c-format
-msgid "path '%s' does not have all necessary versions"
-msgstr "路径 '%s' 没有全部必须的版本"
+msgid "helper %s does not support 'push-option'"
+msgstr "助手 %s 不支持 'push-option'"
+
+#: transport-helper.c:939
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "remote-heper 不支持 push，需要引用表达式"
-#: builtin/checkout.c:197
+#: transport-helper.c:944
#, c-format
-msgid "path '%s' does not have necessary versions"
-msgstr "路径 '%s' 没有必须的版本"
+msgid "helper %s does not support 'force'"
+msgstr "助手 %s 不支持 'force'"
+
+#: transport-helper.c:991
+msgid "couldn't run fast-export"
+msgstr "无法执行 fast-export"
-#: builtin/checkout.c:214
+#: transport-helper.c:996
+msgid "error while running fast-export"
+msgstr "执行 fast-export 时出错"
+
+#: transport-helper.c:1021
#, c-format
-msgid "path '%s': cannot merge"
-msgstr "path '%s'：无法合并"
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
+msgstr ""
+"没有共同的引用并且也没有指定，什么也不会做。\n"
+"可能您应该指定一个分支如 'master'。\n"
-#: builtin/checkout.c:231
+#: transport-helper.c:1085
#, c-format
-msgid "Unable to add merge result for '%s'"
-msgstr "无法为 '%s' 添加合并结果"
+msgid "malformed response in ref list: %s"
+msgstr "引用列表中格式错误的响应：%s"
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: transport-helper.c:1238
#, c-format
-msgid "'%s' cannot be used with updating paths"
-msgstr "'%s' 不能在更新路径时使用"
+msgid "read(%s) failed"
+msgstr "读取（%s）失败"
-#: builtin/checkout.c:265 builtin/checkout.c:268
+#: transport-helper.c:1265
#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' 不能和 %s 同时使用"
+msgid "write(%s) failed"
+msgstr "写（%s）失败"
-#: builtin/checkout.c:271
+#: transport-helper.c:1314
#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
-msgstr "不能同时更新路径并切换到分支'%s'。"
+msgid "%s thread failed"
+msgstr "%s 线程失败"
-#: builtin/checkout.c:342 builtin/checkout.c:349
+#: transport-helper.c:1318
#, c-format
-msgid "path '%s' is unmerged"
-msgstr "路径 '%s' 未合并"
+msgid "%s thread failed to join: %s"
+msgstr "%s 线程等待失败：%s"
-#: builtin/checkout.c:501
-msgid "you need to resolve your current index first"
-msgstr "您需要先解决当前索引的冲突"
+#: transport-helper.c:1337 transport-helper.c:1341
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "不能启动线程来拷贝数据：%s"
-#: builtin/checkout.c:632
+#: transport-helper.c:1378
#, c-format
-msgid "Can not do reflog for '%s': %s\n"
-msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
+msgid "%s process failed to wait"
+msgstr "%s 进程等待失败"
-#: builtin/checkout.c:673
-msgid "HEAD is now at"
-msgstr "HEAD 目前位于"
+#: transport-helper.c:1382
+#, c-format
+msgid "%s process failed"
+msgstr "%s 进程失败"
-#: builtin/checkout.c:677 builtin/clone.c:683
-msgid "unable to update HEAD"
-msgstr "不能更新 HEAD"
+#: transport-helper.c:1400 transport-helper.c:1409
+msgid "can't start thread for copying data"
+msgstr "不能启动线程来拷贝数据"
-#: builtin/checkout.c:681
-#, c-format
-msgid "Reset branch '%s'\n"
-msgstr "重置分支 '%s'\n"
+#: tree-walk.c:33
+msgid "too-short tree object"
+msgstr "太短的树对象"
-#: builtin/checkout.c:684
-#, c-format
-msgid "Already on '%s'\n"
-msgstr "已经位于 '%s'\n"
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
+msgstr "树对象中的条目模式错误"
+
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
+msgstr "树对象条目中空的文件名"
+
+#: tree-walk.c:116
+msgid "too-short tree file"
+msgstr "太短的树文件"
-#: builtin/checkout.c:688
+#: unpack-trees.c:111
#, c-format
-msgid "Switched to and reset branch '%s'\n"
-msgstr "切换并重置分支 '%s'\n"
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you switch branches."
+msgstr ""
+"您对下列文件的本地修改将被检出操作覆盖：\n"
+"%%s请在切换分支前提交或贮藏您的修改。"
-#: builtin/checkout.c:690 builtin/checkout.c:1086
+#: unpack-trees.c:113
#, c-format
-msgid "Switched to a new branch '%s'\n"
-msgstr "切换到一个新分支 '%s'\n"
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被检出操作覆盖：\n"
+"%%s"
-#: builtin/checkout.c:692
+#: unpack-trees.c:116
#, c-format
-msgid "Switched to branch '%s'\n"
-msgstr "切换到分支 '%s'\n"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"您对下列文件的本地修改将被合并操作覆盖：\n"
+"%%s请在合并前提交或贮藏您的修改。"
-# 译者：注意保持前导空格
-#: builtin/checkout.c:743
+#: unpack-trees.c:118
#, c-format
-msgid " ... and %d more.\n"
-msgstr " ... 及其它 %d 个。\n"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被合并操作覆盖：\n"
+"%%s"
-#: builtin/checkout.c:749
+#: unpack-trees.c:121
#, c-format
msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgid_plural ""
-"Warning: you are leaving %d commits behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgstr[0] ""
-"警告：您正丢下 %d 个提交，未和任何分支关联：\n"
-"\n"
-"%s\n"
-msgstr[1] ""
-"警告：您正丢下 %d 个提交，未和任何分支关联：\n"
-"\n"
-"%s\n"
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"您对下列文件的本地修改将被 %s 覆盖：\n"
+"%%s请在 %s 之前提交或贮藏您的修改。"
-#: builtin/checkout.c:768
+#: unpack-trees.c:123
#, c-format
msgid ""
-"If you want to keep it by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgid_plural ""
-"If you want to keep them by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgstr[0] ""
-"如果您想要通过创建新分支保存它，这可能是一个好时候。\n"
-"如下操作：\n"
-"\n"
-" git branch <新分支名> %s\n"
-"\n"
-msgstr[1] ""
-"如果您想要通过创建新分支保存它们，这可能是一个好时候。\n"
-"如下操作：\n"
-"\n"
-" git branch <新分支名> %s\n"
-"\n"
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被 %s 覆盖：\n"
+"%%s"
-#: builtin/checkout.c:809
-msgid "internal error in revision walk"
-msgstr "在版本遍历时遇到内部错误"
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"更新如下目录将会丢失其中未跟踪的文件：\n"
+"%s"
-#: builtin/checkout.c:813
-msgid "Previous HEAD position was"
-msgstr "之前的 HEAD 位置是"
+#: unpack-trees.c:132
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
+"%%s请在切换分支之前移动或删除。"
-#: builtin/checkout.c:843 builtin/checkout.c:1081
-msgid "You are on a branch yet to be born"
-msgstr "您位于一个尚未初始化的分支"
+#: unpack-trees.c:134
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
+"%%s"
-#: builtin/checkout.c:987
+#: unpack-trees.c:137
#, c-format
-msgid "only one reference expected, %d given."
-msgstr "应只有一个引用，却给出了 %d 个"
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
+"%%s请在合并前移动或删除。"
-#: builtin/checkout.c:1027 builtin/worktree.c:233
+#: unpack-trees.c:139
#, c-format
-msgid "invalid reference: %s"
-msgstr "无效引用：%s"
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
+"%%s"
-#: builtin/checkout.c:1056
+#: unpack-trees.c:142
#, c-format
-msgid "reference is not a tree: %s"
-msgstr "引用不是一个树：%s"
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
+"%%s请在 %s 前移动或删除。"
-#: builtin/checkout.c:1095
-msgid "paths cannot be used with switching branches"
-msgstr "路径不能和切换分支同时使用"
+#: unpack-trees.c:144
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
+"%%s"
-#: builtin/checkout.c:1098 builtin/checkout.c:1102
+#: unpack-trees.c:150
#, c-format
-msgid "'%s' cannot be used with switching branches"
-msgstr "'%s' 不能和切换分支同时使用"
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
+"%%s请在切换分支前移动或删除。"
-#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
-#: builtin/checkout.c:1117
+#: unpack-trees.c:152
#, c-format
-msgid "'%s' cannot be used with '%s'"
-msgstr "'%s' 不能和 '%s' 同时使用"
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
+"%%s"
-#: builtin/checkout.c:1122
+#: unpack-trees.c:155
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
+"%%s请在合并前移动或删除。"
+
+#: unpack-trees.c:157
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
+"%%s"
+
+#: unpack-trees.c:160
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
+"%%s请在 %s 前移动或删除。"
+
+#: unpack-trees.c:162
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
+"%%s"
+
+#: unpack-trees.c:170
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
+
+#: unpack-trees.c:173
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
+msgstr ""
+"无法更新稀疏检出：如下条目不是最新：\n"
+"%s"
+
+#: unpack-trees.c:175
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"工作区中下列文件将被稀疏检出更新所覆盖：\n"
+"%s"
+
+#: unpack-trees.c:177
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"工作区中下列文件将被稀疏检出更新所删除：\n"
+"%s"
+
+#: unpack-trees.c:179
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"无法更新子模组：\n"
+"%s"
+
+#: unpack-trees.c:256
+#, c-format
+msgid "Aborting\n"
+msgstr "终止中\n"
+
+#: unpack-trees.c:318
+msgid "Checking out files"
+msgstr "正在检出文件"
+
+#: unpack-trees.c:350
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+"以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n"
+"并且碰撞组中只有一个文件存在工作区中：\n"
+
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
+
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "无效的 %XX 转义序列"
+
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
+msgstr "缺失主机名且 URL 方案不是 'file:'"
+
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr "一个 'file:' URL 不应该包含端口号"
+
+#: urlmatch.c:247
+msgid "invalid characters in host name"
+msgstr "主机名中包含无效的字符"
+
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
+msgstr "无效的端口号"
+
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
+msgstr "无效的 '..' 路径片段"
+
+#: worktree.c:255 builtin/am.c:2097
+#, c-format
+msgid "failed to read '%s'"
+msgstr "读取 '%s' 失败"
+
+#: worktree.c:301
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "在主工作区的 '%s' 不是仓库目录"
+
+#: worktree.c:312
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "文件 '%s' 不包含工作区的绝对路径"
+
+#: worktree.c:324
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' 不存在"
+
+#: worktree.c:330
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' 不是一个 .git 文件，错误码 %d"
+
+#: worktree.c:338
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' 没有指回到 '%s'"
+
+#: wrapper.c:223 wrapper.c:393
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "无法打开 '%s' 进行读写"
+
+#: wrapper.c:424 wrapper.c:624
+#, c-format
+msgid "unable to access '%s'"
+msgstr "不能访问 '%s'"
+
+#: wrapper.c:632
+msgid "unable to get current working directory"
+msgstr "不能获取当前工作目录"
+
+#: wt-status.c:156
+msgid "Unmerged paths:"
+msgstr "未合并的路径："
+
+# 译者：注意保持前导空格
+#: wt-status.c:183 wt-status.c:210
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:185 wt-status.c:212
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:189
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " （使用 \"git add <文件>...\" 标记解决方案）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:191 wt-status.c:195
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:193
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
+
+#: wt-status.c:204 wt-status.c:1064
+msgid "Changes to be committed:"
+msgstr "要提交的变更："
+
+#: wt-status.c:222 wt-status.c:1073
+msgid "Changes not staged for commit:"
+msgstr "尚未暂存以备提交的变更："
+
+# 译者：注意保持前导空格
+#: wt-status.c:226
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:228
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:229
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:231
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:243
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"
+
+#: wt-status.c:258
+msgid "both deleted:"
+msgstr "双方删除："
+
+#: wt-status.c:260
+msgid "added by us:"
+msgstr "由我们添加："
+
+#: wt-status.c:262
+msgid "deleted by them:"
+msgstr "由他们删除："
+
+#: wt-status.c:264
+msgid "added by them:"
+msgstr "由他们添加："
+
+#: wt-status.c:266
+msgid "deleted by us:"
+msgstr "由我们删除："
+
+#: wt-status.c:268
+msgid "both added:"
+msgstr "双方添加："
+
+#: wt-status.c:270
+msgid "both modified:"
+msgstr "双方修改："
+
+#: wt-status.c:280
+msgid "new file:"
+msgstr "新文件："
+
+#: wt-status.c:282
+msgid "copied:"
+msgstr "拷贝："
+
+#: wt-status.c:284
+msgid "deleted:"
+msgstr "删除："
+
+#: wt-status.c:286
+msgid "modified:"
+msgstr "修改："
+
+#: wt-status.c:288
+msgid "renamed:"
+msgstr "重命名："
+
+#: wt-status.c:290
+msgid "typechange:"
+msgstr "类型变更："
+
+#: wt-status.c:292
+msgid "unknown:"
+msgstr "未知："
+
+#: wt-status.c:294
+msgid "unmerged:"
+msgstr "未合并："
+
+# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c:374
+msgid "new commits, "
+msgstr "新提交, "
+
+# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c:376
+msgid "modified content, "
+msgstr "修改的内容, "
+
+# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c:378
+msgid "untracked content, "
+msgstr "未跟踪的内容, "
+
+#: wt-status.c:896
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "您的贮藏区当前有 %d 条记录"
+msgstr[1] "您的贮藏区当前有 %d 条记录"
+
+#: wt-status.c:928
+msgid "Submodules changed but not updated:"
+msgstr "子模组已修改但尚未更新："
+
+#: wt-status.c:930
+msgid "Submodule changes to be committed:"
+msgstr "要提交的子模组变更："
+
+#: wt-status.c:1012
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"不要改动或删除上面的一行。\n"
+"其下所有内容都将被忽略。"
+
+#: wt-status.c:1119
+msgid "You have unmerged paths."
+msgstr "您有尚未合并的路径。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1122
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " （解决冲突并运行 \"git commit\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1124
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " （使用 \"git merge --abort\" 终止合并）"
+
+#: wt-status.c:1128
+msgid "All conflicts fixed but you are still merging."
+msgstr "所有冲突已解决但您仍处于合并中。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1131
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " （使用 \"git commit\" 结束合并）"
+
+#: wt-status.c:1140
+msgid "You are in the middle of an am session."
+msgstr "您正处于 am 操作过程中。"
+
+#: wt-status.c:1143
+msgid "The current patch is empty."
+msgstr "当前的补丁为空。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1147
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " （解决冲突，然后运行 \"git am --continue\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1149
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " （使用 \"git am --skip\" 跳过此补丁）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1151
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " （使用 \"git am --abort\" 恢复原有分支）"
+
+#: wt-status.c:1284
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo 丢失。"
+
+#: wt-status.c:1286
+msgid "No commands done."
+msgstr "没有命令被执行。"
+
+#: wt-status.c:1289
+#, 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:1300
+#, c-format
+msgid " (see more in file %s)"
+msgstr " （更多参见文件 %s）"
+
+#: wt-status.c:1305
+msgid "No commands remaining."
+msgstr "未剩下任何命令。"
+
+#: wt-status.c:1308
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："
+msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："
+
+# 译者：注意保持前导空格
+#: wt-status.c:1316
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"
+
+#: wt-status.c:1328
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
+
+#: wt-status.c:1333
+msgid "You are currently rebasing."
+msgstr "您在执行变基操作。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1346
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1348
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1350
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1357
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
+
+#: wt-status.c:1361
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
+
+#: wt-status.c:1366
+msgid "You are currently splitting a commit during a rebase."
+msgstr "您在执行变基操作时拆分提交。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1369
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
+
+#: wt-status.c:1373
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
+
+#: wt-status.c:1378
+msgid "You are currently editing a commit during a rebase."
+msgstr "您在执行变基操作时编辑提交。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1381
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " （使用 \"git commit --amend\" 修补当前提交）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1383
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
+
+#: wt-status.c:1394
+msgid "Cherry-pick currently in progress."
+msgstr "拣选操作正在进行中。"
+
+#: wt-status.c:1397
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "您在执行拣选提交 %s 的操作。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1404
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1407
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr " （执行 \"git cherry-pick --continue\" 以继续）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1410
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1412
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
+
+#: wt-status.c:1422
+msgid "Revert currently in progress."
+msgstr "还原操作正在行中。"
+
+#: wt-status.c:1425
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "您在执行反转提交 %s 的操作。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1431
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " （解决冲突并执行 \"git revert --continue\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1434
+msgid " (run \"git revert --continue\" to continue)"
+msgstr " （执行 \"git revert --continue\" 以继续）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1437
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr " （所有冲突已解决：执行 \"git revert --continue\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1439
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
+
+#: wt-status.c:1449
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
+
+#: wt-status.c:1453
+msgid "You are currently bisecting."
+msgstr "您在执行二分查找操作。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1456
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
+
+#: wt-status.c:1665
+msgid "On branch "
+msgstr "位于分支 "
+
+#: wt-status.c:1672
+msgid "interactive rebase in progress; onto "
+msgstr "交互式变基操作正在进行中；至 "
+
+#: wt-status.c:1674
+msgid "rebase in progress; onto "
+msgstr "变基操作正在进行中；至 "
+
+#: wt-status.c:1679
+msgid "HEAD detached at "
+msgstr "头指针分离于 "
+
+#: wt-status.c:1681
+msgid "HEAD detached from "
+msgstr "头指针分离自 "
+
+#: wt-status.c:1684
+msgid "Not currently on any branch."
+msgstr "当前不在任何分支上。"
+
+#: wt-status.c:1701
+msgid "Initial commit"
+msgstr "初始提交"
+
+#: wt-status.c:1702
+msgid "No commits yet"
+msgstr "尚无提交"
+
+#: wt-status.c:1716
+msgid "Untracked files"
+msgstr "未跟踪的文件"
+
+#: wt-status.c:1718
+msgid "Ignored files"
+msgstr "忽略的文件"
+
+#: wt-status.c:1722
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
+"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
+
+#: wt-status.c:1728
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "未跟踪的文件没有列出%s"
+
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1730
+msgid " (use -u option to show untracked files)"
+msgstr "（使用 -u 参数显示未跟踪的文件）"
+
+#: wt-status.c:1736
+msgid "No changes"
+msgstr "没有修改"
+
+#: wt-status.c:1741
+#, 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:1744
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "修改尚未加入提交\n"
+
+#: wt-status.c:1747
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
+
+#: wt-status.c:1750
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "提交为空，但是存在尚未跟踪的文件\n"
+
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1753
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
+
+#: wt-status.c:1756 wt-status.c:1761
+#, c-format
+msgid "nothing to commit\n"
+msgstr "无文件要提交\n"
+
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1759
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
+
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1763
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "无文件要提交，干净的工作区\n"
+
+#: wt-status.c:1876
+msgid "No commits yet on "
+msgstr "尚无提交在 "
+
+#: wt-status.c:1880
+msgid "HEAD (no branch)"
+msgstr "HEAD（非分支）"
+
+#: wt-status.c:1911
+msgid "different"
+msgstr "不同"
+
+# 译者：注意保持句尾空格
+#: wt-status.c:1913 wt-status.c:1921
+msgid "behind "
+msgstr "落后 "
+
+#: wt-status.c:1916 wt-status.c:1919
+msgid "ahead "
+msgstr "领先 "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2443
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "不能%s：您有未暂存的变更。"
+
+#: wt-status.c:2449
+msgid "additionally, your index contains uncommitted changes."
+msgstr "另外，您的索引中包含未提交的变更。"
+
+#: wt-status.c:2451
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "不能%s：您的索引中包含未提交的变更。"
+
+#: builtin/add.c:25
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<选项>] [--] <路径规格>..."
+
+#: builtin/add.c:84
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "意外的差异状态 %c"
+
+#: builtin/add.c:89 builtin/commit.c:285
+msgid "updating files failed"
+msgstr "更新文件失败"
+
+#: builtin/add.c:99
+#, c-format
+msgid "remove '%s'\n"
+msgstr "删除 '%s'\n"
+
+#: builtin/add.c:174
+msgid "Unstaged changes after refreshing the index:"
+msgstr "刷新索引之后尚未被暂存的变更："
+
+#: builtin/add.c:234 builtin/rev-parse.c:896
+msgid "Could not read the index"
+msgstr "不能读取索引"
+
+#: builtin/add.c:245
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr "无法为写入打开 '%s'。"
+
+#: builtin/add.c:249
+msgid "Could not write patch"
+msgstr "不能生成补丁"
+
+#: builtin/add.c:252
+msgid "editing patch failed"
+msgstr "编辑补丁失败"
+
+#: builtin/add.c:255
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "不能对 '%s' 调用 stat"
+
+#: builtin/add.c:257
+msgid "Empty patch. Aborted."
+msgstr "空补丁。异常终止。"
+
+#: builtin/add.c:262
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "不能应用 '%s'"
+
+#: builtin/add.c:270
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
+
+#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+msgid "dry run"
+msgstr "演习"
+
+#: builtin/add.c:293
+msgid "interactive picking"
+msgstr "交互式拣选"
+
+#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+msgid "select hunks interactively"
+msgstr "交互式挑选数据块"
+
+#: builtin/add.c:295
+msgid "edit current diff and apply"
+msgstr "编辑当前差异并应用"
+
+#: builtin/add.c:296
+msgid "allow adding otherwise ignored files"
+msgstr "允许添加忽略的文件"
+
+#: builtin/add.c:297
+msgid "update tracked files"
+msgstr "更新已跟踪的文件"
+
+#: builtin/add.c:298
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "对已跟踪文件（暗含 -u）重新归一换行符"
+
+#: builtin/add.c:299
+msgid "record only the fact that the path will be added later"
+msgstr "只记录，该路径稍后再添加"
+
+#: builtin/add.c:300
+msgid "add changes from all tracked and untracked files"
+msgstr "添加所有改变的已跟踪文件和未跟踪文件"
+
+#: builtin/add.c:303
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
+
+#: builtin/add.c:305
+msgid "don't add, only refresh the index"
+msgstr "不添加，只刷新索引"
+
+#: builtin/add.c:306
+msgid "just skip files which cannot be added because of errors"
+msgstr "跳过因出错不能添加的文件"
+
+#: builtin/add.c:307
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
+
+#: builtin/add.c:309 builtin/update-index.c:1001
+msgid "override the executable bit of the listed files"
+msgstr "覆盖列表里文件的可执行位"
+
+#: builtin/add.c:311
+msgid "warn when adding an embedded repository"
+msgstr "创建一个嵌入式仓库时给予警告"
+
+#: builtin/add.c:326
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容，并"
+"且不知道该如何获取它。\n"
+"如果您要添加一个子模组，使用：\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"如果您不小心添加了这个路径，可以用下面的命令将其从索引中删除：\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"参见 \"git help submodule\" 获取更多信息。"
+
+#: builtin/add.c:354
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "正在添加嵌入式 git 仓库：%s"
+
+#: builtin/add.c:372
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr "使用 -f 参数如果您确实要添加它们。\n"
+
+#: builtin/add.c:379
+msgid "adding files failed"
+msgstr "添加文件失败"
+
+#: builtin/add.c:419
+msgid "-A and -u are mutually incompatible"
+msgstr "-A 和 -u 选项互斥"
+
+#: builtin/add.c:426
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
+
+#: builtin/add.c:430
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
+
+#: builtin/add.c:445
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "没有指定文件，也没有文件被添加。\n"
+
+#: builtin/add.c:446
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "也许您想要执行 'git add .'？\n"
+
+#: builtin/am.c:348
+msgid "could not parse author script"
+msgstr "不能解析作者脚本"
+
+#: builtin/am.c:432
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' 被 applypatch-msg 钩子删除"
+
+#: builtin/am.c:474
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "非法的输入行：'%s'。"
+
+#: builtin/am.c:512
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
+
+#: builtin/am.c:538
+msgid "fseek failed"
+msgstr "fseek 失败"
+
+#: builtin/am.c:726
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "无法解析补丁 '%s'"
+
+#: builtin/am.c:791
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "一次只能有一个 StGIT 补丁队列被应用"
+
+#: builtin/am.c:839
+msgid "invalid timestamp"
+msgstr "无效的时间戳"
+
+#: builtin/am.c:844 builtin/am.c:856
+msgid "invalid Date line"
+msgstr "无效的日期行"
+
+#: builtin/am.c:851
+msgid "invalid timezone offset"
+msgstr "无效的时区偏移值"
+
+#: builtin/am.c:944
+msgid "Patch format detection failed."
+msgstr "补丁格式探测失败。"
+
+#: builtin/am.c:949 builtin/clone.c:409
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "创建目录 '%s' 失败"
+
+#: builtin/am.c:954
+msgid "Failed to split patches."
+msgstr "拆分补丁失败。"
+
+#: builtin/am.c:1084 builtin/commit.c:371
+msgid "unable to write index file"
+msgstr "无法写入索引文件"
+
+#: builtin/am.c:1098
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "当您解决这一问题，执行 \"%s --continue\"。"
+
+#: builtin/am.c:1099
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
+
+#: builtin/am.c:1100
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
+
+#: builtin/am.c:1183
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。"
+
+#: builtin/am.c:1211
+msgid "Patch is empty."
+msgstr "补丁为空。"
+
+#: builtin/am.c:1277
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr "无效的身份标识：%.*s"
+
+#: builtin/am.c:1299
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "不能解析提交 %s"
+
+#: builtin/am.c:1495
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr "仓库缺乏必要的数据对象以进行三方合并。"
+
+#: builtin/am.c:1497
+msgid "Using index info to reconstruct a base tree..."
+msgstr "使用索引来重建一个（三方合并的）基础目录树..."
+
+#: builtin/am.c:1516
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"您是否曾手动编辑过您的补丁？\n"
+"无法应用补丁到索引中的数据对象上。"
+
+#: builtin/am.c:1522
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "回落到基础版本上打补丁及进行三方合并..."
+
+#: builtin/am.c:1548
+msgid "Failed to merge in the changes."
+msgstr "无法合并变更。"
+
+#: builtin/am.c:1580
+msgid "applying to an empty history"
+msgstr "正应用到一个空历史上"
+
+#: builtin/am.c:1627 builtin/am.c:1631
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "无法继续：%s 不存在。"
+
+#: builtin/am.c:1647
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr "标准输入没有和终端关联，不能进行交互式操作。"
+
+#: builtin/am.c:1652
+msgid "Commit Body is:"
+msgstr "提交内容为："
+
+# 译者：注意保持句尾空格
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#: builtin/am.c:1662
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
+
+#: builtin/am.c:1712
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "脏索引：不能应用补丁（脏文件：%s）"
+
+#: builtin/am.c:1752 builtin/am.c:1820
+#, c-format
+msgid "Applying: %.*s"
+msgstr "应用：%.*s"
+
+#: builtin/am.c:1769
+msgid "No changes -- Patch already applied."
+msgstr "没有变更 —— 补丁已经应用过。"
+
+#: builtin/am.c:1775
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "打补丁失败于 %s %.*s"
+
+#: builtin/am.c:1779
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr "用 'git am --show-current-patch' 命令查看失败的补丁"
+
+#: builtin/am.c:1823
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
+msgstr ""
+"没有变更 —— 您是不是忘了执行 'git add'？\n"
+"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
+"您也许想要跳过这个补丁。"
+
+#: builtin/am.c:1830
+msgid ""
+"You still have unmerged paths in your index.\n"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
+msgstr ""
+"在您的索引中仍存在未合并的路径。\n"
+"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
+"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
+
+#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
+#: builtin/reset.c:337
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "不能解析对象 '%s'。"
+
+#: builtin/am.c:1989
+msgid "failed to clean index"
+msgstr "清空索引失败"
+
+#: builtin/am.c:2033
+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:2130
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "无效的 --patch-format 值：%s"
+
+#: builtin/am.c:2166
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
+
+#: builtin/am.c:2167
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<选项>] (--continue | --skip | --abort)"
+
+#: builtin/am.c:2173
+msgid "run interactively"
+msgstr "以交互式方式运行"
+
+#: builtin/am.c:2175
+msgid "historical option -- no-op"
+msgstr "老的参数 —— 无作用"
+
+#: builtin/am.c:2177
+msgid "allow fall back on 3way merging if needed"
+msgstr "如果必要，允许使用三方合并。"
+
+#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:306 builtin/stash.c:805
+msgid "be quiet"
+msgstr "静默模式"
+
+#: builtin/am.c:2180
+msgid "add a Signed-off-by line to the commit message"
+msgstr "在提交说明中添加一个 Signed-off-by 签名"
+
+#: builtin/am.c:2183
+msgid "recode into utf8 (default)"
+msgstr "使用 utf8 字符集（默认）"
+
+#: builtin/am.c:2185
+msgid "pass -k flag to git-mailinfo"
+msgstr "向 git-mailinfo 传递 -k 参数"
+
+#: builtin/am.c:2187
+msgid "pass -b flag to git-mailinfo"
+msgstr "向 git-mailinfo 传递 -b 参数"
+
+#: builtin/am.c:2189
+msgid "pass -m flag to git-mailinfo"
+msgstr "向 git-mailinfo 传递 -m 参数"
+
+#: builtin/am.c:2191
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
+
+#: builtin/am.c:2194
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
+
+#: builtin/am.c:2197
+msgid "strip everything before a scissors line"
+msgstr "丢弃裁切线前的所有内容"
+
+#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
+#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
+#: builtin/am.c:2226
+msgid "pass it through git-apply"
+msgstr "传递给 git-apply"
+
+#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
+#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
+#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
+#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
+#: parse-options.h:141 parse-options.h:162 parse-options.h:311
+msgid "n"
+msgstr "n"
+
+#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
+msgid "format"
+msgstr "格式"
+
+#: builtin/am.c:2223
+msgid "format the patch(es) are in"
+msgstr "补丁的格式"
+
+#: builtin/am.c:2229
+msgid "override error message when patch failure occurs"
+msgstr "打补丁失败时显示的错误信息"
+
+#: builtin/am.c:2231
+msgid "continue applying patches after resolving a conflict"
+msgstr "冲突解决后继续应用补丁"
+
+#: builtin/am.c:2234
+msgid "synonyms for --continue"
+msgstr "和 --continue 同义"
+
+#: builtin/am.c:2237
+msgid "skip the current patch"
+msgstr "跳过当前补丁"
+
+#: builtin/am.c:2240
+msgid "restore the original branch and abort the patching operation."
+msgstr "恢复原始分支并终止打补丁操作。"
+
+#: builtin/am.c:2243
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr "终止补丁操作但保持 HEAD 不变。"
+
+#: builtin/am.c:2246
+msgid "show the patch being applied."
+msgstr "显示正在应用的补丁。"
+
+#: builtin/am.c:2250
+msgid "lie about committer date"
+msgstr "将作者日期作为提交日期"
+
+#: builtin/am.c:2252
+msgid "use current timestamp for author date"
+msgstr "用当前时间作为作者日期"
+
+#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
+#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
+#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
+msgid "key-id"
+msgstr "key-id"
+
+#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+msgid "GPG-sign commits"
+msgstr "使用 GPG 签名提交"
+
+#: builtin/am.c:2258
+msgid "(internal use for git-rebase)"
+msgstr "（内部使用，用于 git-rebase）"
+
+#: builtin/am.c:2276
+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."
+msgstr ""
+"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
+"请不要再使用它了。"
+
+#: builtin/am.c:2283
+msgid "failed to read the index"
+msgstr "读取索引失败"
+
+#: builtin/am.c:2298
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
+
+#: builtin/am.c:2322
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"发现了错误的 %s 目录。\n"
+"使用 \"git am --abort\" 删除它。"
+
+#: builtin/am.c:2328
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "解决操作未进行，我们不会继续。"
+
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<选项>] [<补丁>...]"
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr "不能创建归档文件 '%s'"
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr "不能重定向输出"
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr "git archive：未提供远程 URL"
+
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive：期望是 ACK/NAK，却得到 flush 包"
+
+#: builtin/archive.c:64
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive：NACK %s"
+
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
+msgstr "git archive：协议错误"
+
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
+msgstr "git archive：应有一个 flush 包"
+
+#: builtin/bisect--helper.c:22
+msgid "git bisect--helper --next-all [--no-checkout]"
+msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
+
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<提交>]"
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语"
+">"
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}"
+"=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]"
+
+#: builtin/bisect--helper.c:86
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' 不是一个有效的术语"
+
+#: builtin/bisect--helper.c:90
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "不能使用内置命令 '%s' 作为术语"
+
+#: builtin/bisect--helper.c:100
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "不能修改术语 '%s' 的含义"
+
+#: builtin/bisect--helper.c:111
+msgid "please use two different terms"
+msgstr "请使用两个不同的术语"
+
+#: builtin/bisect--helper.c:118
+msgid "could not open the file BISECT_TERMS"
+msgstr "不能打开文件 BISECT_TERMS"
+
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "我们没有在二分查找。\n"
+
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' 不是一个有效的提交"
+
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
+
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "坏的 bisect_write 参数：%s"
+
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "无法获取版本 '%s' 的对象 ID"
+
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "无法打开文件 '%s'"
+
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中"
+
+#: builtin/bisect--helper.c:285
+#, c-format
+msgid ""
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+"您需要给我至少一个 %s 和一个 %s 版本。\n"
+"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
+
+#: builtin/bisect--helper.c:289
+#, c-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+"您需要执行 \"git bisect start\" 来开始。\n"
+"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
+"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
+
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "在只有一个 %s 提交的情况下二分查找"
+
+# 译者：注意保持句尾空格
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
+msgstr "您确认么[Y/n]？ "
+
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr "未定义术语"
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n"
+
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"命令 'git bisect terms' 的参数 %s 无效。\n"
+"支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
+
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "未识别的选项：'%s'"
+
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "'%s' 看起来不是一个有效的版本"
+
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr "坏的 HEAD - 我需要一个 HEAD"
+
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
+
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "不会在做了 cg-seek 的树上做二分查找"
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr "坏的 HEAD - 奇怪的符号引用"
+
+#: builtin/bisect--helper.c:627
+msgid "perform 'git bisect next'"
+msgstr "执行 'git bisect next'"
+
+#: builtin/bisect--helper.c:629
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "将术语写入 .git/BISECT_TERMS"
+
+#: builtin/bisect--helper.c:631
+msgid "cleanup the bisection state"
+msgstr "清除二分查找状态"
+
+#: builtin/bisect--helper.c:633
+msgid "check for expected revs"
+msgstr "检查预期的版本"
+
+#: builtin/bisect--helper.c:635
+msgid "reset the bisection state"
+msgstr "清除二分查找状态"
+
+#: builtin/bisect--helper.c:637
+msgid "write out the bisection state in BISECT_LOG"
+msgstr "将二分查找的状态写入 BISECT_LOG"
+
+#: builtin/bisect--helper.c:639
+msgid "check and set terms in a bisection state"
+msgstr "在一个二分查找状态中检查和设置术语"
+
+#: builtin/bisect--helper.c:641
+msgid "check whether bad or good terms exist"
+msgstr "检查坏的或好的术语是否存在"
+
+#: builtin/bisect--helper.c:643
+msgid "print out the bisect terms"
+msgstr "打印二分查找术语"
+
+#: builtin/bisect--helper.c:645
+msgid "start the bisect session"
+msgstr "启动二分查找过程"
+
+#: builtin/bisect--helper.c:647
+msgid "update BISECT_HEAD instead of checking out the current commit"
+msgstr "更新 BISECT_HEAD 而非检出当前提交"
+
+#: builtin/bisect--helper.c:649
+msgid "no log for BISECT_WRITE"
+msgstr "BISECT_WRITE 无日志"
+
+#: builtin/bisect--helper.c:666
+msgid "--write-terms requires two arguments"
+msgstr "--write-terms 需要两个参数"
+
+#: builtin/bisect--helper.c:670
+msgid "--bisect-clean-state requires no arguments"
+msgstr "--bisect-clean-state 不带参数"
+
+#: builtin/bisect--helper.c:677
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset 无需参数或者需要一个提交"
+
+#: builtin/bisect--helper.c:681
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr "--bisect-write 需要 4 或 5 个参数"
+
+#: builtin/bisect--helper.c:687
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr "--check-and-set-terms 需要 3 个参数"
+
+#: builtin/bisect--helper.c:693
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check 需要 2 或 3 个参数"
+
+#: builtin/bisect--helper.c:699
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms 需要 0 或 1 个参数"
+
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
+
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
+
+#: builtin/blame.c:407
+#, c-format
+msgid "expecting a color: %s"
+msgstr "期望一个颜色：%s"
+
+#: builtin/blame.c:414
+msgid "must end with a color"
+msgstr "必须以一个颜色结尾"
+
+#: builtin/blame.c:701
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
+
+#: builtin/blame.c:719
+msgid "invalid value for blame.coloring"
+msgstr "设置 blame.coloring 中的无效取值"
+
+#: builtin/blame.c:794
+msgid "Show blame entries as we find them, incrementally"
+msgstr "增量式地显示发现的 blame 条目"
+
+#: builtin/blame.c:795
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
+msgstr "边界提交显示空的 SHA-1（默认：关闭）"
+
+#: builtin/blame.c:796
+msgid "Do not treat root commits as boundaries (Default: off)"
+msgstr "不把根提交作为边界（默认：关闭）"
+
+#: builtin/blame.c:797
+msgid "Show work cost statistics"
+msgstr "显示命令消耗统计"
+
+#: builtin/blame.c:798
+msgid "Force progress reporting"
+msgstr "强制进度显示"
+
+#: builtin/blame.c:799
+msgid "Show output score for blame entries"
+msgstr "显示判断 blame 条目位移的得分诊断信息"
+
+#: builtin/blame.c:800
+msgid "Show original filename (Default: auto)"
+msgstr "显示原始文件名（默认：自动）"
+
+#: builtin/blame.c:801
+msgid "Show original linenumber (Default: off)"
+msgstr "显示原始的行号（默认：关闭）"
+
+#: builtin/blame.c:802
+msgid "Show in a format designed for machine consumption"
+msgstr "显示为一个适合机器读取的格式"
+
+#: builtin/blame.c:803
+msgid "Show porcelain format with per-line commit information"
+msgstr "为每一行显示机器适用的提交信息"
+
+#: builtin/blame.c:804
+msgid "Use the same output mode as git-annotate (Default: off)"
+msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
+
+#: builtin/blame.c:805
+msgid "Show raw timestamp (Default: off)"
+msgstr "显示原始时间戳（默认：关闭）"
+
+#: builtin/blame.c:806
+msgid "Show long commit SHA1 (Default: off)"
+msgstr "显示长的 SHA1 提交号（默认：关闭）"
+
+#: builtin/blame.c:807
+msgid "Suppress author name and timestamp (Default: off)"
+msgstr "隐藏作者名字和时间戳（默认：关闭）"
+
+#: builtin/blame.c:808
+msgid "Show author email instead of name (Default: off)"
+msgstr "显示作者的邮箱而不是名字（默认：关闭）"
+
+#: builtin/blame.c:809
+msgid "Ignore whitespace differences"
+msgstr "忽略空白差异"
+
+#: builtin/blame.c:810
+msgid "color redundant metadata from previous line differently"
+msgstr "使用颜色间隔输出与前一行不同的重复元信息"
+
+#: builtin/blame.c:811
+msgid "color lines by age"
+msgstr "依据时间着色"
+
+#: builtin/blame.c:818
+msgid "Use an experimental heuristic to improve diffs"
+msgstr "使用一个试验性的启发式算法改进差异显示"
+
+#: builtin/blame.c:820
+msgid "Spend extra cycles to find better match"
+msgstr "花费额外的循环来找到更好的匹配"
+
+#: builtin/blame.c:821
+msgid "Use revisions from <file> instead of calling git-rev-list"
+msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
+
+#: builtin/blame.c:822
+msgid "Use <file>'s contents as the final image"
+msgstr "使用 <文件> 的内容作为最终的图片"
+
+#: builtin/blame.c:823 builtin/blame.c:824
+msgid "score"
+msgstr "得分"
+
+#: builtin/blame.c:823
+msgid "Find line copies within and across files"
+msgstr "找到文件内及跨文件的行拷贝"
+
+#: builtin/blame.c:824
+msgid "Find line movements within and across files"
+msgstr "找到文件内及跨文件的行移动"
+
+#: builtin/blame.c:825
+msgid "n,m"
+msgstr "n,m"
+
+#: builtin/blame.c:825
+msgid "Process only line range n,m, counting from 1"
+msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
+
+#: builtin/blame.c:876
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
+
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output. For C locale, "4 years, 11
+#. months ago", which 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:927
+msgid "4 years, 11 months ago"
+msgstr "4 年 11 个月前"
+
+#: builtin/blame.c:1031
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "文件 %s 只有 %lu 行"
+msgstr[1] "文件 %s 只有 %lu 行"
+
+#: builtin/blame.c:1077
+msgid "Blaming lines"
+msgstr "追踪代码行"
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
+
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
+
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<选项>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<选项>] [-r | -a] [--format]"
+
+# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
+#: builtin/branch.c:151
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
+msgstr ""
+"将要删除的分支 '%s' 已经被合并到\n"
+" '%s'，但未合并到 HEAD。"
+
+# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
+#: builtin/branch.c:155
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
+msgstr ""
+"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
+" 然而却尚未被合并到分支 '%s' 。"
+
+#: builtin/branch.c:169
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "无法查询 '%s' 指向的提交对象"
+
+#: builtin/branch.c:173
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+"分支 '%s' 没有完全合并。\n"
+"如果您确认要删除它，执行 'git branch -D %s'。"
+
+#: builtin/branch.c:186
+msgid "Update of config-file failed"
+msgstr "更新配置文件失败"
+
+#: builtin/branch.c:217
+msgid "cannot use -a with -d"
+msgstr "不能将 -a 和 -d 同时使用"
+
+#: builtin/branch.c:223
+msgid "Couldn't look up commit object for HEAD"
+msgstr "无法查询 HEAD 指向的提交对象"
+
+#: builtin/branch.c:237
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
+
+#: builtin/branch.c:252
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "未能找到远程跟踪分支 '%s'。"
+
+#: builtin/branch.c:253
+#, c-format
+msgid "branch '%s' not found."
+msgstr "分支 '%s' 未发现。"
+
+#: builtin/branch.c:268
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
+msgstr "无法删除远程跟踪分支 '%s'"
+
+#: builtin/branch.c:269
+#, c-format
+msgid "Error deleting branch '%s'"
+msgstr "无法删除分支 '%s'"
+
+#: builtin/branch.c:276
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
+
+#: builtin/branch.c:277
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "已删除分支 %s（曾为 %s）。\n"
+
+#: builtin/branch.c:421 builtin/tag.c:60
+msgid "unable to parse format string"
+msgstr "不能解析格式化字符串"
+
+#: builtin/branch.c:452
+msgid "could not resolve HEAD"
+msgstr "不能解析 HEAD 提交"
+
+#: builtin/branch.c:458
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) 指向 refs/heads/ 之外"
+
+#: builtin/branch.c:473
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "分支 %s 正被变基到 %s"
+
+#: builtin/branch.c:477
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "分支 %s 正被二分查找于 %s"
+
+#: builtin/branch.c:494
+msgid "cannot copy the current branch while not on any."
+msgstr "无法拷贝当前分支因为不处于任何分支上。"
+
+#: builtin/branch.c:496
+msgid "cannot rename the current branch while not on any."
+msgstr "无法重命名当前分支因为不处于任何分支上。"
+
+#: builtin/branch.c:507
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "无效的分支名：'%s'"
+
+#: builtin/branch.c:534
+msgid "Branch rename failed"
+msgstr "分支重命名失败"
+
+#: builtin/branch.c:536
+msgid "Branch copy failed"
+msgstr "分支拷贝失败"
+
+#: builtin/branch.c:540
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "已为错误命名的分支 '%s' 创建了一个副本"
+
+#: builtin/branch.c:543
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "已将错误命名的分支 '%s' 重命名"
+
+#: builtin/branch.c:549
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr "分支重命名为 %s，但 HEAD 没有更新！"
+
+#: builtin/branch.c:558
+msgid "Branch is renamed, but update of config-file failed"
+msgstr "分支被重命名，但更新配置文件失败"
+
+#: builtin/branch.c:560
+msgid "Branch is copied, but update of config-file failed"
+msgstr "分支已拷贝，但更新配置文件失败"
+
+#: builtin/branch.c:576
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"请编辑分支的描述\n"
+" %s\n"
+"以 '%c' 开头的行将被过滤。\n"
+
+#: builtin/branch.c:610
+msgid "Generic options"
+msgstr "通用选项"
+
+#: builtin/branch.c:612
+msgid "show hash and subject, give twice for upstream branch"
+msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
+
+#: builtin/branch.c:613
+msgid "suppress informational messages"
+msgstr "不显示信息"
+
+#: builtin/branch.c:614
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "设置跟踪模式（参见 git-pull(1)）"
+
+#: builtin/branch.c:616
+msgid "do not use"
+msgstr "不要使用"
+
+#: builtin/branch.c:618 builtin/rebase.c:485
+msgid "upstream"
+msgstr "上游"
+
+#: builtin/branch.c:618
+msgid "change the upstream info"
+msgstr "改变上游信息"
+
+#: builtin/branch.c:619
+msgid "Unset the upstream info"
+msgstr "取消上游信息的设置"
+
+#: builtin/branch.c:620
+msgid "use colored output"
+msgstr "使用彩色输出"
+
+#: builtin/branch.c:621
+msgid "act on remote-tracking branches"
+msgstr "作用于远程跟踪分支"
+
+#: builtin/branch.c:623 builtin/branch.c:625
+msgid "print only branches that contain the commit"
+msgstr "只打印包含该提交的分支"
+
+#: builtin/branch.c:624 builtin/branch.c:626
+msgid "print only branches that don't contain the commit"
+msgstr "只打印不包含该提交的分支"
+
+#: builtin/branch.c:629
+msgid "Specific git-branch actions:"
+msgstr "具体的 git-branch 动作："
+
+#: builtin/branch.c:630
+msgid "list both remote-tracking and local branches"
+msgstr "列出远程跟踪及本地分支"
+
+#: builtin/branch.c:632
+msgid "delete fully merged branch"
+msgstr "删除完全合并的分支"
+
+#: builtin/branch.c:633
+msgid "delete branch (even if not merged)"
+msgstr "删除分支（即使没有合并）"
+
+#: builtin/branch.c:634
+msgid "move/rename a branch and its reflog"
+msgstr "移动/重命名一个分支，以及它的引用日志"
+
+#: builtin/branch.c:635
+msgid "move/rename a branch, even if target exists"
+msgstr "移动/重命名一个分支，即使目标已存在"
+
+#: builtin/branch.c:636
+msgid "copy a branch and its reflog"
+msgstr "拷贝一个分支和它的引用日志"
+
+#: builtin/branch.c:637
+msgid "copy a branch, even if target exists"
+msgstr "拷贝一个分支，即使目标已存在"
+
+#: builtin/branch.c:638
+msgid "list branch names"
+msgstr "列出分支名"
+
+#: builtin/branch.c:639
+msgid "show current branch name"
+msgstr "显示当前分支名"
+
+#: builtin/branch.c:640
+msgid "create the branch's reflog"
+msgstr "创建分支的引用日志"
+
+#: builtin/branch.c:642
+msgid "edit the description for the branch"
+msgstr "标记分支的描述"
+
+#: builtin/branch.c:643
+msgid "force creation, move/rename, deletion"
+msgstr "强制创建、移动/重命名、删除"
+
+#: builtin/branch.c:644
+msgid "print only branches that are merged"
+msgstr "只打印已经合并的分支"
+
+#: builtin/branch.c:645
+msgid "print only branches that are not merged"
+msgstr "只打印尚未合并的分支"
+
+#: builtin/branch.c:646
+msgid "list branches in columns"
+msgstr "以列的方式显示分支"
+
+#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
+#: builtin/tag.c:427
+msgid "object"
+msgstr "对象"
+
+#: builtin/branch.c:650
+msgid "print only branches of the object"
+msgstr "只打印指向该对象的分支"
+
+#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+msgid "sorting and filtering are case insensitive"
+msgstr "排序和过滤属于大小写不敏感"
+
+#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
+#: builtin/verify-tag.c:39
+msgid "format to use for the output"
+msgstr "输出格式"
+
+#: builtin/branch.c:676 builtin/clone.c:748
+msgid "HEAD not found below refs/heads!"
+msgstr "HEAD 没有位于 /refs/heads 之下！"
+
+#: builtin/branch.c:700
+msgid "--column and --verbose are incompatible"
+msgstr "--column 和 --verbose 不兼容"
+
+#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+msgid "branch name required"
+msgstr "必须提供分支名"
+
+#: builtin/branch.c:745
+msgid "Cannot give description to detached HEAD"
+msgstr "不能向分离头指针提供描述"
+
+#: builtin/branch.c:750
+msgid "cannot edit description of more than one branch"
+msgstr "不能为一个以上的分支编辑描述"
+
+#: builtin/branch.c:757
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr "分支 '%s' 尚无提交。"
+
+#: builtin/branch.c:760
+#, c-format
+msgid "No branch named '%s'."
+msgstr "没有分支 '%s'。"
+
+#: builtin/branch.c:775
+msgid "too many branches for a copy operation"
+msgstr "为拷贝操作提供了太多的分支名"
+
+#: builtin/branch.c:784
+msgid "too many arguments for a rename operation"
+msgstr "为重命名操作提供了太多的参数"
+
+#: builtin/branch.c:789
+msgid "too many arguments to set new upstream"
+msgstr "为设置新上游提供了太多的参数"
+
+#: builtin/branch.c:793
+#, 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:796 builtin/branch.c:819
+#, c-format
+msgid "no such branch '%s'"
+msgstr "没有此分支 '%s'"
+
+#: builtin/branch.c:800
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "分支 '%s' 不存在"
+
+#: builtin/branch.c:813
+msgid "too many arguments to unset upstream"
+msgstr "为取消上游设置操作提供了太多的参数"
+
+#: builtin/branch.c:817
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
+
+#: builtin/branch.c:823
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "分支 '%s' 没有上游信息"
+
+#: builtin/branch.c:833
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
+
+#: builtin/branch.c:836
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr ""
+"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
+
+#: builtin/bundle.c:45
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s 可以\n"
+
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
+msgstr "需要一个仓库来创建包。"
+
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
+msgstr "需要一个仓库来解包。"
+
+#: builtin/cat-file.c:593
+msgid ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+msgstr ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
+
+#: builtin/cat-file.c:594
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+
+#: builtin/cat-file.c:615
+msgid "only one batch option may be specified"
+msgstr "只能指定一个批处理选项"
+
+#: builtin/cat-file.c:633
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
+
+#: builtin/cat-file.c:634
+msgid "show object type"
+msgstr "显示对象类型"
+
+#: builtin/cat-file.c:635
+msgid "show object size"
+msgstr "显示对象大小"
+
+#: builtin/cat-file.c:637
+msgid "exit with zero when there's no error"
+msgstr "当没有错误时退出并返回零"
+
+#: builtin/cat-file.c:638
+msgid "pretty-print object's content"
+msgstr "美观地打印对象的内容"
+
+#: builtin/cat-file.c:640
+msgid "for blob objects, run textconv on object's content"
+msgstr "对于数据对象，对其内容做文本转换"
+
+#: builtin/cat-file.c:642
+msgid "for blob objects, run filters on object's content"
+msgstr "对于数据对象，对其内容做过滤"
+
+#: builtin/cat-file.c:643 git-submodule.sh:936
+msgid "blob"
+msgstr "数据对象"
+
+#: builtin/cat-file.c:644
+msgid "use a specific path for --textconv/--filters"
+msgstr "对于 --textconv/--filters 使用一个特定的路径"
+
+#: builtin/cat-file.c:646
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr "允许 -s 和 -t 对损坏的对象生效"
+
+#: builtin/cat-file.c:647
+msgid "buffer --batch output"
+msgstr "缓冲 --batch 的输出"
+
+#: builtin/cat-file.c:649
+msgid "show info and content of objects fed from the standard input"
+msgstr "显示从标准输入提供的对象的信息和内容"
+
+#: builtin/cat-file.c:653
+msgid "show info about objects fed from the standard input"
+msgstr "显示从标准输入提供的对象的信息"
+
+#: builtin/cat-file.c:657
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
+
+#: builtin/cat-file.c:659
+msgid "show all objects with --batch or --batch-check"
+msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
+
+#: builtin/cat-file.c:661
+msgid "do not order --batch-all-objects output"
+msgstr "不要对 --batch-all-objects 的输出排序"
+
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
+
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
+
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr "报告设置在文件上的所有属性"
+
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
+msgstr "只使用索引中的 .gitattributes"
+
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
+msgstr "从标准输入读出文件名"
+
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
+msgstr "输入和输出的记录使用 NUL 字符终结"
+
+#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
+#: builtin/worktree.c:499
+msgid "suppress progress reporting"
+msgstr "不显示进度报告"
+
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
+msgstr "显示未匹配的输入路径"
+
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
+msgstr "检查时忽略索引"
+
+#: builtin/check-ignore.c:160
+msgid "cannot specify pathnames with --stdin"
+msgstr "不能同时指定路径及 --stdin 参数"
+
+#: builtin/check-ignore.c:163
+msgid "-z only makes sense with --stdin"
+msgstr "-z 需要和 --stdin 参数共用才有意义"
+
+#: builtin/check-ignore.c:165
+msgid "no path specified"
+msgstr "未指定路径"
+
+#: builtin/check-ignore.c:169
+msgid "--quiet is only valid with a single pathname"
+msgstr "参数 --quiet 只在提供一个路径名时有效"
+
+#: builtin/check-ignore.c:171
+msgid "cannot have both --quiet and --verbose"
+msgstr "不能同时提供 --quiet 和 --verbose 参数"
+
+#: builtin/check-ignore.c:174
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching 选项只在使用 --verbose 时有效"
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<选项>] <联系地址>..."
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr "还从标准输入读取联系地址"
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr "不能解析联系地址：%s"
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr "未指定联系地址"
+
+#: builtin/checkout-index.c:131
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<选项>] [--] [<文件>...]"
+
+#: builtin/checkout-index.c:148
+msgid "stage should be between 1 and 3 or all"
+msgstr "索引值应该取值 1 到 3 或者 all"
+
+#: builtin/checkout-index.c:164
+msgid "check out all files in the index"
+msgstr "检出索引区的所有文件"
+
+#: builtin/checkout-index.c:165
+msgid "force overwrite of existing files"
+msgstr "强制覆盖现有的文件"
+
+#: builtin/checkout-index.c:167
+msgid "no warning for existing files and files not in index"
+msgstr "存在或不在索引中的文件都没有警告"
+
+#: builtin/checkout-index.c:169
+msgid "don't checkout new files"
+msgstr "不检出新文件"
+
+#: builtin/checkout-index.c:171
+msgid "update stat information in the index file"
+msgstr "更新索引中文件的状态信息"
+
+#: builtin/checkout-index.c:175
+msgid "read list of paths from the standard input"
+msgstr "从标准输入读取路径列表"
+
+#: builtin/checkout-index.c:177
+msgid "write the content to temporary files"
+msgstr "将内容写入临时文件"
+
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
+#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
+#: builtin/worktree.c:672
+msgid "string"
+msgstr "字符串"
+
+#: builtin/checkout-index.c:179
+msgid "when creating files, prepend <string>"
+msgstr "在创建文件时，在前面加上 <字符串>"
+
+#: builtin/checkout-index.c:181
+msgid "copy out the files from named stage"
+msgstr "从指定暂存区中拷出文件"
+
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<选项>] <分支>"
+
+#: builtin/checkout.c:33
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
+
+#: builtin/checkout.c:151 builtin/checkout.c:190
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "路径 '%s' 没有我们的版本"
+
+#: builtin/checkout.c:153 builtin/checkout.c:192
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "路径 '%s' 没有他们的版本"
+
+#: builtin/checkout.c:169
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "路径 '%s' 没有全部必需的版本"
+
+#: builtin/checkout.c:219
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "路径 '%s' 没有必需的版本"
+
+#: builtin/checkout.c:237
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "path '%s'：无法合并"
+
+#: builtin/checkout.c:253
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "无法为 '%s' 添加合并结果"
+
+#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
+#: builtin/checkout.c:340
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "'%s' 不能在更新路径时使用"
+
+#: builtin/checkout.c:343 builtin/checkout.c:346
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "'%s' 不能和 %s 同时使用"
+
+#: builtin/checkout.c:349
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr "不能同时更新路径并切换到分支'%s'。"
+
+#: builtin/checkout.c:396 builtin/checkout.c:403
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "路径 '%s' 未合并"
+
+#: builtin/checkout.c:442
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "重新创建了 %d 个合并冲突"
+msgstr[1] "重新创建了 %d 个合并冲突"
+
+#: builtin/checkout.c:447
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "从 %2$s 更新了 %1$d 个路径"
+msgstr[1] "从 %2$s 更新了 %1$d 个路径"
+
+#: builtin/checkout.c:454
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "从索引区更新了 %d 个路径"
+msgstr[1] "从索引区更新了 %d 个路径"
+
+#: builtin/checkout.c:695
+msgid "you need to resolve your current index first"
+msgstr "您需要先解决当前索引的冲突"
+
+#: builtin/checkout.c:744
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"不能继续，下列文件有暂存的修改：\n"
+"%s"
+
+#: builtin/checkout.c:751
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr "下列文件暂存的修改可能会丢失：%s"
+
+#: builtin/checkout.c:848
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
+
+#: builtin/checkout.c:890
+msgid "HEAD is now at"
+msgstr "HEAD 目前位于"
+
+#: builtin/checkout.c:894 builtin/clone.c:701
+msgid "unable to update HEAD"
+msgstr "不能更新 HEAD"
+
+#: builtin/checkout.c:898
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "重置分支 '%s'\n"
+
+#: builtin/checkout.c:901
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "已经位于 '%s'\n"
+
+#: builtin/checkout.c:905
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "切换并重置分支 '%s'\n"
+
+#: builtin/checkout.c:907 builtin/checkout.c:1283
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "切换到一个新分支 '%s'\n"
+
+#: builtin/checkout.c:909
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "切换到分支 '%s'\n"
+
+# 译者：注意保持前导空格
+#: builtin/checkout.c:960
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " ... 及其它 %d 个。\n"
+
+#: builtin/checkout.c:966
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+"警告：您正丢下 %d 个提交，未和任何分支关联：\n"
+"\n"
+"%s\n"
+msgstr[1] ""
+"警告：您正丢下 %d 个提交，未和任何分支关联：\n"
+"\n"
+"%s\n"
+
+#: builtin/checkout.c:985
+#, c-format
+msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[0] ""
+"如果您想要通过创建新分支保存它，这可能是一个好时候。\n"
+"如下操作：\n"
+"\n"
+" git branch <新分支名> %s\n"
+"\n"
+msgstr[1] ""
+"如果您想要通过创建新分支保存它们，这可能是一个好时候。\n"
+"如下操作：\n"
+"\n"
+" git branch <新分支名> %s\n"
+"\n"
+
+#: builtin/checkout.c:1017
+msgid "internal error in revision walk"
+msgstr "在版本遍历时遇到内部错误"
+
+#: builtin/checkout.c:1021
+msgid "Previous HEAD position was"
+msgstr "之前的 HEAD 位置是"
+
+#: builtin/checkout.c:1052 builtin/checkout.c:1278
+msgid "You are on a branch yet to be born"
+msgstr "您位于一个尚未初始化的分支"
+
+#: builtin/checkout.c:1173
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "应只有一个引用，却给出了 %d 个"
+
+#: builtin/checkout.c:1209
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+"'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n"
+"请使用 --（和可选的 --no-guess）来消除歧义"
+
+#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
+#, c-format
+msgid "invalid reference: %s"
+msgstr "无效引用：%s"
+
+#: builtin/checkout.c:1251
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "引用不是一个树：%s"
+
+#: builtin/checkout.c:1292
+msgid "paths cannot be used with switching branches"
+msgstr "路径不能和切换分支同时使用"
+
+#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "'%s' 不能和切换分支同时使用"
+
+#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
+#: builtin/checkout.c:1318
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "'%s' 不能和 '%s' 同时使用"
+
+#: builtin/checkout.c:1323
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346
-#: builtin/worktree.c:348
-msgid "branch"
-msgstr "分支"
+#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118
+#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
+#: builtin/worktree.c:494
+msgid "branch"
+msgstr "分支"
+
+#: builtin/checkout.c:1357
+msgid "create and checkout a new branch"
+msgstr "创建并检出一个新的分支"
+
+#: builtin/checkout.c:1359
+msgid "create/reset and checkout a branch"
+msgstr "创建/重置并检出一个分支"
+
+#: builtin/checkout.c:1360
+msgid "create reflog for new branch"
+msgstr "为新的分支创建引用日志"
+
+#: builtin/checkout.c:1361 builtin/worktree.c:496
+msgid "detach HEAD at named commit"
+msgstr "HEAD 从指定的提交分离"
+
+#: builtin/checkout.c:1362
+msgid "set upstream info for new branch"
+msgstr "为新的分支设置上游信息"
+
+#: builtin/checkout.c:1364
+msgid "new-branch"
+msgstr "新分支"
+
+#: builtin/checkout.c:1364
+msgid "new unparented branch"
+msgstr "新的没有父提交的分支"
+
+#: builtin/checkout.c:1366
+msgid "checkout our version for unmerged files"
+msgstr "对尚未合并的文件检出我们的版本"
+
+#: builtin/checkout.c:1369
+msgid "checkout their version for unmerged files"
+msgstr "对尚未合并的文件检出他们的版本"
+
+#: builtin/checkout.c:1371
+msgid "force checkout (throw away local modifications)"
+msgstr "强制检出（丢弃本地修改）"
+
+#: builtin/checkout.c:1373
+msgid "perform a 3-way merge with the new branch"
+msgstr "和新的分支执行三方合并"
+
+#: builtin/checkout.c:1375 builtin/merge.c:284
+msgid "update ignored files (default)"
+msgstr "更新忽略的文件（默认）"
+
+#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
+msgid "style"
+msgstr "风格"
+
+#: builtin/checkout.c:1378
+msgid "conflict style (merge or diff3)"
+msgstr "冲突输出风格（merge 或 diff3）"
+
+#: builtin/checkout.c:1381
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "对路径不做稀疏检出的限制"
+
+#: builtin/checkout.c:1383
+msgid "do not second guess 'git checkout <no-such-branch>'"
+msgstr "不要二次猜测 'git checkout <无此分支>'"
+
+#: builtin/checkout.c:1385
+msgid "do not check if another worktree is holding the given ref"
+msgstr "不检查指定的引用是否被其他工作区所占用"
+
+#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141
+#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "强制显示进度报告"
+
+#: builtin/checkout.c:1390
+msgid "use overlay mode (default)"
+msgstr "使用叠加模式（默认）"
+
+#: builtin/checkout.c:1422
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr "-b、-B 和 --orphan 是互斥的"
+
+#: builtin/checkout.c:1425
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p 和 --overlay 互斥"
+
+#: builtin/checkout.c:1442
+msgid "--track needs a branch name"
+msgstr "--track 需要一个分支名"
+
+#: builtin/checkout.c:1447
+msgid "missing branch name; try -b"
+msgstr "缺少分支名，尝试 -b"
+
+#: builtin/checkout.c:1484
+msgid "invalid path specification"
+msgstr "无效的路径规格"
+
+#: builtin/checkout.c:1491
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
+
+#: builtin/checkout.c:1495
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout：--detach 不能接收路径参数 '%s'"
+
+#: builtin/checkout.c:1499
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
+
+#: builtin/checkout.c:1519
+#, c-format
+msgid ""
+"'%s' matched more than one remote tracking branch.\n"
+"We found %d remotes with a reference that matched. So we fell back\n"
+"on trying to resolve the argument as a path, but failed there too!\n"
+"\n"
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+" git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"'%s' 匹配了一个以上的远程跟踪分支。\n"
+"我们发现 %d 个远程仓库具有同名分支。所以我们转而尝试将这个参数解析为\n"
+"路径，但是也失败了！\n"
+"\n"
+"如果您想要检出一个远程跟踪分支，例如在远程仓库 'origin' 上的，您可以\n"
+"使用分支全名和 --track 选项：\n"
+"\n"
+" git checkout --track origin/<name>\n"
+"\n"
+"如果您总是喜欢使用模糊的简短分支名 <name>，而不喜欢如 'origin' 的远程\n"
+"仓库名，可以在配置中设置 checkout.defaultRemote=origin。"
+
+#: builtin/clean.c:28
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Removing %s\n"
+msgstr "正删除 %s\n"
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Would remove %s\n"
+msgstr "将删除 %s\n"
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "忽略仓库 %s\n"
+
+#: builtin/clean.c:35
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "将忽略仓库 %s\n"
+
+#: builtin/clean.c:36
+#, c-format
+msgid "failed to remove %s"
+msgstr "删除 %s 失败"
+
+#: builtin/clean.c:299 git-add--interactive.perl:579
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1 - select a numbered item\n"
+"foo - select item based on unique prefix\n"
+" - (empty) select nothing\n"
+msgstr ""
+"帮助：\n"
+"1 - 通过编号选择一个选项\n"
+"foo - 通过唯一前缀选择一个选项\n"
+" - （空）什么也不选择\n"
+
+#: builtin/clean.c:303 git-add--interactive.perl:588
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1 - select a single item\n"
+"3-5 - select a range of items\n"
+"2-3,6-9 - select multiple ranges\n"
+"foo - select item based on unique prefix\n"
+"-... - unselect specified items\n"
+"* - choose all items\n"
+" - (empty) finish selecting\n"
+msgstr ""
+"帮助：\n"
+"1 - 选择一个选项\n"
+"3-5 - 选择一个范围内的所有选项\n"
+"2-3,6-9 - 选择多个范围内的所有选项\n"
+"foo - 通过唯一前缀选择一个选项\n"
+"-... - 反选特定的选项\n"
+"* - 选择所有选项\n"
+" - （空）结束选择\n"
+
+#: builtin/clean.c:519 git-add--interactive.perl:554
+#: git-add--interactive.perl:559
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "嗯（%s）？\n"
+
+#: builtin/clean.c:661
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "输入模版以排除条目>> "
+
+#: builtin/clean.c:698
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "警告：无法找到和 %s 匹配的条目"
+
+#: builtin/clean.c:719
+msgid "Select items to delete"
+msgstr "选择要删除的条目"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:760
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "删除 %s [y/N]？"
+
+#: builtin/clean.c:785 git-add--interactive.perl:1717
+#, c-format
+msgid "Bye.\n"
+msgstr "再见。\n"
+
+#: builtin/clean.c:793
+msgid ""
+"clean - start cleaning\n"
+"filter by pattern - exclude items from deletion\n"
+"select by numbers - select items to be deleted by numbers\n"
+"ask each - confirm each deletion (like \"rm -i\")\n"
+"quit - stop cleaning\n"
+"help - this screen\n"
+"? - help for prompt selection"
+msgstr ""
+"clean - 开始清理\n"
+"filter by pattern - 通过模版排除要删除的条目\n"
+"select by numbers - 通过数字选择要删除的条目\n"
+"ask each - 针对删除逐一询问（就像 \"rm -i\"）\n"
+"quit - 停止删除并退出\n"
+"help - 显示本帮助\n"
+"? - 显示如何在提示符下选择的帮助"
+
+#: builtin/clean.c:820 git-add--interactive.perl:1793
+msgid "*** Commands ***"
+msgstr "*** 命令 ***"
+
+#: builtin/clean.c:821 git-add--interactive.perl:1790
+msgid "What now"
+msgstr "请选择"
+
+#: builtin/clean.c:829
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "将删除如下条目："
+msgstr[1] "将删除如下条目："
+
+#: builtin/clean.c:845
+msgid "No more files to clean, exiting."
+msgstr "没有要清理的文件，退出。"
+
+#: builtin/clean.c:907
+msgid "do not print names of files removed"
+msgstr "不打印删除文件的名称"
+
+#: builtin/clean.c:909
+msgid "force"
+msgstr "强制"
+
+#: builtin/clean.c:910
+msgid "interactive cleaning"
+msgstr "交互式清除"
+
+#: builtin/clean.c:912
+msgid "remove whole directories"
+msgstr "删除整个目录"
+
+#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
+#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/show-ref.c:179
+msgid "pattern"
+msgstr "模式"
+
+#: builtin/clean.c:914
+msgid "add <pattern> to ignore rules"
+msgstr "添加 <模式> 到忽略规则"
+
+#: builtin/clean.c:915
+msgid "remove ignored files, too"
+msgstr "也删除忽略的文件"
+
+#: builtin/clean.c:917
+msgid "remove only ignored files"
+msgstr "只删除忽略的文件"
+
+#: builtin/clean.c:935
+msgid "-x and -X cannot be used together"
+msgstr "-x 和 -X 不能同时使用"
+
+#: builtin/clean.c:939
+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:942
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
+
+#: builtin/clone.c:44
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
+
+#: builtin/clone.c:90
+msgid "don't create a checkout"
+msgstr "不创建一个检出"
+
+#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+msgid "create a bare repository"
+msgstr "创建一个纯仓库"
+
+#: builtin/clone.c:95
+msgid "create a mirror repository (implies bare)"
+msgstr "创建一个镜像仓库（也是纯仓库）"
+
+#: builtin/clone.c:97
+msgid "to clone from a local repository"
+msgstr "从本地仓库克隆"
+
+#: builtin/clone.c:99
+msgid "don't use local hardlinks, always copy"
+msgstr "不使用本地硬链接，始终复制"
+
+#: builtin/clone.c:101
+msgid "setup as shared repository"
+msgstr "设置为共享仓库"
+
+#: builtin/clone.c:104
+msgid "pathspec"
+msgstr "路径规格"
+
+#: builtin/clone.c:104
+msgid "initialize submodules in the clone"
+msgstr "在克隆时初始化子模组"
+
+#: builtin/clone.c:107
+msgid "number of submodules cloned in parallel"
+msgstr "并发克隆的子模组的数量"
+
+#: builtin/clone.c:108 builtin/init-db.c:486
+msgid "template-directory"
+msgstr "模板目录"
+
+#: builtin/clone.c:109 builtin/init-db.c:487
+msgid "directory from which templates will be used"
+msgstr "模板目录将被使用"
+
+#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
+#: builtin/submodule--helper.c:1859
+msgid "reference repository"
+msgstr "参考仓库"
+
+#: builtin/clone.c:115 builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1861
+msgid "use --reference only while cloning"
+msgstr "仅在克隆时参考 --reference 指向的本地仓库"
+
+#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3306 builtin/repack.c:329
+msgid "name"
+msgstr "名称"
+
+#: builtin/clone.c:117
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
+
+#: builtin/clone.c:119
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "检出 <分支> 而不是远程 HEAD"
+
+#: builtin/clone.c:121
+msgid "path to git-upload-pack on the remote"
+msgstr "远程 git-upload-pack 路径"
+
+#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
+#: builtin/pull.c:225
+msgid "depth"
+msgstr "深度"
+
+#: builtin/clone.c:123
+msgid "create a shallow clone of that depth"
+msgstr "创建一个指定深度的浅克隆"
+
+#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+msgid "time"
+msgstr "时间"
+
+#: builtin/clone.c:125
+msgid "create a shallow clone since a specific time"
+msgstr "从一个特定时间创建一个浅克隆"
+
+#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:1389
+msgid "revision"
+msgstr "版本"
+
+#: builtin/clone.c:127 builtin/fetch.c:147
+msgid "deepen history of shallow clone, excluding rev"
+msgstr "深化浅克隆的历史，除了特定版本"
+
+#: builtin/clone.c:129
+msgid "clone only one branch, HEAD or --branch"
+msgstr "只克隆一个分支、HEAD 或 --branch"
+
+#: builtin/clone.c:131
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"
+
+#: builtin/clone.c:133
+msgid "any cloned submodules will be shallow"
+msgstr "子模组将以浅下载模式克隆"
+
+#: builtin/clone.c:134 builtin/init-db.c:495
+msgid "gitdir"
+msgstr "git目录"
+
+#: builtin/clone.c:135 builtin/init-db.c:496
+msgid "separate git dir from working tree"
+msgstr "git目录和工作区分离"
+
+#: builtin/clone.c:136
+msgid "key=value"
+msgstr "key=value"
+
+#: builtin/clone.c:137
+msgid "set config inside the new repository"
+msgstr "在新仓库中设置配置信息"
+
+#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "server-specific"
+
+#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "传输选项"
+
+#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/push.c:586
+msgid "use IPv4 addresses only"
+msgstr "只使用 IPv4 地址"
+
+#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/push.c:588
+msgid "use IPv6 addresses only"
+msgstr "只使用 IPv6 地址"
+
+#: builtin/clone.c:280
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"无法猜到目录名。\n"
+"请在命令行指定一个目录"
+
+#: builtin/clone.c:333
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
+
+#: builtin/clone.c:405
+#, c-format
+msgid "failed to open '%s'"
+msgstr "打开 '%s' 失败"
+
+#: builtin/clone.c:413
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s 存在且不是一个目录"
+
+#: builtin/clone.c:427
+#, c-format
+msgid "failed to stat %s\n"
+msgstr "对 %s 调用 stat 失败\n"
+
+#: builtin/clone.c:444
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "删除 '%s' 失败"
+
+#: builtin/clone.c:449
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "创建链接 '%s' 失败"
+
+#: builtin/clone.c:453
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "拷贝文件至 '%s' 失败"
+
+#: builtin/clone.c:479
+#, c-format
+msgid "done.\n"
+msgstr "完成。\n"
+
+#: builtin/clone.c:493
+msgid ""
+"Clone succeeded, but checkout failed.\n"
+"You can inspect what was checked out with 'git status'\n"
+"and retry the checkout with 'git checkout -f HEAD'\n"
+msgstr ""
+"克隆成功，但是检出失败。\n"
+"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
+"'git checkout -f HEAD' 重试\n"
+
+#: builtin/clone.c:570
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "不能发现要克隆的远程分支 %s。"
+
+#: builtin/clone.c:689
+#, c-format
+msgid "unable to update %s"
+msgstr "不能更新 %s"
+
+#: builtin/clone.c:739
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
+
+#: builtin/clone.c:770
+msgid "unable to checkout working tree"
+msgstr "不能检出工作区"
+
+#: builtin/clone.c:815
+msgid "unable to write parameters to config file"
+msgstr "无法将参数写入配置文件"
+
+#: builtin/clone.c:878
+msgid "cannot repack to clean up"
+msgstr "无法执行 repack 来清理"
+
+#: builtin/clone.c:880
+msgid "cannot unlink temporary alternates file"
+msgstr "无法删除临时的 alternates 文件"
+
+#: builtin/clone.c:920 builtin/receive-pack.c:1952
+msgid "Too many arguments."
+msgstr "太多参数。"
+
+#: builtin/clone.c:924
+msgid "You must specify a repository to clone."
+msgstr "您必须指定一个仓库来克隆。"
+
+#: builtin/clone.c:937
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "--bare 和 --origin %s 选项不兼容。"
+
+#: builtin/clone.c:940
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr "--bare 和 --separate-git-dir 选项不兼容。"
+
+#: builtin/clone.c:953
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "仓库 '%s' 不存在"
+
+#: builtin/clone.c:959 builtin/fetch.c:1610
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "深度 %s 不是一个正数"
+
+#: builtin/clone.c:969
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
+
+#: builtin/clone.c:979
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "工作区 '%s' 已经存在。"
+
+#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
+#: builtin/worktree.c:296 builtin/worktree.c:328
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "不能为 '%s' 创建先导目录"
+
+#: builtin/clone.c:999
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "不能创建工作区目录 '%s'"
+
+#: builtin/clone.c:1019
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "克隆到纯仓库 '%s'...\n"
+
+#: builtin/clone.c:1021
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "正克隆到 '%s'...\n"
+
+#: builtin/clone.c:1045
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
+
+#: builtin/clone.c:1106
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
+
+#: builtin/clone.c:1108
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
+
+#: builtin/clone.c:1110
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
+
+#: builtin/clone.c:1112
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。"
+
+#: builtin/clone.c:1115
+msgid "source repository is shallow, ignoring --local"
+msgstr "源仓库是浅克隆，忽略 --local"
+
+#: builtin/clone.c:1120
+msgid "--local is ignored"
+msgstr "--local 被忽略"
+
+#: builtin/clone.c:1197 builtin/clone.c:1205
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "远程分支 %s 在上游 %s 未发现"
+
+#: builtin/clone.c:1208
+msgid "You appear to have cloned an empty repository."
+msgstr "您似乎克隆了一个空仓库。"
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr "git column [<选项>]"
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr "查找配置变量"
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr "要使用的布局"
+
+#: builtin/column.c:30
+msgid "Maximum width"
+msgstr "最大宽度"
+
+#: builtin/column.c:31
+msgid "Padding space on left border"
+msgstr "左边框的填充空间"
+
+#: builtin/column.c:32
+msgid "Padding space on right border"
+msgstr "右边框的填充空间"
+
+#: builtin/column.c:33
+msgid "Padding space between columns"
+msgstr "两列之间的填充空间"
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr "--command 必须是第一个参数"
+
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件"
+">)...] <树>"
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "忽略重复的父提交 %s"
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
+#, c-format
+msgid "not a valid object name %s"
+msgstr "不是一个有效的对象名 %s"
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr "git commit-tree：无法打开 '%s'"
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree：无法读取 '%s'"
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree：无法关闭 '%s'"
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "父提交"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr "父提交对象 ID"
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
+#: builtin/tag.c:406
+msgid "message"
+msgstr "说明"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1480
+msgid "commit message"
+msgstr "提交说明"
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr "从文件中读取提交说明"
+
+#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
+#: builtin/pull.c:193 builtin/revert.c:117
+msgid "GPG sign commit"
+msgstr "GPG 提交签名"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "必须精确地提供一个树"
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree：读取失败"
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<选项>] [--] <路径规格>..."
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<选项>] [--] <路径规格>..."
+
+#: builtin/commit.c:51
+msgid ""
+"You asked to amend the most recent commit, but doing so would make\n"
+"it empty. You can repeat your command with --allow-empty, or you can\n"
+"remove the commit entirely with \"git reset HEAD^\".\n"
+msgstr ""
+"您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
+"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
+
+#: builtin/commit.c:56
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+msgstr ""
+"之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n"
+"也要提交，使用命令：\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
-#: builtin/checkout.c:1155
-msgid "create and checkout a new branch"
-msgstr "å\88\9b建并æ£\80å\87ºä¸\80个æ\96°ç\9a\84å\88\86æ\94¯"
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git reset'\n"
+msgstr "å\90¦å\88\99ï¼\8c请使ç\94¨å\91½ä»¤ 'git reset'\n"
-#: builtin/checkout.c:1157
-msgid "create/reset and checkout a branch"
-msgstr "创建/重置并检出一个分支"
+#: builtin/commit.c:66
+msgid ""
+"If you wish to skip this commit, use:\n"
+"\n"
+" git reset\n"
+"\n"
+"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+"the remaining commits.\n"
+msgstr ""
+"如果您想跳过这个提交，使用命令：\n"
+"\n"
+" git reset\n"
+"\n"
+"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
+"操作。\n"
-#: builtin/checkout.c:1158
-msgid "create reflog for new branch"
-msgstr "为新的分支创建引用日志"
+#: builtin/commit.c:312
+msgid "failed to unpack HEAD tree object"
+msgstr "解包 HEAD 树对象失败"
-#: builtin/checkout.c:1159 builtin/worktree.c:350
-msgid "detach HEAD at named commit"
-msgstr "HEAD 从指定的提交分离"
+#: builtin/commit.c:353
+msgid "unable to create temporary index"
+msgstr "不能创建临时索引"
-#: builtin/checkout.c:1160
-msgid "set upstream info for new branch"
-msgstr "为æ\96°ç\9a\84å\88\86æ\94¯è®¾ç½®ä¸\8a游信æ\81¯"
+#: builtin/commit.c:359
+msgid "interactive add failed"
+msgstr "交äº\92å¼\8fæ·»å\8a 失败"
-#: builtin/checkout.c:1162
-msgid "new-branch"
-msgstr "æ\96°å\88\86æ\94¯"
+#: builtin/commit.c:373
+msgid "unable to update temporary index"
+msgstr "æ\97 æ³\95æ\9b´æ\96°ä¸´æ\97¶ç´¢å¼\95"
-#: builtin/checkout.c:1162
-msgid "new unparented branch"
-msgstr "新的没有父提交的分支"
+#: builtin/commit.c:375
+msgid "Failed to update main cache tree"
+msgstr "不能更新树的主缓存"
-#: builtin/checkout.c:1163
-msgid "checkout our version for unmerged files"
-msgstr "对尚未合并的文件检出我们的版本"
+#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+msgid "unable to write new_index file"
+msgstr "无法写 new_index 文件"
-#: builtin/checkout.c:1165
-msgid "checkout their version for unmerged files"
-msgstr "对å°\9aæ\9cªå\90\88并ç\9a\84æ\96\87件æ£\80å\87ºä»\96们ç\9a\84ç\89\88æ\9c¬"
+#: builtin/commit.c:452
+msgid "cannot do a partial commit during a merge."
+msgstr "å\9c¨å\90\88并è¿\87ç¨\8bä¸ä¸\8dè\83½å\81\9aé\83¨å\88\86æ\8f\90交ã\80\82"
-#: builtin/checkout.c:1167
-msgid "force checkout (throw away local modifications)"
-msgstr "强å\88¶æ£\80å\87ºï¼\88丢å¼\83æ\9c¬å\9c°ä¿®æ\94¹ï¼\89"
+#: builtin/commit.c:454
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr "å\9c¨æ\8b£é\80\89è¿\87ç¨\8bä¸ä¸\8dè\83½å\81\9aé\83¨å\88\86æ\8f\90交ã\80\82"
-#: builtin/checkout.c:1168
-msgid "perform a 3-way merge with the new branch"
-msgstr "和新的分支执行三方合并"
+#: builtin/commit.c:462
+msgid "cannot read the index"
+msgstr "无法读取索引"
-#: builtin/checkout.c:1169 builtin/merge.c:238
-msgid "update ignored files (default)"
-msgstr "更新忽略的文件（默认）"
+#: builtin/commit.c:481
+msgid "unable to write temporary index file"
+msgstr "无法写临时索引文件"
+
+#: builtin/commit.c:579
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "提交 '%s' 缺少作者信息"
+
+#: builtin/commit.c:581
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "提交 '%s' 有格式错误的作者信息"
+
+#: builtin/commit.c:600
+msgid "malformed --author parameter"
+msgstr "格式错误的 --author 参数"
+
+#: builtin/commit.c:653
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr "无法选择一个未被当前提交说明使用的注释字符"
+
+#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "不能查询提交 %s"
+
+#: builtin/commit.c:703 builtin/shortlog.c:319
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "（正从标准输入中读取日志信息）\n"
+
+#: builtin/commit.c:705
+msgid "could not read log from standard input"
+msgstr "不能从标准输入中读取日志信息"
+
+#: builtin/commit.c:709
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "不能读取日志文件 '%s'"
+
+#: builtin/commit.c:740 builtin/commit.c:756
+msgid "could not read SQUASH_MSG"
+msgstr "不能读取 SQUASH_MSG"
+
+#: builtin/commit.c:747
+msgid "could not read MERGE_MSG"
+msgstr "不能读取 MERGE_MSG"
+
+#: builtin/commit.c:807
+msgid "could not write commit template"
+msgstr "不能写提交模版"
+
+#: builtin/commit.c:826
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"似乎您正在做一个合并提交。如果不对，请删除文件\n"
+"\t%s\n"
+"然后重试。\n"
+
+#: builtin/commit.c:831
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"似乎您正在做一个拣选提交。如果不对，请删除文件\n"
+"\t%s\n"
+"然后重试。\n"
+
+#: builtin/commit.c:844
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
+"说明将会终止提交。\n"
+
+#: builtin/commit.c:852
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您原意\n"
+"也可以删除它们。一个空的提交说明将会终止提交。\n"
+
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#: builtin/commit.c:869
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr "%s作者： %.*s <%.*s>"
+
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#: builtin/commit.c:877
+#, c-format
+msgid "%sDate: %s"
+msgstr "%s日期： %s"
+
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#: builtin/commit.c:884
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%s提交者：%.*s <%.*s>"
+
+#: builtin/commit.c:902
+msgid "Cannot read index"
+msgstr "无法读取索引"
+
+#: builtin/commit.c:969
+msgid "Error building trees"
+msgstr "无法创建树对象"
+
+#: builtin/commit.c:983 builtin/tag.c:269
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
+
+#: builtin/commit.c:1027
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配"
+
+#: builtin/commit.c:1041
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "无效的忽略模式 '%s'"
+
+#: builtin/commit.c:1059 builtin/commit.c:1284
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "无效的未追踪文件参数 '%s'"
+
+#: builtin/commit.c:1097
+msgid "--long and -z are incompatible"
+msgstr "--long 和 -z 选项不兼容"
+
+#: builtin/commit.c:1130
+msgid "Using both --reset-author and --author does not make sense"
+msgstr "同时使用 --reset-author 和 --author 没有意义"
+
+#: builtin/commit.c:1139
+msgid "You have nothing to amend."
+msgstr "您没有可修补的提交。"
+
+#: builtin/commit.c:1142
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "您正处于一个合并过程中 -- 无法修补提交。"
+
+#: builtin/commit.c:1144
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
+
+#: builtin/commit.c:1147
+msgid "Options --squash and --fixup cannot be used together"
+msgstr "选项 --squash 和 --fixup 不能同时使用"
+
+#: builtin/commit.c:1157
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
+
+#: builtin/commit.c:1159
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
+
+#: builtin/commit.c:1167
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
+
+#: builtin/commit.c:1184
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
+
+#: builtin/commit.c:1186
+msgid "No paths with --include/--only does not make sense."
+msgstr "参数 --include/--only 不跟路径没有意义。"
+
+#: builtin/commit.c:1192
+#, c-format
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
+
+#: builtin/commit.c:1319 builtin/commit.c:1503
+msgid "show status concisely"
+msgstr "以简洁的格式显示状态"
+
+#: builtin/commit.c:1321 builtin/commit.c:1505
+msgid "show branch information"
+msgstr "显示分支信息"
+
+#: builtin/commit.c:1323
+msgid "show stash information"
+msgstr "显示贮藏区信息"
+
+#: builtin/commit.c:1325 builtin/commit.c:1507
+msgid "compute full ahead/behind values"
+msgstr "计算完整的领先/落后值"
+
+#: builtin/commit.c:1327
+msgid "version"
+msgstr "版本"
+
+#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
+#: builtin/worktree.c:643
+msgid "machine-readable output"
+msgstr "机器可读的输出"
+
+#: builtin/commit.c:1330 builtin/commit.c:1511
+msgid "show status in long format (default)"
+msgstr "以长格式显示状态（默认）"
+
+#: builtin/commit.c:1333 builtin/commit.c:1514
+msgid "terminate entries with NUL"
+msgstr "条目以 NUL 字符结尾"
+
+#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
+#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
+#: parse-options.h:331
+msgid "mode"
+msgstr "模式"
-#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
-msgid "style"
-msgstr "风格"
+#: builtin/commit.c:1336 builtin/commit.c:1517
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
-#: builtin/checkout.c:1171
-msgid "conflict style (merge or diff3)"
-msgstr "冲突输出风格（merge 或 diff3）"
+#: builtin/commit.c:1340
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）"
-#: builtin/checkout.c:1174
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "对路å¾\84ä¸\8då\81\9aç¨\80ç\96\8fæ£\80å\87ºç\9a\84é\99\90å\88¶"
+#: builtin/commit.c:1342 parse-options.h:179
+msgid "when"
+msgstr "ä½\95æ\97¶"
-#: builtin/checkout.c:1176
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "二次猜测'git checkout <无此分支>'"
+#: builtin/commit.c:1343
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
-#: builtin/checkout.c:1178
-msgid "do not check if another worktree is holding the given ref"
-msgstr "ä¸\8dæ£\80æ\9f¥æ\8c\87å®\9aç\9a\84å¼\95ç\94¨æ\98¯å\90¦è¢«å\85¶ä»\96å·¥ä½\9cå\8cºæ\89\80å\8d ç\94¨"
+#: builtin/commit.c:1345
+msgid "list untracked files in columns"
+msgstr "以å\88\97ç\9a\84æ\96¹å¼\8fæ\98¾ç¤ºæ\9cªè·\9f踪ç\9a\84æ\96\87件"
-#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136
-#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544
-#: builtin/send-pack.c:173
-msgid "force progress reporting"
-msgstr "强制显示进度报告"
+#: builtin/commit.c:1346
+msgid "do not detect renames"
+msgstr "不检测重命名"
-#: builtin/checkout.c:1212
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b、-B 和 --orphan 是互斥的"
+#: builtin/commit.c:1348
+msgid "detect renames, optionally set similarity index"
+msgstr "检测重命名，可以设置索引相似度"
-#: builtin/checkout.c:1229
-msgid "--track needs a branch name"
-msgstr "--track 需要一个分支名"
+#: builtin/commit.c:1368
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr "不支持已忽略和未跟踪文件参数的组合"
-#: builtin/checkout.c:1234
-msgid "Missing branch name; try -b"
-msgstr "缺少分支名；尝试 -b"
+#: builtin/commit.c:1473
+msgid "suppress summary after successful commit"
+msgstr "提交成功后不显示概述信息"
-#: builtin/checkout.c:1270
-msgid "invalid path specification"
-msgstr "无效的路径规格"
+#: builtin/commit.c:1474
+msgid "show diff in commit message template"
+msgstr "在提交说明模板里显示差异"
-#: builtin/checkout.c:1277
-#, c-format
-msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
+#: builtin/commit.c:1476
+msgid "Commit message options"
+msgstr "提交说明选项"
-#: builtin/checkout.c:1281
-#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
-msgstr "git checkout：--detach 不能接收路径参数 '%s'"
+#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+msgid "read message from file"
+msgstr "从文件中读取提交说明"
-#: builtin/checkout.c:1285
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
-msgstr ""
-"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
+#: builtin/commit.c:1478
+msgid "author"
+msgstr "作者"
-#: builtin/clean.c:26
-msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
-msgstr ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
+#: builtin/commit.c:1478
+msgid "override author for commit"
+msgstr "提交时覆盖作者"
-#: builtin/clean.c:30
-#, c-format
-msgid "Removing %s\n"
-msgstr "正删除 %s\n"
+#: builtin/commit.c:1479 builtin/gc.c:539
+msgid "date"
+msgstr "日期"
-#: builtin/clean.c:31
-#, c-format
-msgid "Would remove %s\n"
-msgstr "将删除 %s\n"
+#: builtin/commit.c:1479
+msgid "override date for commit"
+msgstr "提交时覆盖日期"
-#: builtin/clean.c:32
-#, c-format
-msgid "Skipping repository %s\n"
-msgstr "忽略仓库 %s\n"
+#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
+#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92
+msgid "commit"
+msgstr "提交"
-#: builtin/clean.c:33
-#, c-format
-msgid "Would skip repository %s\n"
-msgstr "将忽略仓库 %s\n"
+#: builtin/commit.c:1481
+msgid "reuse and edit message from specified commit"
+msgstr "重用并编辑指定提交的提交说明"
-#: builtin/clean.c:34
-#, c-format
-msgid "failed to remove %s"
-msgstr "无法删除 %s"
+#: builtin/commit.c:1482
+msgid "reuse message from specified commit"
+msgstr "重用指定提交的提交说明"
-#: builtin/clean.c:301 git-add--interactive.perl:572
-#, c-format
-msgid ""
-"Prompt help:\n"
-"1 - select a numbered item\n"
-"foo - select item based on unique prefix\n"
-" - (empty) select nothing\n"
-msgstr ""
-"帮助：\n"
-"1 - 通过编号选择一个选项\n"
-"foo - 通过唯一前缀选择一个选项\n"
-" - （空）什么也不选择\n"
+#: builtin/commit.c:1483
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
-#: builtin/clean.c:305 git-add--interactive.perl:581
-#, c-format
-msgid ""
-"Prompt help:\n"
-"1 - select a single item\n"
-"3-5 - select a range of items\n"
-"2-3,6-9 - select multiple ranges\n"
-"foo - select item based on unique prefix\n"
-"-... - unselect specified items\n"
-"* - choose all items\n"
-" - (empty) finish selecting\n"
-msgstr ""
-"帮助：\n"
-"1 - 选择一个选项\n"
-"3-5 - 选择一个范围内的所有选项\n"
-"2-3,6-9 - 选择多个范围内的所有选项\n"
-"foo - 通过唯一前缀选择一个选项\n"
-"-... - 反选特定的选项\n"
-"* - 选择所有选项\n"
-" - （空）结束选择\n"
+#: builtin/commit.c:1484
+msgid "use autosquash formatted message to squash specified commit"
+msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
-#: builtin/clean.c:521 git-add--interactive.perl:547
-#: git-add--interactive.perl:552
-#, c-format, perl-format
-msgid "Huh (%s)?\n"
-msgstr "嗯（%s）？\n"
+#: builtin/commit.c:1485
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/clean.c:663
-#, c-format
-msgid "Input ignore patterns>> "
-msgstr "输入模版以排除条目>> "
+#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285
+#: builtin/pull.c:162 builtin/revert.c:109
+msgid "add Signed-off-by:"
+msgstr "添加 Signed-off-by: 签名"
-#: builtin/clean.c:700
-#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
-msgstr "警告：无法找到和 %s 匹配的条目"
+#: builtin/commit.c:1487
+msgid "use specified template file"
+msgstr "使用指定的模板文件"
-#: builtin/clean.c:721
-msgid "Select items to delete"
-msgstr "选择要删除的条目"
+#: builtin/commit.c:1488
+msgid "force edit of commit"
+msgstr "强制编辑提交"
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
-#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "删除 %s [y/N]？"
+#: builtin/commit.c:1490
+msgid "include status in commit message template"
+msgstr "在提交说明模板里包含状态信息"
-#: builtin/clean.c:787 git-add--interactive.perl:1616
-#, c-format
-msgid "Bye.\n"
-msgstr "再见。\n"
+#: builtin/commit.c:1495
+msgid "Commit contents options"
+msgstr "提交内容选项"
-#: builtin/clean.c:795
-msgid ""
-"clean - start cleaning\n"
-"filter by pattern - exclude items from deletion\n"
-"select by numbers - select items to be deleted by numbers\n"
-"ask each - confirm each deletion (like \"rm -i\")\n"
-"quit - stop cleaning\n"
-"help - this screen\n"
-"? - help for prompt selection"
-msgstr ""
-"clean - 开始清理\n"
-"filter by pattern - 通过模版排除要删除的条目\n"
-"select by numbers - 通过数字选择要删除的条目\n"
-"ask each - 针对删除逐一询问（就像 \"rm -i\"）\n"
-"quit - 停止删除并退出\n"
-"help - 显示本帮助\n"
-"? - 显示如何在提示符下选择的帮助"
+#: builtin/commit.c:1496
+msgid "commit all changed files"
+msgstr "提交所有改动的文件"
-#: builtin/clean.c:822 git-add--interactive.perl:1692
-msgid "*** Commands ***"
-msgstr "*** 命令 ***"
+#: builtin/commit.c:1497
+msgid "add specified files to index for commit"
+msgstr "添加指定的文件到索引区等待提交"
-#: builtin/clean.c:823 git-add--interactive.perl:1689
-msgid "What now"
-msgstr "请选择"
+#: builtin/commit.c:1498
+msgid "interactively add files"
+msgstr "交互式添加文件"
-#: builtin/clean.c:831
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] "将删除如下条目："
-msgstr[1] "将删除如下条目："
+#: builtin/commit.c:1499
+msgid "interactively add changes"
+msgstr "交互式添加变更"
-#: builtin/clean.c:847
-msgid "No more files to clean, exiting."
-msgstr "没有要清理的文件，退出。"
+#: builtin/commit.c:1500
+msgid "commit only specified files"
+msgstr "只提交指定的文件"
-#: builtin/clean.c:909
-msgid "do not print names of files removed"
-msgstr "不打印删除文件的名称"
+#: builtin/commit.c:1501
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "绕过 pre-commit 和 commit-msg 钩子"
-#: builtin/clean.c:911
-msgid "force"
-msgstr "强制"
+#: builtin/commit.c:1502
+msgid "show what would be committed"
+msgstr "显示将要提交的内容"
-#: builtin/clean.c:912
-msgid "interactive cleaning"
-msgstr "交äº\92å¼\8fæ¸\85é\99¤"
+#: builtin/commit.c:1515
+msgid "amend previous commit"
+msgstr "ä¿®æ\94¹å\85\88å\89\8dç\9a\84æ\8f\90交"
-#: builtin/clean.c:914
-msgid "remove whole directories"
-msgstr "删除整个目录"
+#: builtin/commit.c:1516
+msgid "bypass post-rewrite hook"
+msgstr "绕过 post-rewrite 钩子"
-#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465
-#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397
-#: builtin/name-rev.c:399 builtin/show-ref.c:176
-msgid "pattern"
-msgstr "模式"
+#: builtin/commit.c:1521
+msgid "ok to record an empty change"
+msgstr "允许一个空提交"
-#: builtin/clean.c:916
-msgid "add <pattern> to ignore rules"
-msgstr "添加 <模式> 到忽略规则"
+#: builtin/commit.c:1523
+msgid "ok to record a change with an empty message"
+msgstr "允许空的提交说明"
-#: builtin/clean.c:917
-msgid "remove ignored files, too"
-msgstr "也删除忽略的文件"
+#: builtin/commit.c:1596
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "损坏的 MERGE_HEAD 文件（%s）"
-#: builtin/clean.c:919
-msgid "remove only ignored files"
-msgstr "只删除忽略的文件"
+#: builtin/commit.c:1603
+msgid "could not read MERGE_MODE"
+msgstr "不能读取 MERGE_MODE"
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x 和 -X 不能同时使用"
+#: builtin/commit.c:1622
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "不能读取提交说明：%s"
-#: builtin/clean.c:941
-msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
-msgstr ""
-"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
+#: builtin/commit.c:1629
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "终止提交因为提交说明为空。\n"
+
+#: builtin/commit.c:1634
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "终止提交；您未更改来自模版的提交说明。\n"
-#: builtin/clean.c:944
+#: builtin/commit.c:1668
msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
+"repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full and quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
-"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
-
-#: builtin/clone.c:39
-msgid "git clone [<options>] [--] <repo> [<dir>]"
-msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-
-#: builtin/clone.c:83
-msgid "don't create a checkout"
-msgstr "不创建一个检出"
+"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
+"或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
-#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
-msgid "create a bare repository"
-msgstr "创建一个纯仓库"
+#: builtin/commit-graph.c:10
+msgid "git commit-graph [--object-dir <objdir>]"
+msgstr "git commit-graph [--object-dir <对象目录>]"
-#: builtin/clone.c:88
-msgid "create a mirror repository (implies bare)"
-msgstr "创建一个镜像仓库（也是纯仓库）"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+msgid "git commit-graph read [--object-dir <objdir>]"
+msgstr "git commit-graph read [--object-dir <对象目录>]"
-#: builtin/clone.c:90
-msgid "to clone from a local repository"
-msgstr "从本地仓库克隆"
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
+msgstr "git commit-graph verify [--object-dir <对象目录>]"
-#: builtin/clone.c:92
-msgid "don't use local hardlinks, always copy"
-msgstr "不使用本地硬链接，始终复制"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
+"stdin-packs|--stdin-commits]"
+msgstr ""
+"git commit-graph write [--object-dir <对象目录>] [--append] [--reachable|--"
+"stdin-packs|--stdin-commits]"
-#: builtin/clone.c:94
-msgid "setup as shared repository"
-msgstr "设置为共享仓库"
+#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
+#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
+#: builtin/log.c:1561
+msgid "dir"
+msgstr "目录"
-#: builtin/clone.c:96 builtin/clone.c:100
-msgid "pathspec"
-msgstr "路径规格"
+#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
+#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
+msgid "The object directory to store the graph"
+msgstr "保存图形的对象目录"
-#: builtin/clone.c:96 builtin/clone.c:100
-msgid "initialize submodules in the clone"
-msgstr "在克隆时初始化子模组"
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "无法打开提交图形 '%s'"
-#: builtin/clone.c:103
-msgid "number of submodules cloned in parallel"
-msgstr "并å\8f\91å\85\8bé\9a\86ç\9a\84å\90模ç»\84ç\9a\84æ\95°é\87\8f"
+#: builtin/commit-graph.c:150
+msgid "start walk at all refs"
+msgstr "å¼\80å§\8bé\81\8då\8e\86æ\89\80æ\9c\89å¼\95ç\94¨"
-#: builtin/clone.c:104 builtin/init-db.c:476
-msgid "template-directory"
-msgstr "模板目录"
+#: builtin/commit-graph.c:152
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "从标准输入中的包索引文件列表中扫描提交"
-#: builtin/clone.c:105 builtin/init-db.c:477
-msgid "directory from which templates will be used"
-msgstr "模板目录将被使用"
+#: builtin/commit-graph.c:154
+msgid "start walk at commits listed by stdin"
+msgstr "从标准输入中的提交开始扫描"
-#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
-#: builtin/submodule--helper.c:1002
-msgid "reference repository"
-msgstr "参考仓库"
+#: builtin/commit-graph.c:156
+msgid "include all commits already in the commit-graph file"
+msgstr "包含 commit-graph 文件中已有所有提交"
-#: builtin/clone.c:111
-msgid "use --reference only while cloning"
-msgstr "ä»\85å\9c¨å\85\8bé\9a\86æ\97¶å\8f\82è\80\83 --reference æ\8c\87å\90\91ç\9a\84æ\9c¬å\9c°ä»\93åº\93"
+#: builtin/commit-graph.c:165
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr "ä¸\8dè\83½å\90\8cæ\97¶ä½¿ç\94¨ --reachableã\80\81--stdin-commits æ\88\96 --stdin-packs"
-#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
-msgid "name"
-msgstr "名称"
+#: builtin/config.c:11
+msgid "git config [<options>]"
+msgstr "git config [<选项>]"
-#: builtin/clone.c:113
-msgid "use <name> instead of 'origin' to track upstream"
-msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
+#: builtin/config.c:103
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "未能识别的 --type 参数，%s"
-#: builtin/clone.c:115
-msgid "checkout <branch> instead of the remote's HEAD"
-msgstr "检出 <分支> 而不是远程 HEAD"
+#: builtin/config.c:115
+msgid "only one type at a time"
+msgstr "一次只能一个类型"
-#: builtin/clone.c:117
-msgid "path to git-upload-pack on the remote"
-msgstr "远程 git-upload-pack 路径"
+#: builtin/config.c:124
+msgid "Config file location"
+msgstr "配置文件位置"
-#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
-#: builtin/pull.c:205
-msgid "depth"
-msgstr "深度"
+#: builtin/config.c:125
+msgid "use global config file"
+msgstr "使用全局配置文件"
-#: builtin/clone.c:119
-msgid "create a shallow clone of that depth"
-msgstr "创建一个指定深度的浅克隆"
+#: builtin/config.c:126
+msgid "use system config file"
+msgstr "使用系统级配置文件"
-#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
-#: parse-options.h:142
-msgid "time"
-msgstr "时间"
+#: builtin/config.c:127
+msgid "use repository config file"
+msgstr "使用仓库级配置文件"
-#: builtin/clone.c:121
-msgid "create a shallow clone since a specific time"
-msgstr "ä»\8eä¸\80个ç\89¹å®\9aæ\97¶é\97´å\88\9b建ä¸\80个æµ\85å\85\8bé\9a\86"
+#: builtin/config.c:128
+msgid "use per-worktree config file"
+msgstr "使ç\94¨å·¥ä½\9cå\8cºçº§å\88«ç\9a\84é\85\8dç½®æ\96\87件"
-#: builtin/clone.c:122 builtin/fetch.c:141
-msgid "revision"
-msgstr "版本"
+#: builtin/config.c:129
+msgid "use given config file"
+msgstr "使用指定的配置文件"
-#: builtin/clone.c:123 builtin/fetch.c:142
-msgid "deepen history of shallow clone, excluding rev"
-msgstr "æ·±å\8c\96æµ\85å\85\8bé\9a\86ç\9a\84å\8e\86å\8f²ï¼\8cé\99¤äº\86ç\89¹å®\9aç\89\88æ\9c¬"
+#: builtin/config.c:130
+msgid "blob-id"
+msgstr "æ\95°æ\8d®å¯¹è±¡ ID"
-#: builtin/clone.c:125
-msgid "clone only one branch, HEAD or --branch"
-msgstr "只克隆一个分支、HEAD 或 --branch"
+#: builtin/config.c:130
+msgid "read config from given blob object"
+msgstr "从给定的数据对象读取配置"
-#: builtin/clone.c:127
-msgid "don't clone any tags, and make later fetches not to follow them"
-msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"
+#: builtin/config.c:131
+msgid "Action"
+msgstr "操作"
-#: builtin/clone.c:129
-msgid "any cloned submodules will be shallow"
-msgstr "子模组将以浅下载模式克隆"
+#: builtin/config.c:132
+msgid "get value: name [value-regex]"
+msgstr "获取值：name [value-regex]"
-#: builtin/clone.c:130 builtin/init-db.c:485
-msgid "gitdir"
-msgstr "git目录"
+#: builtin/config.c:133
+msgid "get all values: key [value-regex]"
+msgstr "获得所有的值：key [value-regex]"
-#: builtin/clone.c:131 builtin/init-db.c:486
-msgid "separate git dir from working tree"
-msgstr "git目录和工作区分离"
+#: builtin/config.c:134
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr "根据正则表达式获得值：name-regex [value-regex]"
-#: builtin/clone.c:132
-msgid "key=value"
-msgstr "key=value"
+#: builtin/config.c:135
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "获得 URL 取值：section[.var] URL"
-#: builtin/clone.c:133
-msgid "set config inside the new repository"
-msgstr "在新仓库中设置配置信息"
+#: builtin/config.c:136
+msgid "replace all matching variables: name value [value_regex]"
+msgstr "替换所有匹配的变量：name value [value_regex]"
-#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
-msgid "use IPv4 addresses only"
-msgstr "只使用 IPv4 地址"
+#: builtin/config.c:137
+msgid "add a new variable: name value"
+msgstr "添加一个新的变量：name value"
-#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
-msgid "use IPv6 addresses only"
-msgstr "å\8fªä½¿ç\94¨ IPv6 å\9c°å\9d\80"
+#: builtin/config.c:138
+msgid "remove a variable: name [value-regex]"
+msgstr "å\88 é\99¤ä¸\80个å\8f\98é\87\8fï¼\9aname [value-regex]"
-#: builtin/clone.c:273
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"无法猜到目录名。\n"
-"请在命令行指定一个目录"
+#: builtin/config.c:139
+msgid "remove all matches: name [value-regex]"
+msgstr "删除所有匹配项：name [value-regex]"
-#: builtin/clone.c:326
-#, c-format
-msgid "info: Could not add alternate for '%s': %s\n"
-msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
+#: builtin/config.c:140
+msgid "rename section: old-name new-name"
+msgstr "重命名小节：old-name new-name"
-#: builtin/clone.c:398
-#, c-format
-msgid "failed to open '%s'"
-msgstr "无法打开 '%s'"
+#: builtin/config.c:141
+msgid "remove a section: name"
+msgstr "删除一个小节：name"
-#: builtin/clone.c:406
-#, c-format
-msgid "%s exists and is not a directory"
-msgstr "%s 存在且不是一个目录"
+#: builtin/config.c:142
+msgid "list all"
+msgstr "列出所有"
-#: builtin/clone.c:420
-#, c-format
-msgid "failed to stat %s\n"
-msgstr "对 %s 调用 stat 失败\n"
+#: builtin/config.c:143
+msgid "open an editor"
+msgstr "打开一个编辑器"
-#: builtin/clone.c:442
-#, c-format
-msgid "failed to create link '%s'"
-msgstr "无法创建链接 '%s'"
+#: builtin/config.c:144
+msgid "find the color configured: slot [default]"
+msgstr "获得配置的颜色：配置 [默认]"
-#: builtin/clone.c:446
-#, c-format
-msgid "failed to copy file to '%s'"
-msgstr "无法拷贝文件至 '%s'"
+#: builtin/config.c:145
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "获得颜色设置：配置 [stdout-is-tty]"
-#: builtin/clone.c:471
-#, c-format
-msgid "done.\n"
-msgstr "完成。\n"
+#: builtin/config.c:146
+msgid "Type"
+msgstr "类型"
-#: builtin/clone.c:483
-msgid ""
-"Clone succeeded, but checkout failed.\n"
-"You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
-msgstr ""
-"克隆成功，但是检出失败。\n"
-"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
-"'git checkout -f HEAD' 重试\n"
+#: builtin/config.c:147
+msgid "value is given this type"
+msgstr "取值为该类型"
-#: builtin/clone.c:560
-#, c-format
-msgid "Could not find remote branch %s to clone."
-msgstr "不能发现要克隆的远程分支 %s。"
+#: builtin/config.c:148
+msgid "value is \"true\" or \"false\""
+msgstr "值是 \"true\" 或 \"false\""
-#: builtin/clone.c:655
-msgid "remote did not send all necessary objects"
-msgstr "远程没有发送所有必须的对象"
+#: builtin/config.c:149
+msgid "value is decimal number"
+msgstr "值是十进制数"
-#: builtin/clone.c:671
-#, c-format
-msgid "unable to update %s"
-msgstr "不能更新 %s"
+#: builtin/config.c:150
+msgid "value is --bool or --int"
+msgstr "值是 --bool or --int"
-#: builtin/clone.c:720
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
+#: builtin/config.c:151
+msgid "value is a path (file or directory name)"
+msgstr "值是一个路径（文件或目录名）"
-#: builtin/clone.c:751
-msgid "unable to checkout working tree"
-msgstr "不能检出工作区"
+#: builtin/config.c:152
+msgid "value is an expiry date"
+msgstr "值是一个到期日期"
-#: builtin/clone.c:796
-msgid "unable to write parameters to config file"
-msgstr "无法将参数写入配置文件"
+#: builtin/config.c:153
+msgid "Other"
+msgstr "其它"
-#: builtin/clone.c:859
-msgid "cannot repack to clean up"
-msgstr "无法执行 repack 来清理"
+#: builtin/config.c:154
+msgid "terminate values with NUL byte"
+msgstr "终止值是 NUL 字节"
-#: builtin/clone.c:861
-msgid "cannot unlink temporary alternates file"
-msgstr "无法删除临时的 alternates 文件"
+#: builtin/config.c:155
+msgid "show variable names only"
+msgstr "只显示变量名"
-#: builtin/clone.c:894 builtin/receive-pack.c:1944
-msgid "Too many arguments."
-msgstr "太多参数。"
+#: builtin/config.c:156
+msgid "respect include directives on lookup"
+msgstr "查询时参照 include 指令递归查找"
-#: builtin/clone.c:898
-msgid "You must specify a repository to clone."
-msgstr "æ\82¨å¿\85é¡»æ\8c\87å®\9aä¸\80个ä»\93åº\93æ\9d¥å\85\8bé\9a\86ã\80\82"
+#: builtin/config.c:157
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr "æ\98¾ç¤ºé\85\8dç½®ç\9a\84æ\9d¥æº\90ï¼\88æ\96\87件ã\80\81æ \87å\87\86è¾\93å\85¥ã\80\81æ\95°æ\8d®å¯¹è±¡ï¼\8cæ\88\96å\91½ä»¤è¡\8cï¼\89"
-#: builtin/clone.c:911
-#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare 和 --origin %s 选项不兼容。"
+#: builtin/config.c:158
+msgid "value"
+msgstr "取值"
-#: builtin/clone.c:914
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare 和 --separate-git-dir 选项不兼容。"
+#: builtin/config.c:158
+msgid "with --get, use default value when missing entry"
+msgstr "使用 --get 参数，当缺少设置时使用默认值"
-#: builtin/clone.c:927
+#: builtin/config.c:172
#, c-format
-msgid "repository '%s' does not exist"
-msgstr "仓库 '%s' 不存在"
+msgid "wrong number of arguments, should be %d"
+msgstr "错误的参数个数，应该为 %d 个"
-#: builtin/clone.c:933 builtin/fetch.c:1360
+#: builtin/config.c:174
#, c-format
-msgid "depth %s is not a positive number"
-msgstr "深度 %s 不是一个正数"
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr "错误的参数个数，应该为从 %d 个到 %d 个"
-#: builtin/clone.c:943
+#: builtin/config.c:308
#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
-msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
+msgid "invalid key pattern: %s"
+msgstr "无效键名模式：%s"
-#: builtin/clone.c:953
+#: builtin/config.c:344
#, c-format
-msgid "working tree '%s' already exists."
-msgstr "工作区 '%s' 已经存在。"
+msgid "failed to format default config value: %s"
+msgstr "格式化默认配置值失败：%s"
-#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
-#: builtin/worktree.c:240 builtin/worktree.c:270
+#: builtin/config.c:401
#, c-format
-msgid "could not create leading directories of '%s'"
-msgstr "不能为 '%s' 创建先导目录"
+msgid "cannot parse color '%s'"
+msgstr "无法解析颜色 '%s'"
-#: builtin/clone.c:971
-#, c-format
-msgid "could not create work tree dir '%s'"
-msgstr "不能创建工作区目录 '%s'"
+#: builtin/config.c:443
+msgid "unable to parse default color value"
+msgstr "无法解析默认颜色值"
-#: builtin/clone.c:983
-#, c-format
-msgid "Cloning into bare repository '%s'...\n"
-msgstr "克隆到纯仓库 '%s'...\n"
+#: builtin/config.c:496 builtin/config.c:742
+msgid "not in a git directory"
+msgstr "不在 git 仓库中"
+
+#: builtin/config.c:499
+msgid "writing to stdin is not supported"
+msgstr "不支持写到标准输入"
+
+#: builtin/config.c:502
+msgid "writing config blobs is not supported"
+msgstr "不支持写到配置数据对象"
-#: builtin/clone.c:985
+#: builtin/config.c:587
#, c-format
-msgid "Cloning into '%s'...\n"
-msgstr "正克隆到 '%s'...\n"
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+msgstr ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+
+#: builtin/config.c:611
+msgid "only one config file at a time"
+msgstr "一次只能有一个配置文件"
+
+#: builtin/config.c:616
+msgid "--local can only be used inside a git repository"
+msgstr "--local 只能在一个仓库内使用"
+
+#: builtin/config.c:619
+msgid "--blob can only be used inside a git repository"
+msgstr "--blob 只能在一个仓库内使用"
+
+#: builtin/config.c:638
+msgid "$HOME not set"
+msgstr "$HOME 未设置"
-#: builtin/clone.c:1009
+#: builtin/config.c:658
msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
-msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
+"--worktree cannot be used with multiple working trees unless the config\n"
+"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
+"section in \"git help worktree\" for details"
+msgstr ""
+"不能和多个工作区一起使用 --worktree，除非启用 worktreeConfig 配置扩展。\n"
+"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
-#: builtin/clone.c:1071
-msgid "--depth is ignored in local clones; use file:// instead."
-msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
+#: builtin/config.c:688
+msgid "--get-color and variable type are incoherent"
+msgstr "--get-color 和变量类型不兼容"
-#: builtin/clone.c:1073
-msgid "--shallow-since is ignored in local clones; use file:// instead."
-msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
+#: builtin/config.c:693
+msgid "only one action at a time"
+msgstr "一次只能有一个动作"
-#: builtin/clone.c:1075
-msgid "--shallow-exclude is ignored in local clones; use file:// instead."
-msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
+#: builtin/config.c:706
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr "--name-only 仅适用于 --list 或 --get-regexp"
+
+#: builtin/config.c:712
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
+
+#: builtin/config.c:718
+msgid "--default is only applicable to --get"
+msgstr "--default 仅适用于 --get"
+
+#: builtin/config.c:731
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr "无法读取配置文件 '%s'"
+
+#: builtin/config.c:734
+msgid "error processing config file(s)"
+msgstr "处理配置文件出错"
-#: builtin/clone.c:1078
-msgid "source repository is shallow, ignoring --local"
-msgstr "源仓库是浅克隆，忽略 --local"
+#: builtin/config.c:744
+msgid "editing stdin is not supported"
+msgstr "不支持编辑标准输入"
-#: builtin/clone.c:1083
-msgid "--local is ignored"
-msgstr "--local 被忽略"
+#: builtin/config.c:746
+msgid "editing blobs is not supported"
+msgstr "不支持编辑数据对象"
-#: builtin/clone.c:1087
+#: builtin/config.c:760
#, c-format
-msgid "Don't know how to clone %s"
-msgstr "不知道如何克隆 %s"
+msgid "cannot create configuration file %s"
+msgstr "不能创建配置文件 %s"
-#: builtin/clone.c:1142 builtin/clone.c:1150
+#: builtin/config.c:773
#, c-format
-msgid "Remote branch %s not found in upstream %s"
-msgstr "远程分支 %s 在上游 %s 未发现"
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"无法用一个值覆盖多个值\n"
+" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
-#: builtin/clone.c:1153
-msgid "You appear to have cloned an empty repository."
-msgstr "您似乎克隆了一个空仓库。"
+#: builtin/config.c:847 builtin/config.c:858
+#, c-format
+msgid "no such section: %s"
+msgstr "无此小节：%s"
-#: builtin/column.c:10
-msgid "git column [<options>]"
-msgstr "git column [<选项>]"
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/column.c:27
-msgid "lookup config vars"
-msgstr "æ\9f¥æ\89¾é\85\8dç½®å\8f\98é\87\8f"
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
+msgstr "以ç\94¨æ\88·å\8f¯è¯»ç\9a\84æ ¼å¼\8fæ\98¾ç¤ºå¤§å°\8f"
-#: builtin/column.c:28 builtin/column.c:29
-msgid "layout to use"
-msgstr "要使用的布局"
+#: builtin/describe.c:27
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<选项>] [<提交号>...]"
-#: builtin/column.c:30
-msgid "Maximum width"
-msgstr "最大宽度"
+#: builtin/describe.c:28
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<选项>] --dirty"
-#: builtin/column.c:31
-msgid "Padding space on left border"
-msgstr "左边æ¡\86ç\9a\84å¡«å\85\85空é\97´"
+#: builtin/describe.c:63
+msgid "head"
+msgstr "头"
-#: builtin/column.c:32
-msgid "Padding space on right border"
-msgstr "右边框的填充空间"
+#: builtin/describe.c:63
+msgid "lightweight"
+msgstr "轻量级的"
-#: builtin/column.c:33
-msgid "Padding space between columns"
-msgstr "两列之间的填充空间"
+#: builtin/describe.c:63
+msgid "annotated"
+msgstr "附注的"
-#: builtin/column.c:52
-msgid "--command must be the first argument"
-msgstr "--command 必须是第一个参数"
+#: builtin/describe.c:273
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "附注标签 %s 无效"
-#: builtin/commit.c:39
-msgid "git commit [<options>] [--] <pathspec>..."
-msgstr "git commit [<选项>] [--] <路径规格>..."
+#: builtin/describe.c:277
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr "附注标签 %s 没有嵌入名称"
-#: builtin/commit.c:44
-msgid "git status [<options>] [--] <pathspec>..."
-msgstr "git status [<选项>] [--] <路径规格>..."
+#: builtin/describe.c:279
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr "标签 '%s' 的确是在 '%s'"
-#: builtin/commit.c:49
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-" git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
-msgstr ""
-"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
-"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
-"中编辑您的配置文件：\n"
-"\n"
-" git config --global --edit\n"
-"\n"
-"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
-"\n"
-" git commit --amend --reset-author\n"
+#: builtin/describe.c:323
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "没有标签准确匹配 '%s'"
-#: builtin/commit.c:62
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-" git config --global user.name \"Your Name\"\n"
-" git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
-msgstr ""
-"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
-"与否。您可以对其进行设置以免再出现本提示信息：\n"
-"\n"
-" git config --global user.name \"Your Name\"\n"
-" git config --global user.email you@example.com\n"
-"\n"
-"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
-"\n"
-" git commit --amend --reset-author\n"
+#: builtin/describe.c:325
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n"
+
+#: builtin/describe.c:379
+#, c-format
+msgid "finished search at %s\n"
+msgstr "完成搜索 %s\n"
-#: builtin/commit.c:74
+#: builtin/describe.c:405
+#, c-format
msgid ""
-"You asked to amend the most recent commit, but doing so would make\n"
-"it empty. You can repeat your command with --allow-empty, or you can\n"
-"remove the commit entirely with \"git reset HEAD^\".\n"
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
msgstr ""
-"æ\82¨è¦\81修补æ\9c\80è¿\91ç\9a\84æ\8f\90交ï¼\8cä½\86è¿\99ä¹\88å\81\9aä¼\9a让å®\83æ\88\90为空æ\8f\90交ã\80\82æ\82¨å\8f¯ä»¥é\87\8då¤\8dæ\82¨ç\9a\84å\91½ä»¤å¹¶å¸¦ä¸\8a\n"
-"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
+"没æ\9c\89é\99\84注æ \87ç¾è\83½æ\8f\8fè¿° '%s'ã\80\82\n"
+"然而，存在未附注标签：尝试 --tags。"
-#: builtin/commit.c:79
+#: builtin/describe.c:409
+#, c-format
msgid ""
-"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
-"If you wish to commit it anyway, use:\n"
-"\n"
-" git commit --allow-empty\n"
-"\n"
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
msgstr ""
-"之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n"
-"也要提交，使用命令：\n"
-"\n"
-" git commit --allow-empty\n"
-"\n"
+"没有标签能描述 '%s'。\n"
+"尝试 --always，或者创建一些标签。"
-#: builtin/commit.c:86
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "否则，请使用命令 'git reset'\n"
+#: builtin/describe.c:439
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "已遍历 %lu 个提交\n"
-#: builtin/commit.c:89
+#: builtin/describe.c:442
+#, c-format
msgid ""
-"If you wish to skip this commit, use:\n"
-"\n"
-" git reset\n"
-"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
msgstr ""
-"如果您想跳过这个提交，使用命令：\n"
-"\n"
-" git reset\n"
-"\n"
-"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
-"操作。\n"
+"发现多于 %i 个标签，列出最近的 %i 个\n"
+"在 %s 放弃搜索\n"
-#: builtin/commit.c:318
-msgid "failed to unpack HEAD tree object"
-msgstr "无法解包 HEAD 树对象"
+#: builtin/describe.c:510
+#, c-format
+msgid "describe %s\n"
+msgstr "描述 %s\n"
-#: builtin/commit.c:359
-msgid "unable to create temporary index"
-msgstr "不能创建临时索引"
+#: builtin/describe.c:513
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "不是一个有效的对象名 %s"
-#: builtin/commit.c:365
-msgid "interactive add failed"
-msgstr "交互式添加失败"
+#: builtin/describe.c:521
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s 既不是提交也不是数据对象"
-#: builtin/commit.c:378
-msgid "unable to update temporary index"
-msgstr "无法更新临时索引"
+#: builtin/describe.c:535
+msgid "find the tag that comes after the commit"
+msgstr "寻找该提交之后的标签"
-#: builtin/commit.c:380
-msgid "Failed to update main cache tree"
-msgstr "不能更新树的主缓存"
+#: builtin/describe.c:536
+msgid "debug search strategy on stderr"
+msgstr "在标准错误上调试搜索策略"
-#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
-msgid "unable to write new_index file"
-msgstr "无法写 new_index 文件"
+#: builtin/describe.c:537
+msgid "use any ref"
+msgstr "使用任意引用"
-#: builtin/commit.c:461
-msgid "cannot do a partial commit during a merge."
-msgstr "在合并过程中不能做部分提交。"
+#: builtin/describe.c:538
+msgid "use any tag, even unannotated"
+msgstr "使用任意标签，即使未附带注释"
-#: builtin/commit.c:463
-msgid "cannot do a partial commit during a cherry-pick."
-msgstr "å\9c¨æ\8b£é\80\89è¿\87ç¨\8bä¸ä¸\8dè\83½å\81\9aé\83¨å\88\86æ\8f\90交ã\80\82"
+#: builtin/describe.c:539
+msgid "always use long format"
+msgstr "å§\8bç»\88使ç\94¨é\95¿æ\8f\90交å\8f·æ ¼å¼\8f"
-#: builtin/commit.c:471
-msgid "cannot read the index"
-msgstr "无法读取索引"
+#: builtin/describe.c:540
+msgid "only follow first parent"
+msgstr "只跟随第一个父提交"
-#: builtin/commit.c:490
-msgid "unable to write temporary index file"
-msgstr "无法写临时索引文件"
+#: builtin/describe.c:543
+msgid "only output exact matches"
+msgstr "只输出精确匹配"
-#: builtin/commit.c:587
-#, c-format
-msgid "commit '%s' lacks author header"
-msgstr "提交 '%s' 缺少作者信息"
+#: builtin/describe.c:545
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "考虑最近 <n> 个标签（默认：10）"
-#: builtin/commit.c:589
-#, c-format
-msgid "commit '%s' has malformed author line"
-msgstr "提交 '%s' 有非法的作者信息"
+#: builtin/describe.c:547
+msgid "only consider tags matching <pattern>"
+msgstr "只考虑匹配 <模式> 的标签"
-#: builtin/commit.c:608
-msgid "malformed --author parameter"
-msgstr "非法的 --author 参数"
+#: builtin/describe.c:549
+msgid "do not consider tags matching <pattern>"
+msgstr "不考虑匹配 <模式> 的标签"
-#: builtin/commit.c:660
-msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
-msgstr "无法选择一个未被当前提交说明使用的注释字符"
+#: builtin/describe.c:551 builtin/name-rev.c:426
+msgid "show abbreviated commit object as fallback"
+msgstr "显示简写的提交号作为后备"
+
+#: builtin/describe.c:552 builtin/describe.c:555
+msgid "mark"
+msgstr "标记"
+
+#: builtin/describe.c:553
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
+
+#: builtin/describe.c:556
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
+
+#: builtin/describe.c:574
+msgid "--long is incompatible with --abbrev=0"
+msgstr "--long 与 --abbrev=0 不兼容"
+
+#: builtin/describe.c:603
+msgid "No names found, cannot describe anything."
+msgstr "没有发现名称，无法描述任何东西。"
+
+#: builtin/describe.c:654
+msgid "--dirty is incompatible with commit-ishes"
+msgstr "--dirty 与提交号不兼容"
-#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
+#: builtin/describe.c:656
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken 与提交号不兼容"
+
+#: builtin/diff.c:84
#, c-format
-msgid "could not lookup commit %s"
-msgstr "不能查询提交 %s"
+msgid "'%s': not a regular file or symlink"
+msgstr "'%s'：不是一个正规文件或符号链接"
-#: builtin/commit.c:709 builtin/shortlog.c:309
+#: builtin/diff.c:235
#, c-format
-msgid "(reading log message from standard input)\n"
-msgstr "（正从标准输入中读取日志信息）\n"
+msgid "invalid option: %s"
+msgstr "无效选项：%s"
-#: builtin/commit.c:711
-msgid "could not read log from standard input"
-msgstr "不能从标准输入中读取日志信息"
+#: builtin/diff.c:350
+msgid "Not a git repository"
+msgstr "不是一个 git 仓库"
-#: builtin/commit.c:715
+#: builtin/diff.c:394
#, c-format
-msgid "could not read log file '%s'"
-msgstr "不能读取日志文件 '%s'"
+msgid "invalid object '%s' given."
+msgstr "提供了无效对象 '%s'。"
-#: builtin/commit.c:742 builtin/commit.c:750
-msgid "could not read SQUASH_MSG"
-msgstr "不能读取 SQUASH_MSG"
+#: builtin/diff.c:403
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "提供了超过两个数据对象：'%s'"
-#: builtin/commit.c:747
-msgid "could not read MERGE_MSG"
-msgstr "不能读取 MERGE_MSG"
+#: builtin/diff.c:408
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "无法处理的对象 '%s'。"
-#: builtin/commit.c:801
-msgid "could not write commit template"
-msgstr "不能写提交模版"
+#: builtin/difftool.c:30
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
-#: builtin/commit.c:819
+#: builtin/difftool.c:253
#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
-msgstr ""
-"\n"
-"似乎您正在做一个合并提交。如果不对，请删除文件\n"
-"\t%s\n"
-"然后重试。\n"
+msgid "failed: %d"
+msgstr "失败：%d"
-#: builtin/commit.c:824
+#: builtin/difftool.c:295
#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
-msgstr ""
-"\n"
-"似乎您正在做一个拣选提交。如果不对，请删除文件\n"
-"\t%s\n"
-"然后重试。\n"
+msgid "could not read symlink %s"
+msgstr "无法读取符号链接 %s"
-#: builtin/commit.c:837
+#: builtin/difftool.c:297
#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
-"说明将会终止提交。\n"
+msgid "could not read symlink file %s"
+msgstr "无法读取符号链接文件 %s"
-#: builtin/commit.c:844
+#: builtin/difftool.c:305
#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
+
+#: builtin/difftool.c:406
msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您原意\n"
-"也可以删除它们。一个空的提交说明将会终止提交。\n"
+"不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--"
+"cc'）。"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:861
+#: builtin/difftool.c:626
#, c-format
-msgid "%sAuthor: %.*s <%.*s>"
-msgstr "%s作者： %.*s <%.*s>"
+msgid "both files modified: '%s' and '%s'."
+msgstr "两个文件都被修改：'%s' 和 '%s'。"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:869
-#, c-format
-msgid "%sDate: %s"
-msgstr "%s日期： %s"
+#: builtin/difftool.c:628
+msgid "working tree file has been left."
+msgstr "工作区文件被留了下来。"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:876
+#: builtin/difftool.c:639
#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
-msgstr "%s提交者：%.*s <%.*s>"
+msgid "temporary files exist in '%s'."
+msgstr "临时文件存在于 '%s'。"
-#: builtin/commit.c:893
-msgid "Cannot read index"
-msgstr "æ\97 æ³\95读å\8f\96ç´¢å¼\95"
+#: builtin/difftool.c:640
+msgid "you may want to cleanup or recover these."
+msgstr "æ\82¨å\8f¯è\83½æ\83³è¦\81æ¸\85ç\90\86æ\88\96è\80\85æ\81¢å¤\8då®\83们ã\80\82"
-#: builtin/commit.c:958
-msgid "Error building trees"
-msgstr "无法创建树对象"
+#: builtin/difftool.c:689
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/commit.c:972 builtin/tag.c:252
-#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
-msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
+#: builtin/difftool.c:691
+msgid "perform a full-directory diff"
+msgstr "执行一个全目录差异比较"
-#: builtin/commit.c:1075
-#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
-msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"
+#: builtin/difftool.c:693
+msgid "do not prompt before launching a diff tool"
+msgstr "启动差异比较工具之前不提示"
-#: builtin/commit.c:1090 builtin/commit.c:1335
-#, c-format
-msgid "Invalid untracked files mode '%s'"
-msgstr "无效的未追踪文件参数 '%s'"
+#: builtin/difftool.c:698
+msgid "use symlinks in dir-diff mode"
+msgstr "在 dir-diff 模式中使用符号链接"
-#: builtin/commit.c:1128
-msgid "--long and -z are incompatible"
-msgstr "--long 和 -z 选项不兼容"
+#: builtin/difftool.c:699
+msgid "tool"
+msgstr "工具"
-#: builtin/commit.c:1158
-msgid "Using both --reset-author and --author does not make sense"
-msgstr "同时使用 --reset-author 和 --author 没有意义"
+#: builtin/difftool.c:700
+msgid "use the specified diff tool"
+msgstr "使用指定的差异比较工具"
-#: builtin/commit.c:1167
-msgid "You have nothing to amend."
-msgstr "æ\82¨æ²¡æ\9c\89å\8f¯ä¿®è¡¥ç\9a\84æ\8f\90交ã\80\82"
+#: builtin/difftool.c:702
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr "æ\98¾ç¤ºå\8f¯ä»¥ç\94¨å\9c¨ `--tool` å\8f\82æ\95°å\90\8eç\9a\84å·®å¼\82å·¥å\85·å\88\97表"
-#: builtin/commit.c:1170
-msgid "You are in the middle of a merge -- cannot amend."
-msgstr "您正处于一个合并过程中 -- 无法修补提交。"
+#: builtin/difftool.c:705
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出"
-#: builtin/commit.c:1172
-msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr "æ\82¨æ£å¤\84äº\8eä¸\80个æ\8b£é\80\89è¿\87ç¨\8bä¸ -- æ\97 æ³\95修补æ\8f\90交ã\80\82"
+#: builtin/difftool.c:708
+msgid "specify a custom command for viewing diffs"
+msgstr "æ\8c\87å®\9aä¸\80个ç\94¨äº\8eæ\9f¥ç\9c\8bå·®å¼\82ç\9a\84è\87ªå®\9aä¹\89å\91½ä»¤"
-#: builtin/commit.c:1175
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "选项 --squash 和 --fixup 不能同时使用"
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
+msgstr "传递给 `diff`"
-#: builtin/commit.c:1185
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool 要求工作区或者 --no-index"
-#: builtin/commit.c:1187
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff 和 --no-index 不兼容"
-#: builtin/commit.c:1195
-msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui、--tool 和 --extcmd 互斥"
-#: builtin/commit.c:1212
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
+#: builtin/difftool.c:742
+msgid "no <tool> given for --tool=<tool>"
+msgstr "没有为 --tool=<工具> 参数提供 <工具>"
-#: builtin/commit.c:1214
-msgid "No paths with --include/--only does not make sense."
-msgstr "参数 --include/--only 不跟路径没有意义。"
+#: builtin/difftool.c:749
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
-#: builtin/commit.c:1226 builtin/tag.c:535
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "无效的清理模式 %s"
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
+msgstr "git fast-export [rev-list-opts]"
-#: builtin/commit.c:1231
-msgid "Paths with -a does not make sense."
-msgstr "路径和 -a 选项同时使用没有意义。"
+#: builtin/fast-export.c:1084
+msgid "show progress after <n> objects"
+msgstr "在 <n> 个对象之后显示进度"
-#: builtin/commit.c:1349 builtin/commit.c:1626
-msgid "show status concisely"
-msgstr "以简洁的格式显示状态"
+#: builtin/fast-export.c:1086
+msgid "select handling of signed tags"
+msgstr "选择如何处理签名标签"
-#: builtin/commit.c:1351 builtin/commit.c:1628
-msgid "show branch information"
-msgstr "显示分支信息"
+#: builtin/fast-export.c:1089
+msgid "select handling of tags that tag filtered objects"
+msgstr "选择当标签指向被过滤对象时该标签的处理方式"
-#: builtin/commit.c:1353
-msgid "show stash information"
-msgstr "æ\98¾ç¤ºè´®è\97\8få\8cºä¿¡æ\81¯"
+#: builtin/fast-export.c:1092
+msgid "Dump marks to this file"
+msgstr "æ\8a\8aæ \87è®°å\98å\82¨å\88°è¿\99个æ\96\87件"
-#: builtin/commit.c:1355
-msgid "version"
-msgstr "版本"
+#: builtin/fast-export.c:1094
+msgid "Import marks from this file"
+msgstr "从这个文件导入标记"
-#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
-#: builtin/worktree.c:469
-msgid "machine-readable output"
-msgstr "机器可读的输出"
+#: builtin/fast-export.c:1096
+msgid "Fake a tagger when tags lack one"
+msgstr "当标签缺少标记者字段时，假装提供一个"
-#: builtin/commit.c:1358 builtin/commit.c:1632
-msgid "show status in long format (default)"
-msgstr "以长格式显示状态（默认）"
+#: builtin/fast-export.c:1098
+msgid "Output full tree for each commit"
+msgstr "每次提交都输出整个树"
-#: builtin/commit.c:1361 builtin/commit.c:1635
-msgid "terminate entries with NUL"
-msgstr "条目以 NUL 字符结尾"
+#: builtin/fast-export.c:1100
+msgid "Use the done feature to terminate the stream"
+msgstr "使用 done 功能来终止流"
-#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
-#: builtin/fast-export.c:1002 builtin/tag.c:390
-msgid "mode"
-msgstr "模式"
+#: builtin/fast-export.c:1101
+msgid "Skip output of blob data"
+msgstr "跳过数据对象的输出"
-#: builtin/commit.c:1364 builtin/commit.c:1638
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
-msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
+#: builtin/fast-export.c:1102 builtin/log.c:1609
+msgid "refspec"
+msgstr "引用规格"
-#: builtin/commit.c:1367
-msgid "show ignored files"
-msgstr "显示忽略的文件"
+#: builtin/fast-export.c:1103
+msgid "Apply refspec to exported refs"
+msgstr "对导出的引用应用引用规格"
-#: builtin/commit.c:1368 parse-options.h:155
-msgid "when"
-msgstr "何时"
+#: builtin/fast-export.c:1104
+msgid "anonymize output"
+msgstr "匿名输出"
-#: builtin/commit.c:1369
-msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
-msgstr ""
-"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
+#: builtin/fast-export.c:1106
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr "引用父对象 ID 不在 fast-export 流中"
-#: builtin/commit.c:1371
-msgid "list untracked files in columns"
-msgstr "以列的方式显示未跟踪的文件"
+#: builtin/fast-export.c:1108
+msgid "Show original object ids of blobs/commits"
+msgstr "显示数据对象/提交的原始对象 ID"
-#: builtin/commit.c:1449
-msgid "couldn't look up newly created commit"
-msgstr "无法找到新创建的提交"
+#: builtin/fetch.c:28
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/commit.c:1451
-msgid "could not parse newly created commit"
-msgstr "不能解析新创建的提交"
+#: builtin/fetch.c:29
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<选项>] <组>"
-#: builtin/commit.c:1496
-msgid "detached HEAD"
-msgstr "分离头指针"
+#: builtin/fetch.c:30
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
-# 译者：中文字符串拼接，可删除前导空格
-#: builtin/commit.c:1499
-msgid " (root-commit)"
-msgstr "（根提交）"
+#: builtin/fetch.c:31
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<选项>]"
-#: builtin/commit.c:1596
-msgid "suppress summary after successful commit"
-msgstr "提交成功后不显示概述信息"
+#: builtin/fetch.c:115 builtin/pull.c:202
+msgid "fetch from all remotes"
+msgstr "从所有的远程抓取"
-#: builtin/commit.c:1597
-msgid "show diff in commit message template"
-msgstr "在提交说明模板里显示差异"
+#: builtin/fetch.c:117 builtin/pull.c:205
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
-#: builtin/commit.c:1599
-msgid "Commit message options"
-msgstr "提交说明选项"
+#: builtin/fetch.c:119 builtin/pull.c:208
+msgid "path to upload pack on remote end"
+msgstr "上传包到远程的路径"
+
+#: builtin/fetch.c:120
+msgid "force overwrite of local reference"
+msgstr "强制覆盖本地引用"
+
+#: builtin/fetch.c:122
+msgid "fetch from multiple remotes"
+msgstr "从多个远程抓取"
+
+#: builtin/fetch.c:124 builtin/pull.c:212
+msgid "fetch all tags and associated objects"
+msgstr "抓取所有的标签和关联对象"
+
+#: builtin/fetch.c:126
+msgid "do not fetch all tags (--no-tags)"
+msgstr "不抓取任何标签(--no-tags)"
+
+#: builtin/fetch.c:128
+msgid "number of submodules fetched in parallel"
+msgstr "子模组获取的并发数"
+
+#: builtin/fetch.c:130 builtin/pull.c:215
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "清除远程已经不存在的分支的跟踪分支"
+
+#: builtin/fetch.c:132
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr "清除远程不存在的本地标签，并且替换变更标签"
+
+# 译者：可选值，不能翻译
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+msgid "on-demand"
+msgstr "on-demand"
+
+#: builtin/fetch.c:134
+msgid "control recursive fetching of submodules"
+msgstr "控制子模组的递归抓取"
-#: builtin/commit.c:1600 builtin/tag.c:388
-msgid "read message from file"
-msgstr "ä»\8eæ\96\87件ä¸è¯»å\8f\96æ\8f\90交说æ\98\8e"
+#: builtin/fetch.c:138 builtin/pull.c:223
+msgid "keep downloaded pack"
+msgstr "ä¿\9dæ\8c\81ä¸\8bè½½å\8c\85"
-#: builtin/commit.c:1601
-msgid "author"
-msgstr "作者"
+#: builtin/fetch.c:140
+msgid "allow updating of HEAD ref"
+msgstr "允许更新 HEAD 引用"
-#: builtin/commit.c:1601
-msgid "override author for commit"
-msgstr "æ\8f\90交æ\97¶è¦\86ç\9b\96ä½\9cè\80\85"
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+msgid "deepen history of shallow clone"
+msgstr "æ·±å\8c\96æµ\85å\85\8bé\9a\86ç\9a\84å\8e\86å\8f²"
-#: builtin/commit.c:1602 builtin/gc.c:359
-msgid "date"
-msgstr "日期"
+#: builtin/fetch.c:145
+msgid "deepen history of shallow repository based on time"
+msgstr "基于时间来深化浅克隆的历史"
-#: builtin/commit.c:1602
-msgid "override date for commit"
-msgstr "提交时覆盖日期"
+#: builtin/fetch.c:151 builtin/pull.c:229
+msgid "convert to a complete repository"
+msgstr "转换为一个完整的仓库"
-#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:386
-msgid "message"
-msgstr "说明"
+#: builtin/fetch.c:154
+msgid "prepend this to submodule path output"
+msgstr "在子模组路径输出的前面加上此目录"
-#: builtin/commit.c:1603
-msgid "commit message"
-msgstr "提交说明"
+#: builtin/fetch.c:157
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
-#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
-#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
-msgid "commit"
-msgstr "提交"
+#: builtin/fetch.c:161 builtin/pull.c:232
+msgid "accept refs that update .git/shallow"
+msgstr "接受更新 .git/shallow 的引用"
-#: builtin/commit.c:1604
-msgid "reuse and edit message from specified commit"
-msgstr "重用并编辑指定提交的提交说明"
+#: builtin/fetch.c:162 builtin/pull.c:234
+msgid "refmap"
+msgstr "引用映射"
-#: builtin/commit.c:1605
-msgid "reuse message from specified commit"
-msgstr "重用指定提交的提交说明"
+#: builtin/fetch.c:163 builtin/pull.c:235
+msgid "specify fetch refmap"
+msgstr "指定获取操作的引用映射"
-#: builtin/commit.c:1606
-msgid "use autosquash formatted message to fixup specified commit"
-msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
+#: builtin/fetch.c:170
+msgid "report that we have only objects reachable from this object"
+msgstr "报告我们只拥有从该对象开始可达的对象"
-#: builtin/commit.c:1607
-msgid "use autosquash formatted message to squash specified commit"
-msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
+#: builtin/fetch.c:469
+msgid "Couldn't find remote ref HEAD"
+msgstr "无法发现远程 HEAD 引用"
-#: builtin/commit.c:1608
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
-msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
+#: builtin/fetch.c:608
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "配置变量 fetch.output 包含无效值 %s"
-#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
-#: builtin/revert.c:105
-msgid "add Signed-off-by:"
-msgstr "添加 Signed-off-by: 签名"
+#: builtin/fetch.c:705
+#, c-format
+msgid "object %s not found"
+msgstr "对象 %s 未发现"
-#: builtin/commit.c:1610
-msgid "use specified template file"
-msgstr "使用指定的模板文件"
+#: builtin/fetch.c:709
+msgid "[up to date]"
+msgstr "[最新]"
-#: builtin/commit.c:1611
-msgid "force edit of commit"
-msgstr "强制编辑提交"
+#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+msgid "[rejected]"
+msgstr "[已拒绝]"
-# 译者：可选值，不能翻译（或是原文中笔误，应为 mode）
-#: builtin/commit.c:1612
-msgid "default"
-msgstr "default"
+#: builtin/fetch.c:723
+msgid "can't fetch in current branch"
+msgstr "当前分支下不能执行获取操作"
-#: builtin/commit.c:1612 builtin/tag.c:391
-msgid "how to strip spaces and #comments from message"
-msgstr "设置如何删除提交说明里的空格和#注释"
+#: builtin/fetch.c:733
+msgid "[tag update]"
+msgstr "[标签更新]"
-#: builtin/commit.c:1613
-msgid "include status in commit message template"
-msgstr "在提交说明模板里包含状态信息"
+#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
+#: builtin/fetch.c:796
+msgid "unable to update local ref"
+msgstr "不能更新本地引用"
-#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
-#: builtin/revert.c:113
-msgid "GPG sign commit"
-msgstr "GPG 提交签名"
+#: builtin/fetch.c:738
+msgid "would clobber existing tag"
+msgstr "会破坏现有的标签"
-#: builtin/commit.c:1618
-msgid "Commit contents options"
-msgstr "提交内容选项"
+#: builtin/fetch.c:760
+msgid "[new tag]"
+msgstr "[新标签]"
-#: builtin/commit.c:1619
-msgid "commit all changed files"
-msgstr "提交所有改动的文件"
+#: builtin/fetch.c:763
+msgid "[new branch]"
+msgstr "[新分支]"
-#: builtin/commit.c:1620
-msgid "add specified files to index for commit"
-msgstr "添加指定的文件到索引区等待提交"
+#: builtin/fetch.c:766
+msgid "[new ref]"
+msgstr "[新引用]"
-#: builtin/commit.c:1621
-msgid "interactively add files"
-msgstr "交互式添加文件"
+#: builtin/fetch.c:796
+msgid "forced update"
+msgstr "强制更新"
-#: builtin/commit.c:1622
-msgid "interactively add changes"
-msgstr "交互式添加变更"
+#: builtin/fetch.c:801
+msgid "non-fast-forward"
+msgstr "非快进"
-#: builtin/commit.c:1623
-msgid "commit only specified files"
-msgstr "只提交指定的文件"
+#: builtin/fetch.c:847
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr "%s 未发送所有必需的对象\n"
-#: builtin/commit.c:1624
-msgid "bypass pre-commit and commit-msg hooks"
-msgstr "绕过 pre-commit 和 commit-msg 钩子"
+#: builtin/fetch.c:868
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr "拒绝 %s 因为浅克隆不允许被更新"
-#: builtin/commit.c:1625
-msgid "show what would be committed"
-msgstr "显示将要提交的内容"
+#: builtin/fetch.c:959 builtin/fetch.c:1081
+#, c-format
+msgid "From %.*s\n"
+msgstr "来自 %.*s\n"
-#: builtin/commit.c:1636
-msgid "amend previous commit"
-msgstr "修改先前的提交"
+#: builtin/fetch.c:970
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"一些本地引用不能被更新；尝试运行\n"
+" 'git remote prune %s' 来删除旧的、有冲突的分支"
-#: builtin/commit.c:1637
-msgid "bypass post-rewrite hook"
-msgstr "绕过 post-rewrite 钩子"
+# 译者：注意保持前导空格
+#: builtin/fetch.c:1051
+#, c-format
+msgid " (%s will become dangling)"
+msgstr " （%s 将成为悬空状态）"
-#: builtin/commit.c:1642
-msgid "ok to record an empty change"
-msgstr "允许一个空提交"
+# 译者：注意保持前导空格
+#: builtin/fetch.c:1052
+#, c-format
+msgid " (%s has become dangling)"
+msgstr " （%s 已成为悬空状态）"
-#: builtin/commit.c:1644
-msgid "ok to record a change with an empty message"
-msgstr "允许空的提交说明"
+#: builtin/fetch.c:1084
+msgid "[deleted]"
+msgstr "[已删除]"
-#: builtin/commit.c:1674
-msgid "could not parse HEAD commit"
-msgstr "不能解析 HEAD 提交"
+#: builtin/fetch.c:1085 builtin/remote.c:1036
+msgid "(none)"
+msgstr "（无）"
-#: builtin/commit.c:1719
+#: builtin/fetch.c:1108
#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
-msgstr "æ\8d\9få\9d\8fç\9a\84 MERGE_HEAD æ\96\87件ï¼\88%sï¼\89"
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr "æ\8b\92ç»\9dè\8e·å\8f\96å\88°é\9d\9e纯ä»\93åº\93ç\9a\84å½\93å\89\8då\88\86æ\94¯ %s"
-#: builtin/commit.c:1726
-msgid "could not read MERGE_MODE"
-msgstr "不能读取 MERGE_MODE"
+#: builtin/fetch.c:1127
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/commit.c:1745
+#: builtin/fetch.c:1130
#, c-format
-msgid "could not read commit message: %s"
-msgstr "不能读取提交说明：%s"
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/commit.c:1756
+#: builtin/fetch.c:1434
#, c-format
-msgid "Aborting commit due to empty commit message.\n"
-msgstr "终止提交因为提交说明为空。\n"
+msgid "Fetching %s\n"
+msgstr "正在获取 %s\n"
-#: builtin/commit.c:1761
+#: builtin/fetch.c:1436 builtin/remote.c:100
#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "终止提交；您未更改来自模版的提交说明。\n"
+msgid "Could not fetch %s"
+msgstr "不能获取 %s"
-#: builtin/commit.c:1809
+#: builtin/fetch.c:1482
msgid ""
-"Repository has been updated, but unable to write\n"
-"new_index file. Check that disk is not full and quota is\n"
-"not exceeded, and then \"git reset HEAD\" to recover."
-msgstr ""
-"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
-"或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
+msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
-#: builtin/config.c:10
-msgid "git config [<options>]"
-msgstr "git config [<选项>]"
+#: builtin/fetch.c:1506
+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/config.c:57
-msgid "Config file location"
-msgstr "配置文件位置"
+#: builtin/fetch.c:1543
+msgid "You need to specify a tag name."
+msgstr "您需要指定一个标签名称。"
-#: builtin/config.c:58
-msgid "use global config file"
-msgstr "使用全局配置文件"
+#: builtin/fetch.c:1594
+msgid "Negative depth in --deepen is not supported"
+msgstr "--deepen 不支持负数深度"
-#: builtin/config.c:59
-msgid "use system config file"
-msgstr "使用系统级配置文件"
+#: builtin/fetch.c:1596
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/config.c:60
-msgid "use repository config file"
-msgstr "使用仓库级配置文件"
+#: builtin/fetch.c:1601
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/config.c:61
-msgid "use given config file"
-msgstr "使用指定的配置文件"
+#: builtin/fetch.c:1603
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
-#: builtin/config.c:62
-msgid "blob-id"
-msgstr "数据对象 ID"
+#: builtin/fetch.c:1619
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/config.c:62
-msgid "read config from given blob object"
-msgstr "从给定的数据对象读取配置"
+#: builtin/fetch.c:1621
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/config.c:63
-msgid "Action"
-msgstr "操作"
+#: builtin/fetch.c:1630
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "没有这样的远程或远程组：%s"
-#: builtin/config.c:64
-msgid "get value: name [value-regex]"
-msgstr "获取值：name [value-regex]"
+#: builtin/fetch.c:1637
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "获取组并指定引用规格没有意义"
-#: builtin/config.c:65
-msgid "get all values: key [value-regex]"
-msgstr "获得所有的值：key [value-regex]"
+#: builtin/fetch.c:1653
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
-#: builtin/config.c:66
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "根据正则表达式获得值：name-regex [value-regex]"
+#: builtin/fmt-merge-msg.c:18
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
-#: builtin/config.c:67
-msgid "get value specific for the URL: section[.var] URL"
-msgstr "获得 URL 取值：section[.var] URL"
+#: builtin/fmt-merge-msg.c:672
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
-#: builtin/config.c:68
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "替换所有匹配的变量：name value [value_regex]"
+#: builtin/fmt-merge-msg.c:675
+msgid "alias for --log (deprecated)"
+msgstr "参数 --log 的别名（已弃用）"
-#: builtin/config.c:69
-msgid "add a new variable: name value"
-msgstr "æ·»å\8a ä¸\80个æ\96°ç\9a\84å\8f\98é\87\8fï¼\9aname value"
+#: builtin/fmt-merge-msg.c:678
+msgid "text"
+msgstr "æ\96\87æ\9c¬"
-#: builtin/config.c:70
-msgid "remove a variable: name [value-regex]"
-msgstr "删除一个变量：name [value-regex]"
+#: builtin/fmt-merge-msg.c:679
+msgid "use <text> as start of message"
+msgstr "使用 <文本> 作为提交说明的开始"
-#: builtin/config.c:71
-msgid "remove all matches: name [value-regex]"
-msgstr "删除所有匹配项：name [value-regex]"
+#: builtin/fmt-merge-msg.c:680
+msgid "file to read from"
+msgstr "从文件中读取"
-#: builtin/config.c:72
-msgid "rename section: old-name new-name"
-msgstr "重命名小节：old-name new-name"
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr "git for-each-ref [<选项>] [<模式>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <对象>]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
+
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
-#: builtin/config.c:73
-msgid "remove a section: name"
-msgstr "å\88 é\99¤ä¸\80个å°\8fè\8a\82ï¼\9aname"
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
+msgstr "å¼\95ç\94¨å\8d ä½\8d符é\80\82ç\94¨äº\8e shells"
-#: builtin/config.c:74
-msgid "list all"
-msgstr "å\88\97å\87ºæ\89\80æ\9c\89"
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
+msgstr "å¼\95ç\94¨å\8d ä½\8d符é\80\82ç\94¨äº\8e perl"
-#: builtin/config.c:75
-msgid "open an editor"
-msgstr "打开一个编辑器"
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
+msgstr "引用占位符适用于 python"
-#: builtin/config.c:76
-msgid "find the color configured: slot [default]"
-msgstr "获得配置的颜色：配置 [默认]"
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
+msgstr "引用占位符适用于 Tcl"
-#: builtin/config.c:77
-msgid "find the color setting: slot [stdout-is-tty]"
-msgstr "获得颜色设置：配置 [stdout-is-tty]"
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
+msgstr "只显示 <n> 个匹配的引用"
-#: builtin/config.c:78
-msgid "Type"
-msgstr "类型"
+#: builtin/for-each-ref.c:39 builtin/tag.c:433
+msgid "respect format colors"
+msgstr "遵照格式中的颜色输出"
-#: builtin/config.c:79
-msgid "value is \"true\" or \"false\""
-msgstr "å\80¼æ\98¯ \"true\" æ\88\96 \"false\""
+#: builtin/for-each-ref.c:42
+msgid "print only refs which points at the given object"
+msgstr "å\8fªæ\89\93å\8d°æ\8c\87å\90\91ç»\99å®\9a对象ç\9a\84å¼\95ç\94¨"
-#: builtin/config.c:80
-msgid "value is decimal number"
-msgstr "å\80¼æ\98¯å\8d\81è¿\9bå\88¶æ\95°"
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are merged"
+msgstr "å\8fªæ\89\93å\8d°å·²ç»\8få\90\88并ç\9a\84å¼\95ç\94¨"
-#: builtin/config.c:81
-msgid "value is --bool or --int"
-msgstr "å\80¼æ\98¯ --bool or --int"
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are not merged"
+msgstr "å\8fªæ\89\93å\8d°æ²¡æ\9c\89å\90\88并ç\9a\84å¼\95ç\94¨"
-#: builtin/config.c:82
-msgid "value is a path (file or directory name)"
-msgstr "å\80¼æ\98¯ä¸\80个路å¾\84ï¼\88æ\96\87件æ\88\96ç\9b®å½\95å\90\8dï¼\89"
+#: builtin/for-each-ref.c:46
+msgid "print only refs which contain the commit"
+msgstr "å\8fªæ\89\93å\8d°å\8c\85å\90«è¯¥æ\8f\90交ç\9a\84å¼\95ç\94¨"
-#: builtin/config.c:83
-msgid "Other"
-msgstr "å\85¶å®\83"
+#: builtin/for-each-ref.c:47
+msgid "print only refs which don't contain the commit"
+msgstr "å\8fªæ\89\93å\8d°ä¸\8då\8c\85å\90«è¯¥æ\8f\90交ç\9a\84å¼\95ç\94¨"
-#: builtin/config.c:84
-msgid "terminate values with NUL byte"
-msgstr "终止值是 NUL 字节"
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr "未知"
-#: builtin/config.c:85
-msgid "show variable names only"
-msgstr "只显示变量名"
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "%s %s 错误：%s"
-#: builtin/config.c:86
-msgid "respect include directives on lookup"
-msgstr "查询时参照 include 指令递归查找"
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "%s %s 警告：%s"
-#: builtin/config.c:87
-msgid "show origin of config (file, standard input, blob, command line)"
-msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "来自 %7s %s 的损坏的链接"
-#: builtin/config.c:327
-msgid "unable to parse default color value"
-msgstr "不能解析默认颜色值"
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr "链接中错误的对象类型"
-#: builtin/config.c:471
+#: builtin/fsck.c:184
#, c-format
msgid ""
-"# This is Git's per-user configuration file.\n"
-"[user]\n"
-"# Please adapt and uncomment the following lines:\n"
-"#\tname = %s\n"
-"#\temail = %s\n"
+"broken link from %7s %s\n"
+" to %7s %s"
msgstr ""
-"# This is Git's per-user configuration file.\n"
-"[user]\n"
-"# Please adapt and uncomment the following lines:\n"
-"#\tname = %s\n"
-"#\temail = %s\n"
+"损坏的链接来自于 %7s %s\n"
+" 到 %7s %s"
-#: builtin/config.c:499
-msgid "--local can only be used inside a git repository"
-msgstr "--local 只能在一个仓库内使用"
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
+msgstr "缺失 %s %s"
-#: builtin/config.c:624
+#: builtin/fsck.c:321
#, c-format
-msgid "cannot create configuration file %s"
-msgstr "不能创建配置文件 %s"
+msgid "unreachable %s %s"
+msgstr "不可达 %s %s"
-#: builtin/config.c:637
+#: builtin/fsck.c:340
#, c-format
-msgid ""
-"cannot overwrite multiple values with a single value\n"
-" Use a regexp, --add or --replace-all to change %s."
-msgstr ""
-"无法用一个值覆盖多个值\n"
-" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
+msgid "dangling %s %s"
+msgstr "悬空 %s %s"
-#: builtin/count-objects.c:88
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
+msgstr "不能创建 lost-found"
-#: builtin/count-objects.c:98
-msgid "print sizes in human readable format"
-msgstr "以用户可读的格式显示大小"
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
+msgstr "不能完成 '%s'"
-#: builtin/describe.c:19
-msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [<选项>] [<提交号>...]"
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
+msgstr "正在检查 %s"
-#: builtin/describe.c:20
-msgid "git describe [<options>] --dirty"
-msgstr "git describe [<选项>] --dirty"
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "正在检查连通性（%d 个对象）"
-#: builtin/describe.c:54
-msgid "head"
-msgstr "头"
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
+msgstr "正在检查 %s %s"
-#: builtin/describe.c:54
-msgid "lightweight"
-msgstr "轻量级的"
+#: builtin/fsck.c:438
+msgid "broken links"
+msgstr "损坏的链接"
-#: builtin/describe.c:54
-msgid "annotated"
-msgstr "附注的"
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
+msgstr "根 %s"
-#: builtin/describe.c:264
+#: builtin/fsck.c:455
#, c-format
-msgid "annotated tag %s not available"
-msgstr "附注标签 %s 无效"
+msgid "tagged %s %s (%s) in %s"
+msgstr "标记 %s %s (%s) 于 %s"
-#: builtin/describe.c:268
+#: builtin/fsck.c:484
#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "附注标签 %s 没有嵌入名称"
+msgid "%s: object corrupt or missing"
+msgstr "%s：对象损坏或丢失"
-#: builtin/describe.c:270
+#: builtin/fsck.c:509
#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "标签 '%s' 的确是在 '%s'"
+msgid "%s: invalid reflog entry %s"
+msgstr "%s：无效的引用日志条目 %s"
-#: builtin/describe.c:297 builtin/log.c:493
+#: builtin/fsck.c:523
#, c-format
-msgid "Not a valid object name %s"
-msgstr "不是一个有效的对象名 %s"
+msgid "Checking reflog %s->%s"
+msgstr "正在检查引用日志 %s->%s"
-#: builtin/describe.c:300
+#: builtin/fsck.c:557
#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s 不是一个有效的 '%s' 对象"
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s：无效的 sha1 指针 %s"
-#: builtin/describe.c:317
+#: builtin/fsck.c:564
#, c-format
-msgid "no tag exactly matches '%s'"
-msgstr "没有标签准确匹配 '%s'"
+msgid "%s: not a commit"
+msgstr "%s：不是一个提交"
-#: builtin/describe.c:319
+#: builtin/fsck.c:619
+msgid "notice: No default references"
+msgstr "注意：无默认引用"
+
+#: builtin/fsck.c:634
#, c-format
-msgid "searching to describe %s\n"
-msgstr "搜索描述 %s\n"
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s：对象损坏或丢失：%s"
-#: builtin/describe.c:366
+#: builtin/fsck.c:647
#, c-format
-msgid "finished search at %s\n"
-msgstr "完成搜索 %s\n"
+msgid "%s: object could not be parsed: %s"
+msgstr "%s：不能解析对象：%s"
-#: builtin/describe.c:393
+#: builtin/fsck.c:667
#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
-msgstr ""
-"没有附注标签能描述 '%s'。\n"
-"然而，存在未附注标签：尝试 --tags。"
+msgid "bad sha1 file: %s"
+msgstr "坏的 sha1 文件：%s"
+
+#: builtin/fsck.c:682
+msgid "Checking object directory"
+msgstr "正在检查对象目录"
+
+#: builtin/fsck.c:685
+msgid "Checking object directories"
+msgstr "正在检查对象目录"
-#: builtin/describe.c:397
+#: builtin/fsck.c:700
#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
-msgstr ""
-"没有标签能描述 '%s'。\n"
-"尝试 --always，或者创建一些标签。"
+msgid "Checking %s link"
+msgstr "正在检查 %s 链接"
-#: builtin/describe.c:427
+#: builtin/fsck.c:705 builtin/index-pack.c:841
#, c-format
-msgid "traversed %lu commits\n"
-msgstr "已遍历 %lu 个提交\n"
+msgid "invalid %s"
+msgstr "无效的 %s"
-#: builtin/describe.c:430
+#: builtin/fsck.c:712
#, c-format
-msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
-msgstr ""
-"发现多于 %i 个标签，列出最近的 %i 个\n"
-"在 %s 放弃搜索\n"
+msgid "%s points to something strange (%s)"
+msgstr "%s 指向奇怪的东西（%s）"
-#: builtin/describe.c:452
-msgid "find the tag that comes after the commit"
-msgstr "寻找该提交之后的标签"
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s：分离头指针的指向不存在"
-#: builtin/describe.c:453
-msgid "debug search strategy on stderr"
-msgstr "在标准错误上调试搜索策略"
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "注意：%s 指向一个尚未诞生的分支（%s）"
-#: builtin/describe.c:454
-msgid "use any ref"
-msgstr "使用任意引用"
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
+msgstr "正在检查缓存树"
-#: builtin/describe.c:455
-msgid "use any tag, even unannotated"
-msgstr "使用任意标签，即使未附带注释"
+#: builtin/fsck.c:739
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "%s：cache-tree 中无效的 sha1 指针"
-#: builtin/describe.c:456
-msgid "always use long format"
-msgstr "始终使用长提交号格式"
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
+msgstr "cache-tree 中非树对象"
-#: builtin/describe.c:457
-msgid "only follow first parent"
-msgstr "只跟随第一个父提交"
+#: builtin/fsck.c:781
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<选项>] [<对象>...]"
-#: builtin/describe.c:460
-msgid "only output exact matches"
-msgstr "只输出精确匹配"
+#: builtin/fsck.c:787
+msgid "show unreachable objects"
+msgstr "显示不可达的对象"
-#: builtin/describe.c:462
-msgid "consider <n> most recent tags (default: 10)"
-msgstr "考虑最近 <n> 个标签（默认：10）"
+#: builtin/fsck.c:788
+msgid "show dangling objects"
+msgstr "显示悬空的对象"
-#: builtin/describe.c:464
-msgid "only consider tags matching <pattern>"
-msgstr "只考虑匹配 <模式> 的标签"
+#: builtin/fsck.c:789
+msgid "report tags"
+msgstr "报告标签"
-#: builtin/describe.c:466
-msgid "do not consider tags matching <pattern>"
-msgstr "不考虑匹配 <模式> 的标签"
+#: builtin/fsck.c:790
+msgid "report root nodes"
+msgstr "报告根节点"
-#: builtin/describe.c:468 builtin/name-rev.c:406
-msgid "show abbreviated commit object as fallback"
-msgstr "显示简写的提交号作为后备"
+#: builtin/fsck.c:791
+msgid "make index objects head nodes"
+msgstr "将索引亦作为检查的头节点"
-#: builtin/describe.c:469 builtin/describe.c:472
-msgid "mark"
-msgstr "标记"
+#: builtin/fsck.c:792
+msgid "make reflogs head nodes (default)"
+msgstr "将引用日志作为检查的头节点（默认）"
-#: builtin/describe.c:470
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
-msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
+#: builtin/fsck.c:793
+msgid "also consider packs and alternate objects"
+msgstr "也考虑包和备用对象"
-#: builtin/describe.c:473
-msgid "append <mark> on broken working tree (default: \"-broken\")"
-msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
+#: builtin/fsck.c:794
+msgid "check only connectivity"
+msgstr "仅检查连通性"
-#: builtin/describe.c:491
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long 与 --abbrev=0 不兼容"
+#: builtin/fsck.c:795
+msgid "enable more strict checking"
+msgstr "启用更严格的检查"
-#: builtin/describe.c:520
-msgid "No names found, cannot describe anything."
-msgstr "没有发现名称，无法描述任何东西。"
+#: builtin/fsck.c:797
+msgid "write dangling objects in .git/lost-found"
+msgstr "将悬空对象写入 .git/lost-found 中"
-#: builtin/describe.c:563
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty 与提交号不兼容"
+#: builtin/fsck.c:798 builtin/prune.c:132
+msgid "show progress"
+msgstr "显示进度"
+
+#: builtin/fsck.c:799
+msgid "show verbose names for reachable objects"
+msgstr "显示可达对象的详细名称"
+
+#: builtin/fsck.c:859 builtin/index-pack.c:224
+msgid "Checking objects"
+msgstr "正在检查对象"
+
+#: builtin/fsck.c:887
+#, c-format
+msgid "%s: object missing"
+msgstr "%s：对象缺失"
+
+#: builtin/fsck.c:899
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "无效的参数：期望 sha1，得到 '%s'"
+
+#: builtin/gc.c:34
+msgid "git gc [<options>]"
+msgstr "git gc [<选项>]"
+
+#: builtin/gc.c:90
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr "对 %s 调用 fstat 失败：%s"
+
+#: builtin/gc.c:126
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "无法解析 '%s' 值 '%s'"
+
+#: builtin/gc.c:476 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "不能对 '%s' 调用 stat"
+
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#, c-format
+msgid "cannot read '%s'"
+msgstr "不能读取 '%s'"
+
+#: builtin/gc.c:492
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
+"在该文件被删除之前，自动清理将不会执行。\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:540
+msgid "prune unreferenced objects"
+msgstr "清除未引用的对象"
+
+#: builtin/gc.c:542
+msgid "be more thorough (increased runtime)"
+msgstr "更彻底（增加运行时间）"
+
+#: builtin/gc.c:543
+msgid "enable auto-gc mode"
+msgstr "启用自动垃圾回收模式"
-#: builtin/describe.c:565
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken 与提交号不兼容"
+#: builtin/gc.c:546
+msgid "force running gc even if there may be another gc running"
+msgstr "强制执行 gc 即使另外一个 gc 正在执行"
-#: builtin/diff.c:83
+#: builtin/gc.c:549
+msgid "repack all other packs except the largest pack"
+msgstr "除了最大的包之外，对所有其它包文件重新打包"
+
+#: builtin/gc.c:566
#, c-format
-msgid "'%s': not a regular file or symlink"
-msgstr "'%s'ï¼\9aä¸\8dæ\98¯ä¸\80个æ£è§\84æ\96\87件æ\88\96符å\8f·é\93¾æ\8e¥"
+msgid "failed to parse gc.logexpiry value %s"
+msgstr "解æ\9e\90 gc.logexpiry ç\9a\84å\80¼ %s 失败"
-#: builtin/diff.c:235
+#: builtin/gc.c:577
#, c-format
-msgid "invalid option: %s"
-msgstr "无效选项：%s"
+msgid "failed to parse prune expiry value %s"
+msgstr "解析清除期限值 %s 失败"
-#: builtin/diff.c:357
-msgid "Not a git repository"
-msgstr "不是一个 git 仓库"
+#: builtin/gc.c:597
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr "自动在后台执行仓库打包以求最佳性能。\n"
-#: builtin/diff.c:400
+#: builtin/gc.c:599
#, c-format
-msgid "invalid object '%s' given."
-msgstr "提供了无效对象 '%s'。"
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/diff.c:409
+#: builtin/gc.c:600
#, c-format
-msgid "more than two blobs given: '%s'"
-msgstr "æ\8f\90ä¾\9bäº\86è¶\85è¿\87两个æ\95°æ\8d®å¯¹è±¡ï¼\9a'%s'"
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "æ\89\8b工维æ\8a¤å\8f\82è§\81 \"git help gc\"ã\80\82\n"
-#: builtin/diff.c:414
+#: builtin/gc.c:640
#, c-format
-msgid "unhandled object '%s' given."
-msgstr "无法处理的对象 '%s'。"
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
-#: builtin/difftool.c:29
-msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
-msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
+#: builtin/gc.c:693
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
+
+#: builtin/grep.c:29
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
-#: builtin/difftool.c:259
+#: builtin/grep.c:225
#, c-format
-msgid "failed: %d"
-msgstr "失败：%d"
+msgid "grep: failed to create thread: %s"
+msgstr "grep：无法创建线程：%s"
-#: builtin/difftool.c:301
+#: builtin/grep.c:279
#, c-format
-msgid "could not read symlink %s"
-msgstr "无法读取符号链接 %s"
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
-#: builtin/difftool.c:303
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
+#: builtin/pack-objects.c:2720
#, c-format
-msgid "could not read symlink file %s"
-msgstr "æ\97 æ³\95读å\8f\96符å\8f·é\93¾æ\8e¥æ\96\87件 %s"
+msgid "no threads support, ignoring %s"
+msgstr "没æ\9c\89线ç¨\8bæ\94¯æ\8c\81ï¼\8c忽ç\95¥ %s"
-#: builtin/difftool.c:311
+#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
#, c-format
-msgid "could not read object %s for symlink %s"
-msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
+msgid "unable to read tree (%s)"
+msgstr "无法读取树（%s）"
-#: builtin/difftool.c:412
-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'）。"
+#: builtin/grep.c:646
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/difftool.c:633
+#: builtin/grep.c:712
#, c-format
-msgid "both files modified: '%s' and '%s'."
-msgstr "两个文件都被修改：'%s' 和 '%s'。"
+msgid "switch `%c' expects a numerical value"
+msgstr "开关 `%c' 期望一个数字值"
-#: builtin/difftool.c:635
-msgid "working tree file has been left."
-msgstr "å·¥ä½\9cå\8cºæ\96\87件被ç\95\99äº\86ä¸\8bæ\9d¥ã\80\82"
+#: builtin/grep.c:811
+msgid "search in index instead of in the work tree"
+msgstr "å\9c¨ç´¢å¼\95å\8cºæ\90\9cç´¢è\80\8cä¸\8dæ\98¯å\9c¨å·¥ä½\9cå\8cº"
-#: builtin/difftool.c:646
-#, c-format
-msgid "temporary files exist in '%s'."
-msgstr "临时文件存在于 '%s'。"
+#: builtin/grep.c:813
+msgid "find in contents not managed by git"
+msgstr "在未被 git 管理的内容中查找"
-#: builtin/difftool.c:647
-msgid "you may want to cleanup or recover these."
-msgstr "您可能想要清理或者恢复它们。"
+# 译者：中文字符串拼接，可删除前导空格
+#: builtin/grep.c:815
+msgid "search in both tracked and untracked files"
+msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/difftool.c:696
-msgid "use `diff.guitool` instead of `diff.tool`"
-msgstr "使用 `diff.guitool` 代替 `diff.tool`"
+#: builtin/grep.c:817
+msgid "ignore files specified via '.gitignore'"
+msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/difftool.c:698
-msgid "perform a full-directory diff"
-msgstr "执行一个全目录差异比较"
+#: builtin/grep.c:819
+msgid "recursively search in each submodule"
+msgstr "在每一个子模组中递归搜索"
-#: builtin/difftool.c:700
-msgid "do not prompt before launching a diff tool"
-msgstr "启动差异比较工具之前不提示"
+#: builtin/grep.c:822
+msgid "show non-matching lines"
+msgstr "显示未匹配的行"
-#: builtin/difftool.c:706
-msgid "use symlinks in dir-diff mode"
-msgstr "在 dir-diff 模式中使用符号链接"
+#: builtin/grep.c:824
+msgid "case insensitive matching"
+msgstr "不区分大小写匹配"
-#: builtin/difftool.c:707
-msgid "<tool>"
-msgstr "<工具>"
+#: builtin/grep.c:826
+msgid "match patterns only at word boundaries"
+msgstr "只在单词边界匹配模式"
-#: builtin/difftool.c:708
-msgid "use the specified diff tool"
-msgstr "使用指定的差异比较工具"
+#: builtin/grep.c:828
+msgid "process binary files as text"
+msgstr "把二进制文件当做文本处理"
-#: builtin/difftool.c:710
-msgid "print a list of diff tools that may be used with `--tool`"
-msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
+#: builtin/grep.c:830
+msgid "don't match patterns in binary files"
+msgstr "不在二进制文件中匹配模式"
-#: builtin/difftool.c:713
-msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
-"code"
-msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出"
+#: builtin/grep.c:833
+msgid "process binary files with textconv filters"
+msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/difftool.c:715
-msgid "<command>"
-msgstr "<命令>"
+#: builtin/grep.c:835
+msgid "search in subdirectories (default)"
+msgstr "在子目录中寻找（默认）"
-#: builtin/difftool.c:716
-msgid "specify a custom command for viewing diffs"
-msgstr "æ\8c\87å®\9aä¸\80个ç\94¨äº\8eæ\9f¥ç\9c\8bå·®å¼\82ç\9a\84è\87ªå®\9aä¹\89å\91½ä»¤"
+#: builtin/grep.c:837
+msgid "descend at most <depth> levels"
+msgstr "æ\9c\80å¤\9a以æ\8c\87å®\9aç\9a\84深度å\90\91ä¸\8b寻æ\89¾"
-#: builtin/difftool.c:740
-msgid "no <tool> given for --tool=<tool>"
-msgstr "没有为 --tool=<工具> 参数提供 <工具>"
+#: builtin/grep.c:841
+msgid "use extended POSIX regular expressions"
+msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/difftool.c:747
-msgid "no <cmd> given for --extcmd=<cmd>"
-msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
+#: builtin/grep.c:844
+msgid "use basic POSIX regular expressions (default)"
+msgstr "使用基本的 POSIX 正则表达式（默认）"
-#: builtin/fast-export.c:26
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [rev-list-opts]"
+#: builtin/grep.c:847
+msgid "interpret patterns as fixed strings"
+msgstr "把模式解析为固定的字符串"
-#: builtin/fast-export.c:998
-msgid "show progress after <n> objects"
-msgstr "在 <n> 个对象之后显示进度"
+#: builtin/grep.c:850
+msgid "use Perl-compatible regular expressions"
+msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/fast-export.c:1000
-msgid "select handling of signed tags"
-msgstr "选择如何处理签名标签"
+#: builtin/grep.c:853
+msgid "show line numbers"
+msgstr "显示行号"
-#: builtin/fast-export.c:1003
-msgid "select handling of tags that tag filtered objects"
-msgstr "选择当标签指向被过滤对象时该标签的处理方式"
+#: builtin/grep.c:854
+msgid "show column number of first match"
+msgstr "显示第一个匹配的列号"
-#: builtin/fast-export.c:1006
-msgid "Dump marks to this file"
-msgstr "把标记存储到这个文件"
+#: builtin/grep.c:855
+msgid "don't show filenames"
+msgstr "不显示文件名"
-#: builtin/fast-export.c:1008
-msgid "Import marks from this file"
-msgstr "从这个文件导入标记"
+#: builtin/grep.c:856
+msgid "show filenames"
+msgstr "显示文件名"
-#: builtin/fast-export.c:1010
-msgid "Fake a tagger when tags lack one"
-msgstr "当标签缺少标记者字段时，假装提供一个"
+#: builtin/grep.c:858
+msgid "show filenames relative to top directory"
+msgstr "显示相对于顶级目录的文件名"
-#: builtin/fast-export.c:1012
-msgid "Output full tree for each commit"
-msgstr "每次提交都输出整个树"
+#: builtin/grep.c:860
+msgid "show only filenames instead of matching lines"
+msgstr "只显示文件名而不显示匹配的行"
-#: builtin/fast-export.c:1014
-msgid "Use the done feature to terminate the stream"
-msgstr "使用 done 功能来终止流"
+#: builtin/grep.c:862
+msgid "synonym for --files-with-matches"
+msgstr "和 --files-with-matches 同义"
-#: builtin/fast-export.c:1015
-msgid "Skip output of blob data"
-msgstr "跳过数据对象的输出"
+#: builtin/grep.c:865
+msgid "show only the names of files without match"
+msgstr "只显示未匹配的文件名"
-#: builtin/fast-export.c:1016
-msgid "refspec"
-msgstr "å¼\95ç\94¨è§\84æ ¼"
+#: builtin/grep.c:867
+msgid "print NUL after filenames"
+msgstr "å\9c¨æ\96\87件å\90\8då\90\8eè¾\93å\87º NUL å\97符"
-#: builtin/fast-export.c:1017
-msgid "Apply refspec to exported refs"
-msgstr "对导å\87ºç\9a\84å¼\95ç\94¨åº\94ç\94¨å¼\95ç\94¨è§\84æ ¼"
+#: builtin/grep.c:870
+msgid "show only matching parts of a line"
+msgstr "å\8fªæ\98¾ç¤ºè¡\8cä¸ç\9a\84å\8c¹é\85\8dç\9a\84é\83¨å\88\86"
-#: builtin/fast-export.c:1018
-msgid "anonymize output"
-msgstr "匿名输出"
+#: builtin/grep.c:872
+msgid "show the number of matches instead of matching lines"
+msgstr "显示总匹配行数，而不显示匹配的行"
-#: builtin/fetch.c:23
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
+#: builtin/grep.c:873
+msgid "highlight matches"
+msgstr "高亮显示匹配项"
-#: builtin/fetch.c:24
-msgid "git fetch [<options>] <group>"
-msgstr "git fetch [<选项>] <组>"
+#: builtin/grep.c:875
+msgid "print empty line between matches from different files"
+msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/fetch.c:25
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
-msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
+#: builtin/grep.c:877
+msgid "show filename only once above matches from same file"
+msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/fetch.c:26
-msgid "git fetch --all [<options>]"
-msgstr "git fetch --all [<选项>]"
+#: builtin/grep.c:880
+msgid "show <n> context lines before and after matches"
+msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/fetch.c:112 builtin/pull.c:182
-msgid "fetch from all remotes"
-msgstr "从所有的远程抓取"
+#: builtin/grep.c:883
+msgid "show <n> context lines before matches"
+msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/fetch.c:114 builtin/pull.c:185
-msgid "append to .git/FETCH_HEAD instead of overwriting"
-msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
+#: builtin/grep.c:885
+msgid "show <n> context lines after matches"
+msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/fetch.c:116 builtin/pull.c:188
-msgid "path to upload pack on remote end"
-msgstr "ä¸\8aä¼ å\8c\85å\88°è¿\9cç¨\8bç\9a\84è·¯å¾\84"
+#: builtin/grep.c:887
+msgid "use <n> worker threads"
+msgstr "使ç\94¨ <n> 个工ä½\9c线ç¨\8b"
-#: builtin/fetch.c:117 builtin/pull.c:190
-msgid "force overwrite of local branch"
-msgstr "强å\88¶è¦\86ç\9b\96æ\9c¬å\9c°å\88\86æ\94¯"
+#: builtin/grep.c:888
+msgid "shortcut for -C NUM"
+msgstr "å¿«æ\8d·é\94® -C æ\95°å\97"
-#: builtin/fetch.c:119
-msgid "fetch from multiple remotes"
-msgstr "从多个远程抓取"
+#: builtin/grep.c:891
+msgid "show a line with the function name before matches"
+msgstr "在匹配的前面显示一行函数名"
-#: builtin/fetch.c:121 builtin/pull.c:192
-msgid "fetch all tags and associated objects"
-msgstr "æ\8a\93å\8f\96æ\89\80æ\9c\89ç\9a\84æ \87ç¾å\92\8cå\85³è\81\94对象"
+#: builtin/grep.c:893
+msgid "show the surrounding function"
+msgstr "æ\98¾ç¤ºæ\89\80å\9c¨å\87½æ\95°ç\9a\84å\89\8då\90\8eå\86\85容"
-#: builtin/fetch.c:123
-msgid "do not fetch all tags (--no-tags)"
-msgstr "不抓取任何标签(--no-tags)"
+#: builtin/grep.c:896
+msgid "read patterns from file"
+msgstr "从文件读取模式"
+
+#: builtin/grep.c:898
+msgid "match <pattern>"
+msgstr "匹配 <模式>"
+
+#: builtin/grep.c:900
+msgid "combine patterns specified with -e"
+msgstr "组合用 -e 参数设定的模式"
+
+#: builtin/grep.c:912
+msgid "indicate hit with exit status without output"
+msgstr "不输出，而用退出码标识命中状态"
+
+#: builtin/grep.c:914
+msgid "show only matches from files that match all patterns"
+msgstr "只显示匹配所有模式的文件中的匹配"
+
+#: builtin/grep.c:916
+msgid "show parse tree for grep expression"
+msgstr "显示 grep 表达式的解析树"
+
+#: builtin/grep.c:920
+msgid "pager"
+msgstr "分页"
+
+#: builtin/grep.c:920
+msgid "show matching files in the pager"
+msgstr "分页显示匹配的文件"
+
+#: builtin/grep.c:924
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "允许调用 grep(1)（本次构建忽略）"
-#: builtin/fetch.c:125
-msgid "number of submodules fetched in parallel"
-msgstr "子模组获取的并发数"
+#: builtin/grep.c:988
+msgid "no pattern given"
+msgstr "未提供匹配模式"
-#: builtin/fetch.c:127 builtin/pull.c:195
-msgid "prune remote-tracking branches no longer on remote"
-msgstr "清除远程已经不存在的分支的跟踪分支"
+#: builtin/grep.c:1024
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index 或 --untracked 不能和版本同时使用"
-# 译者：可选值，不能翻译
-#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
-msgid "on-demand"
-msgstr "on-demand"
+#: builtin/grep.c:1032
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "不能解析版本：%s"
-#: builtin/fetch.c:129
-msgid "control recursive fetching of submodules"
-msgstr "æ\8e§å\88¶å\90模ç»\84ç\9a\84é\80\92å½\92æ\8a\93å\8f\96"
+#: builtin/grep.c:1063
+msgid "invalid option combination, ignoring --threads"
+msgstr "æ\97 æ\95\88ç\9a\84é\80\89项ç»\84å\90\88ï¼\8c忽ç\95¥ --threads"
-#: builtin/fetch.c:133 builtin/pull.c:203
-msgid "keep downloaded pack"
-msgstr "保持下载包"
+#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+msgid "no threads support, ignoring --threads"
+msgstr "没有线程支持，忽略 --threads"
-#: builtin/fetch.c:135
-msgid "allow updating of HEAD ref"
-msgstr "允许更新 HEAD 引用"
+#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "指定的线程数无效（%d）"
-#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
-msgid "deepen history of shallow clone"
-msgstr "深化浅克隆的历史"
+#: builtin/grep.c:1092
+msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/fetch.c:140
-msgid "deepen history of shallow repository based on time"
-msgstr "基于时间来深化浅克隆的历史"
+#: builtin/grep.c:1115
+msgid "option not supported with --recurse-submodules"
+msgstr "选项不支持和 --recurse-submodules 共用"
-#: builtin/fetch.c:146 builtin/pull.c:209
-msgid "convert to a complete repository"
-msgstr "转换为一个完整的仓库"
+#: builtin/grep.c:1121
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
-#: builtin/fetch.c:148 builtin/log.c:1456
-msgid "dir"
-msgstr "目录"
+#: builtin/grep.c:1127
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
-#: builtin/fetch.c:149
-msgid "prepend this to submodule path output"
-msgstr "å\9c¨å\90模ç»\84è·¯å¾\84è¾\93å\87ºç\9a\84å\89\8dé\9d¢å\8a ä¸\8aæ¤ç\9b®å½\95"
+#: builtin/grep.c:1135
+msgid "both --cached and trees are given"
+msgstr "å\90\8cæ\97¶ç»\99å\87ºäº\86 --cached å\92\8cæ \91对象"
-#: builtin/fetch.c:152
+#: builtin/hash-object.c:85
msgid ""
-"default for recursive fetching of submodules (lower priority than config "
-"files)"
-msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
+"[--] <文件>..."
-#: builtin/fetch.c:156 builtin/pull.c:212
-msgid "accept refs that update .git/shallow"
-msgstr "接受更新 .git/shallow 的引用"
+#: builtin/hash-object.c:86
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
-#: builtin/fetch.c:157 builtin/pull.c:214
-msgid "refmap"
-msgstr "引用映射"
+#: builtin/hash-object.c:98
+msgid "type"
+msgstr "类型"
-#: builtin/fetch.c:158 builtin/pull.c:215
-msgid "specify fetch refmap"
-msgstr "指定获取操作的引用映射"
+#: builtin/hash-object.c:98
+msgid "object type"
+msgstr "对象类型"
-#: builtin/fetch.c:416
-msgid "Couldn't find remote ref HEAD"
-msgstr "无法发现远程 HEAD 引用"
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
+msgstr "将对象写入对象数据库"
-#: builtin/fetch.c:534
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
-msgstr "配置变量 fetch.output 包含无效值 %s"
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
+msgstr "从标准输入读取对象"
-#: builtin/fetch.c:627
-#, c-format
-msgid "object %s not found"
-msgstr "对象 %s 未发现"
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
+msgstr "原样存储文件不使用过滤器"
-#: builtin/fetch.c:631
-msgid "[up to date]"
-msgstr "[最新]"
+#: builtin/hash-object.c:104
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
-#: builtin/fetch.c:644 builtin/fetch.c:724
-msgid "[rejected]"
-msgstr "[已拒绝]"
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
+msgstr "处理文件并假设其来自于此路径"
-#: builtin/fetch.c:645
-msgid "can't fetch in current branch"
-msgstr "当前分支下不能执行获取操作"
+#: builtin/help.c:46
+msgid "print all available commands"
+msgstr "打印所有可用的命令"
-#: builtin/fetch.c:654
-msgid "[tag update]"
-msgstr "[标签更新]"
+#: builtin/help.c:47
+msgid "exclude guides"
+msgstr "排除向导"
-#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
-#: builtin/fetch.c:719
-msgid "unable to update local ref"
-msgstr "不能更新本地引用"
+#: builtin/help.c:48
+msgid "print list of useful guides"
+msgstr "显示有用的指南列表"
-#: builtin/fetch.c:674
-msgid "[new tag]"
-msgstr "[新标签]"
+#: builtin/help.c:49
+msgid "print all configuration variable names"
+msgstr "打印所有配置变量名称"
-#: builtin/fetch.c:677
-msgid "[new branch]"
-msgstr "[新分支]"
+#: builtin/help.c:51
+msgid "show man page"
+msgstr "显示 man 手册"
-#: builtin/fetch.c:680
-msgid "[new ref]"
-msgstr "[新引用]"
+#: builtin/help.c:52
+msgid "show manual in web browser"
+msgstr "在 web 浏览器中显示手册"
-#: builtin/fetch.c:719
-msgid "forced update"
-msgstr "强制更新"
+#: builtin/help.c:54
+msgid "show info page"
+msgstr "显示 info 手册"
-#: builtin/fetch.c:724
-msgid "non-fast-forward"
-msgstr "非快进"
+#: builtin/help.c:56
+msgid "print command description"
+msgstr "打印命令描述"
+
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
-#: builtin/fetch.c:769
+#: builtin/help.c:77
#, c-format
-msgid "%s did not send all necessary objects\n"
-msgstr "%s 未发送所有必须的对象\n"
+msgid "unrecognized help format '%s'"
+msgstr "未能识别的帮助格式 '%s'"
+
+#: builtin/help.c:104
+msgid "Failed to start emacsclient."
+msgstr "无法启动 emacsclient。"
-#: builtin/fetch.c:789
+#: builtin/help.c:117
+msgid "Failed to parse emacsclient version."
+msgstr "无法解析 emacsclient 版本。"
+
+#: builtin/help.c:125
#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "拒绝 %s 因为浅克隆不允许被更新"
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr "emacsclient 版本 '%d' 太老（< 22）。"
-#: builtin/fetch.c:877 builtin/fetch.c:973
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
-msgid "From %.*s\n"
-msgstr "æ\9d¥è\87ª %.*s\n"
+msgid "failed to exec '%s'"
+msgstr "æ\89§è¡\8c '%s' 失败"
-#: builtin/fetch.c:888
+#: builtin/help.c:221
#, c-format
msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-"一些本地引用不能被更新；尝试运行\n"
-" 'git remote prune %s' 来删除旧的、有冲突的分支"
+"'%s'：不支持的 man 手册查看器的路径。\n"
+"请使用 'man.<工具>.cmd'。"
-# 译者：注意保持前导空格
-#: builtin/fetch.c:943
+#: builtin/help.c:233
#, c-format
-msgid " (%s will become dangling)"
-msgstr " （%s 将成为摇摆状态）"
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+"'%s': 支持的 man 手册查看器命令。\n"
+"请使用 'man.<工具>.path'。"
-# 译者：注意保持前导空格
-#: builtin/fetch.c:944
+#: builtin/help.c:350
#, c-format
-msgid " (%s has become dangling)"
-msgstr " （%s 已成为摇摆状态）"
+msgid "'%s': unknown man viewer."
+msgstr "'%s'：未知的 man 查看器。"
-#: builtin/fetch.c:976
-msgid "[deleted]"
-msgstr "[已删除]"
+#: builtin/help.c:367
+msgid "no man viewer handled the request"
+msgstr "没有 man 查看器处理此请求"
-#: builtin/fetch.c:977 builtin/remote.c:1024
-msgid "(none)"
-msgstr "（无）"
+#: builtin/help.c:375
+msgid "no info viewer handled the request"
+msgstr "没有 info 查看器处理此请求"
-#: builtin/fetch.c:1000
+#: builtin/help.c:434 builtin/help.c:445 git.c:335
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "拒绝获取到非纯仓库的当前分支 %s"
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' 是 '%s' 的别名"
-#: builtin/fetch.c:1019
+#: builtin/help.c:448 git.c:364
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
+msgid "bad alias.%s string: %s"
+msgstr "坏的 alias.%s 字符串：%s"
-#: builtin/fetch.c:1022
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "选项 \"%s\" 为 %s 所忽略\n"
+msgid "usage: %s%s"
+msgstr "用法：%s%s"
-#: builtin/fetch.c:1098
+#: builtin/help.c:491
+msgid "'git help config' for more information"
+msgstr "'git help config' 获取更多信息"
+
+#: builtin/index-pack.c:184
#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "不知道如何从 %s 获取"
+msgid "object type mismatch at %s"
+msgstr "%s 的对象类型不匹配"
-#: builtin/fetch.c:1258
+#: builtin/index-pack.c:204
#, c-format
-msgid "Fetching %s\n"
-msgstr "æ£å\9c¨è\8e·å\8f\96 %s\n"
+msgid "did not receive expected object %s"
+msgstr "æ\9cªè\83½è\8e·å\8f\96é¢\84æ\9c\9fç\9a\84对象 %s"
-#: builtin/fetch.c:1260 builtin/remote.c:97
+#: builtin/index-pack.c:207
#, c-format
-msgid "Could not fetch %s"
-msgstr "不能获取 %s"
+msgid "object %s: expected type %s, found %s"
+msgstr "对象 %s：应为类型 %s，却是 %s"
-#: builtin/fetch.c:1278
-msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
-msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"
+#: builtin/index-pack.c:257
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] "无法填充 %d 字节"
+msgstr[1] "无法填充 %d 字节"
-#: builtin/fetch.c:1301
-msgid "You need to specify a tag name."
-msgstr "您需要指定一个标签名称。"
+#: builtin/index-pack.c:267
+msgid "early EOF"
+msgstr "过早的文件结束符（EOF）"
-#: builtin/fetch.c:1344
-msgid "Negative depth in --deepen is not supported"
-msgstr "--deepen 不支持负数深度"
+#: builtin/index-pack.c:268
+msgid "read error on input"
+msgstr "输入上的读错误"
-#: builtin/fetch.c:1346
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen 和 --depth 是互斥的"
+#: builtin/index-pack.c:280
+msgid "used more bytes than were available"
+msgstr "用掉了超过可用的字节"
-#: builtin/fetch.c:1351
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth 和 --unshallow 不能同时使用"
+#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+msgid "pack too large for current definition of off_t"
+msgstr "包太大超过了当前 off_t 的定义"
-#: builtin/fetch.c:1353
-msgid "--unshallow on a complete repository does not make sense"
-msgstr "对äº\8eä¸\80个å®\8cæ\95´ç\9a\84ä»\93åº\93ï¼\8cå\8f\82æ\95° --unshallow 没æ\9c\89æ\84\8fä¹\89"
+#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
+msgid "pack exceeds maximum allowed size"
+msgstr "å\8c\85è¶\85è¿\87äº\86æ\9c\80大å\85\81许å\80¼"
-#: builtin/fetch.c:1366
-msgid "fetch --all does not take a repository argument"
-msgstr "fetch --all 不能带一个仓库参数"
+#: builtin/index-pack.c:305 builtin/repack.c:250
+#, c-format
+msgid "unable to create '%s'"
+msgstr "不能创建 '%s'"
-#: builtin/fetch.c:1368
-msgid "fetch --all does not make sense with refspecs"
-msgstr "fetch --all 带引用规格没有任何意义"
+#: builtin/index-pack.c:311
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr "无法打开包文件 '%s'"
+
+#: builtin/index-pack.c:325
+msgid "pack signature mismatch"
+msgstr "包签名不匹配"
-#: builtin/fetch.c:1379
+#: builtin/index-pack.c:327
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "没有这样的远程或远程组：%s"
+msgid "pack version %<PRIu32> unsupported"
+msgstr "不支持包版本 %<PRIu32>"
-#: builtin/fetch.c:1387
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "获取组并指定引用规格没有意义"
+#: builtin/index-pack.c:345
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s"
-#: builtin/fmt-merge-msg.c:15
-msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
-msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
+#: builtin/index-pack.c:465
+#, c-format
+msgid "inflate returned %d"
+msgstr "解压缩返回 %d"
-#: builtin/fmt-merge-msg.c:665
-msgid "populate log with at most <n> entries from shortlog"
-msgstr "å\90\91æ\8f\90交说æ\98\8eä¸æ\9c\80å¤\9aå¤\8då\88¶æ\8c\87å®\9aæ\9d¡ç\9b®ï¼\88å\90\88并è\80\8cæ\9d¥ç\9a\84æ\8f\90交ï¼\89ç\9a\84ç®\80ç\9f说æ\98\8e"
+#: builtin/index-pack.c:514
+msgid "offset value overflow for delta base object"
+msgstr "å\81\8f移å\80¼è¦\86ç\9b\96äº\86 delta å\9fºå\87\86对象"
-#: builtin/fmt-merge-msg.c:668
-msgid "alias for --log (deprecated)"
-msgstr "参数 --log 的别名（已弃用）"
+#: builtin/index-pack.c:522
+msgid "delta base offset is out of bound"
+msgstr "delta 基准偏移越界"
-#: builtin/fmt-merge-msg.c:671
-msgid "text"
-msgstr "文本"
+#: builtin/index-pack.c:530
+#, c-format
+msgid "unknown object type %d"
+msgstr "未知对象类型 %d"
+
+#: builtin/index-pack.c:561
+msgid "cannot pread pack file"
+msgstr "无法读取包文件"
-#: builtin/fmt-merge-msg.c:672
-msgid "use <text> as start of message"
-msgstr "使用 <文本> 作为提交说明的开始"
+#: builtin/index-pack.c:563
+#, 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/fmt-merge-msg.c:673
-msgid "file to read from"
-msgstr "从文件中读取"
+#: builtin/index-pack.c:589
+msgid "serious inflate inconsistency"
+msgstr "解压缩严重的不一致"
-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [<options>] [<pattern>]"
-msgstr "git for-each-ref [<选项>] [<模式>]"
+#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
+#: builtin/index-pack.c:802 builtin/index-pack.c:811
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr "发现 %s 出现 SHA1 冲突！"
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [--points-at <object>]"
-msgstr "git for-each-ref [--points-at <对象>]"
+#: builtin/index-pack.c:737 builtin/pack-objects.c:153
+#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#, c-format
+msgid "unable to read %s"
+msgstr "不能读 %s"
-#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
+#: builtin/index-pack.c:800
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "不能读取现存对象信息 %s"
-#: builtin/for-each-ref.c:13
-msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
-msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
+#: builtin/index-pack.c:808
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "不能读取现存对象 %s"
-#: builtin/for-each-ref.c:28
-msgid "quote placeholders suitably for shells"
-msgstr "引用占位符适用于 shells"
+#: builtin/index-pack.c:822
+#, c-format
+msgid "invalid blob object %s"
+msgstr "无效的数据对象 %s"
-#: builtin/for-each-ref.c:30
-msgid "quote placeholders suitably for perl"
-msgstr "å¼\95ç\94¨å\8d ä½\8d符é\80\82ç\94¨äº\8e perl"
+#: builtin/index-pack.c:825 builtin/index-pack.c:844
+msgid "fsck error in packed object"
+msgstr "对æ\89\93å\8c\85对象 fsck æ£\80æ\9f¥å\87ºé\94\99"
-#: builtin/for-each-ref.c:32
-msgid "quote placeholders suitably for python"
-msgstr "引用占位符适用于 python"
+#: builtin/index-pack.c:846
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr "%s 的所有子对象并非都可达"
-#: builtin/for-each-ref.c:34
-msgid "quote placeholders suitably for Tcl"
-msgstr "å¼\95ç\94¨å\8d ä½\8d符é\80\82ç\94¨äº\8e Tcl"
+#: builtin/index-pack.c:918 builtin/index-pack.c:949
+msgid "failed to apply delta"
+msgstr "åº\94ç\94¨ delta 失败"
-#: builtin/for-each-ref.c:37
-msgid "show only <n> matched refs"
-msgstr "只显示 <n> 个匹配的引用"
+#: builtin/index-pack.c:1117
+msgid "Receiving objects"
+msgstr "接收对象中"
-#: builtin/for-each-ref.c:39 builtin/tag.c:414
-msgid "respect format colors"
-msgstr "遵照格式中的颜色输出"
+#: builtin/index-pack.c:1117
+msgid "Indexing objects"
+msgstr "索引对象中"
-#: builtin/for-each-ref.c:43
-msgid "print only refs which points at the given object"
-msgstr "å\8fªæ\89\93å\8d°æ\8c\87å\90\91ç»\99å®\9a对象ç\9a\84å¼\95ç\94¨"
+#: builtin/index-pack.c:1151
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "å\8c\85å\86²çª\81ï¼\88SHA1 ä¸\8då\8c¹é\85\8dï¼\89"
-#: builtin/for-each-ref.c:45
-msgid "print only refs that are merged"
-msgstr "只打印已经合并的引用"
+#: builtin/index-pack.c:1156
+msgid "cannot fstat packfile"
+msgstr "不能对包文件调用 fstat"
-#: builtin/for-each-ref.c:46
-msgid "print only refs that are not merged"
-msgstr "å\8fªæ\89\93å\8d°æ²¡æ\9c\89å\90\88并ç\9a\84å¼\95ç\94¨"
+#: builtin/index-pack.c:1159
+msgid "pack has junk at the end"
+msgstr "å\8c\85ç\9a\84ç»\93å°¾æ\9c\89å\9e\83å\9c¾æ\95°æ\8d®"
-#: builtin/for-each-ref.c:47
-msgid "print only refs which contain the commit"
-msgstr "只打印包含该提交的引用"
+#: builtin/index-pack.c:1171
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "parse_pack_objects() 中遇到不可理喻的问题"
-#: builtin/for-each-ref.c:48
-msgid "print only refs which don't contain the commit"
-msgstr "å\8fªæ\89\93å\8d°ä¸\8då\8c\85å\90«è¯¥æ\8f\90交ç\9a\84å¼\95ç\94¨"
+#: builtin/index-pack.c:1194
+msgid "Resolving deltas"
+msgstr "å¤\84ç\90\86 delta ä¸"
-#: builtin/fsck.c:543
-msgid "Checking object directories"
-msgstr "检查对象目录中"
+#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "不能创建线程：%s"
-#: builtin/fsck.c:635
-msgid "git fsck [<options>] [<object>...]"
-msgstr "git fsck [<选项>] [<对象>...]"
+#: builtin/index-pack.c:1245
+msgid "confusion beyond insanity"
+msgstr "不可理喻"
-#: builtin/fsck.c:641
-msgid "show unreachable objects"
-msgstr "显示不可达的对象"
+#: builtin/index-pack.c:1251
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "完成 %d 个本地对象"
+msgstr[1] "完成 %d 个本地对象"
-#: builtin/fsck.c:642
-msgid "show dangling objects"
-msgstr "显示摇摆的对象"
+#: builtin/index-pack.c:1263
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
-#: builtin/fsck.c:643
-msgid "report tags"
-msgstr "报告标签"
+#: builtin/index-pack.c:1267
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] "包有 %d 个未解决的 delta"
+msgstr[1] "包有 %d 个未解决的 delta"
-#: builtin/fsck.c:644
-msgid "report root nodes"
-msgstr "报告根节点"
+#: builtin/index-pack.c:1291
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "不能压缩附加对象（%d）"
-#: builtin/fsck.c:645
-msgid "make index objects head nodes"
-msgstr "将索引亦作为检查的头节点"
+#: builtin/index-pack.c:1368
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "本地对象 %s 已损坏"
-#: builtin/fsck.c:646
-msgid "make reflogs head nodes (default)"
-msgstr "将引用日志作为检查的头节点（默认）"
+#: builtin/index-pack.c:1382
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
-#: builtin/fsck.c:647
-msgid "also consider packs and alternate objects"
-msgstr "也考虑包和备用对象"
+#: builtin/index-pack.c:1407
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr "无法写入 %s 文件 '%s'"
-#: builtin/fsck.c:648
-msgid "check only connectivity"
-msgstr "仅检查连通性"
+#: builtin/index-pack.c:1415
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr "无法关闭已写入的 %s 文件 '%s'"
-#: builtin/fsck.c:649
-msgid "enable more strict checking"
-msgstr "å\90¯ç\94¨æ\9b´ä¸¥æ ¼ç\9a\84æ£\80æ\9f¥"
+#: builtin/index-pack.c:1439
+msgid "error while closing pack file"
+msgstr "å\85³é\97å\8c\85æ\96\87件æ\97¶å\87ºé\94\99"
-#: builtin/fsck.c:651
-msgid "write dangling objects in .git/lost-found"
-msgstr "将摇摆对象写入 .git/lost-found 中"
+#: builtin/index-pack.c:1453
+msgid "cannot store pack file"
+msgstr "无法存储包文件"
-#: builtin/fsck.c:652 builtin/prune.c:107
-msgid "show progress"
-msgstr "æ\98¾ç¤ºè¿\9b度"
+#: builtin/index-pack.c:1461
+msgid "cannot store index file"
+msgstr "æ\97 æ³\95å\98å\82¨ç´¢å¼\95æ\96\87件"
-#: builtin/fsck.c:653
-msgid "show verbose names for reachable objects"
-msgstr "显示可达对象的详细名称"
+#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "坏的 pack.indexversion=%<PRIu32>"
-#: builtin/fsck.c:714
-msgid "Checking objects"
-msgstr "检查对象中"
+#: builtin/index-pack.c:1573
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "无法打开现存包文件 '%s'"
-#: builtin/gc.c:27
-msgid "git gc [<options>]"
-msgstr "git gc [<选项>]"
+#: builtin/index-pack.c:1575
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "无法为 %s 打开包索引文件"
-#: builtin/gc.c:80
+#: builtin/index-pack.c:1623
#, c-format
-msgid "Failed to fstat %s: %s"
-msgstr "对 %s 调用 fstat 失败：%s"
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] "非 delta：%d 个对象"
+msgstr[1] "非 delta：%d 个对象"
-#: builtin/gc.c:312
+#: builtin/index-pack.c:1630
#, c-format
-msgid "Can't stat %s"
-msgstr "不能对 %s 调用 stat"
+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:1667
+msgid "Cannot come back to cwd"
+msgstr "无法返回当前工作目录"
-#: builtin/gc.c:321
+#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
+#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
#, c-format
-msgid ""
-"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
-"Automatic cleanup will not be performed until the file is removed.\n"
-"\n"
-"%s"
-msgstr ""
-"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
-"在该文件被删除之前，自动清理将不会执行。\n"
-"\n"
-"%s"
+msgid "bad %s"
+msgstr "错误选项 %s"
-#: builtin/gc.c:360
-msgid "prune unreferenced objects"
-msgstr "清除未引用的对象"
+#: builtin/index-pack.c:1755
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin 不能和 --stdin 同时使用"
-#: builtin/gc.c:362
-msgid "be more thorough (increased runtime)"
-msgstr "更彻底（增加运行时间）"
+#: builtin/index-pack.c:1757
+msgid "--stdin requires a git repository"
+msgstr "--stdin 需要一个 git 仓库"
-#: builtin/gc.c:363
-msgid "enable auto-gc mode"
-msgstr "启用自动垃圾回收模式"
+#: builtin/index-pack.c:1763
+msgid "--verify with no packfile name given"
+msgstr "--verify 没有提供包文件名参数"
-#: builtin/gc.c:364
-msgid "force running gc even if there may be another gc running"
-msgstr "强å\88¶æ\89§è¡\8c gc å\8d³ä½¿å\8f¦å¤\96ä¸\80个 gc æ£å\9c¨æ\89§è¡\8c"
+#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+msgid "fsck error in pack objects"
+msgstr "å\9c¨æ\89\93å\8c\85å¯¹è±¡ä¸ fsck æ£\80æ\9f¥å\87ºé\94\99"
-#: builtin/gc.c:381
+#: builtin/init-db.c:61
#, c-format
-msgid "Failed to parse gc.logexpiry value %s"
-msgstr "无法解析 gc.logexpiry 的值 %s"
+msgid "cannot stat template '%s'"
+msgstr "不能对模版 '%s' 调用 stat"
-#: builtin/gc.c:409
+#: builtin/init-db.c:66
#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
-msgstr "自动在后台执行仓库打包以求最佳性能。\n"
+msgid "cannot opendir '%s'"
+msgstr "不能打开目录 '%s'"
-#: builtin/gc.c:411
+#: builtin/init-db.c:78
#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
-msgstr "自动打包仓库以求最佳性能。\n"
+msgid "cannot readlink '%s'"
+msgstr "不能读取链接 '%s'"
-#: builtin/gc.c:412
+#: builtin/init-db.c:80
#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
-msgstr "手工维护参见 \"git help gc\"。\n"
+msgid "cannot symlink '%s' '%s'"
+msgstr "不能自 '%s' 到 '%s' 创建符号链接"
-#: builtin/gc.c:437
+#: builtin/init-db.c:86
#, c-format
-msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
-msgstr ""
-"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
+msgid "cannot copy '%s' to '%s'"
+msgstr "不能拷贝 '%s' 至 '%s'"
-#: builtin/gc.c:481
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
+#: builtin/init-db.c:90
+#, c-format
+msgid "ignoring template %s"
+msgstr "忽略模版 %s"
-#: builtin/grep.c:27
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
-msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
+#: builtin/init-db.c:121
+#, c-format
+msgid "templates not found in %s"
+msgstr "没有在 %s 中找到模版"
-#: builtin/grep.c:226
+#: builtin/init-db.c:136
#, c-format
-msgid "grep: failed to create thread: %s"
-msgstr "grep：无法创建线程：%s"
+msgid "not copying templates from '%s': %s"
+msgstr "没有从 '%s' 复制模版：%s"
-#: builtin/grep.c:284
+#: builtin/init-db.c:334
#, c-format
-msgid "invalid number of threads specified (%d) for %s"
-msgstr "为 %2$s 设å®\9aç\9a\84线ç¨\8bæ\95° (%1$d) æ\97 æ\95\88"
+msgid "unable to handle file type %d"
+msgstr "ä¸\8dè\83½å¤\84ç\90\86 %d ç±»å\9e\8bç\9a\84æ\96\87件"
-#. TRANSLATORS: %s is the configuration
-#. variable for tweaking threads, currently
-#. grep.threads
-#.
-#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
+#: builtin/init-db.c:337
#, c-format
-msgid "no threads support, ignoring %s"
-msgstr "没有线程支持，忽略 %s"
+msgid "unable to move %s to %s"
+msgstr "不能移动 %s 至 %s"
+
+#: builtin/init-db.c:354 builtin/init-db.c:357
+#, c-format
+msgid "%s already exists"
+msgstr "%s 已经存在"
-#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
+#: builtin/init-db.c:413
#, c-format
-msgid "unable to read tree (%s)"
-msgstr "无法读取树（%s）"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
-#: builtin/grep.c:628
+#: builtin/init-db.c:414
#, c-format
-msgid "unable to grep from object of type %s"
-msgstr "无法抓取来自于 %s 类型的对象"
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
-#: builtin/grep.c:694
+#: builtin/init-db.c:418
#, c-format
-msgid "switch `%c' expects a numerical value"
-msgstr "å¼\80å\85³ `%c' æ\9c\9fæ\9c\9bä¸\80个æ\95°å\97å\80¼"
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "å·²å\88\9då§\8bå\8c\96空ç\9a\84å\85±äº« Git ä»\93åº\93äº\8e %s%s\n"
-#: builtin/grep.c:781
-msgid "search in index instead of in the work tree"
-msgstr "在索引区搜索而不是在工作区"
+#: builtin/init-db.c:419
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "已初始化空的 Git 仓库于 %s%s\n"
-#: builtin/grep.c:783
-msgid "find in contents not managed by git"
-msgstr "在未被 git 管理的内容中查找"
+#: builtin/init-db.c:468
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
+"[<目录>]"
-# 译者：中文字符串拼接，可删除前导空格
-#: builtin/grep.c:785
-msgid "search in both tracked and untracked files"
-msgstr "在跟踪和未跟踪的文件中搜索"
+#: builtin/init-db.c:491
+msgid "permissions"
+msgstr "权限"
-#: builtin/grep.c:787
-msgid "ignore files specified via '.gitignore'"
-msgstr "忽略 '.gitignore' 包含的文件"
+#: builtin/init-db.c:492
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr "指定 git 仓库是多个用户之间共享的"
-#: builtin/grep.c:789
-msgid "recursively search in each submodule"
-msgstr "在每一个子模组中递归搜索"
+#: builtin/init-db.c:526 builtin/init-db.c:531
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "不能创建目录 %s"
-#: builtin/grep.c:792
-msgid "show non-matching lines"
-msgstr "显示未匹配的行"
+#: builtin/init-db.c:535
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "不能切换目录到 %s"
-#: builtin/grep.c:794
-msgid "case insensitive matching"
-msgstr "不区分大小写匹配"
+#: builtin/init-db.c:556
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
-#: builtin/grep.c:796
-msgid "match patterns only at word boundaries"
-msgstr "只在单词边界匹配模式"
+#: builtin/init-db.c:584
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "不能访问工作区 '%s'"
-#: builtin/grep.c:798
-msgid "process binary files as text"
-msgstr "把二进制文件当做文本处理"
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
+">])...] [<文件>...]"
-#: builtin/grep.c:800
-msgid "don't match patterns in binary files"
-msgstr "不在二进制文件中匹配模式"
+#: builtin/interpret-trailers.c:94
+msgid "edit files in place"
+msgstr "在原位编辑文件"
-#: builtin/grep.c:803
-msgid "process binary files with textconv filters"
-msgstr "用 textconv 过滤器处理二进制文件"
+#: builtin/interpret-trailers.c:95
+msgid "trim empty trailers"
+msgstr "删除空的尾部署名"
-#: builtin/grep.c:805
-msgid "descend at most <depth> levels"
-msgstr "最多以指定的深度向下寻找"
+#: builtin/interpret-trailers.c:98
+msgid "where to place the new trailer"
+msgstr "在哪里放置新的尾部署名"
-#: builtin/grep.c:809
-msgid "use extended POSIX regular expressions"
-msgstr "使用扩展的 POSIX 正则表达式"
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer already exists"
+msgstr "当尾部署名已经存在时所采取的动作"
-#: builtin/grep.c:812
-msgid "use basic POSIX regular expressions (default)"
-msgstr "使用基本的 POSIX 正则表达式（默认）"
+#: builtin/interpret-trailers.c:102
+msgid "action if trailer is missing"
+msgstr "当尾部署名缺失时所采取的动作"
-#: builtin/grep.c:815
-msgid "interpret patterns as fixed strings"
-msgstr "把模式解析为固定的字符串"
+#: builtin/interpret-trailers.c:104
+msgid "output only the trailers"
+msgstr "只输出尾部署名"
-#: builtin/grep.c:818
-msgid "use Perl-compatible regular expressions"
-msgstr "使ç\94¨ Perl å\85¼å®¹ç\9a\84æ£å\88\99表达å¼\8f"
+#: builtin/interpret-trailers.c:105
+msgid "do not apply config rules"
+msgstr "ä¸\8dè¦\81åº\94ç\94¨é\85\8dç½®è§\84å\88\99"
-#: builtin/grep.c:821
-msgid "show line numbers"
-msgstr "显示行号"
+#: builtin/interpret-trailers.c:106
+msgid "join whitespace-continued values"
+msgstr "连接空白折行的值"
-#: builtin/grep.c:822
-msgid "don't show filenames"
-msgstr "不显示文件名"
+#: builtin/interpret-trailers.c:107
+msgid "set parsing options"
+msgstr "设置解析选项"
-#: builtin/grep.c:823
-msgid "show filenames"
-msgstr "显示文件名"
+#: builtin/interpret-trailers.c:109
+msgid "do not treat --- specially"
+msgstr "不要对 --- 特殊处理"
-#: builtin/grep.c:825
-msgid "show filenames relative to top directory"
-msgstr "显示相对于顶级目录的文件名"
+#: builtin/interpret-trailers.c:110
+msgid "trailer"
+msgstr "尾部署名"
-#: builtin/grep.c:827
-msgid "show only filenames instead of matching lines"
-msgstr "只显示文件名而不显示匹配的行"
+#: builtin/interpret-trailers.c:111
+msgid "trailer(s) to add"
+msgstr "要添加的尾部署名"
-#: builtin/grep.c:829
-msgid "synonym for --files-with-matches"
-msgstr "和 --files-with-matches 同义"
+#: builtin/interpret-trailers.c:120
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer 和 --only-input 同时使用没有意义"
-#: builtin/grep.c:832
-msgid "show only the names of files without match"
-msgstr "只显示未匹配的文件名"
+#: builtin/interpret-trailers.c:130
+msgid "no input file given for in-place editing"
+msgstr "没有给出要原位编辑的文件"
-#: builtin/grep.c:834
-msgid "print NUL after filenames"
-msgstr "在文件名后输出 NUL 字符"
+#: builtin/log.c:55
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
-#: builtin/grep.c:836
-msgid "show the number of matches instead of matching lines"
-msgstr "显示总匹配行数，而不显示匹配的行"
+#: builtin/log.c:56
+msgid "git show [<options>] <object>..."
+msgstr "git show [<选项>] <对象>..."
-#: builtin/grep.c:837
-msgid "highlight matches"
-msgstr "高亮显示匹配项"
+#: builtin/log.c:104
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "无效的 --decorate 选项：%s"
-#: builtin/grep.c:839
-msgid "print empty line between matches from different files"
-msgstr "在不同文件的匹配项之间打印空行"
+#: builtin/log.c:168
+msgid "show source"
+msgstr "显示源"
-#: builtin/grep.c:841
-msgid "show filename only once above matches from same file"
-msgstr "只在同一文件的匹配项的上面显示一次文件名"
+#: builtin/log.c:169
+msgid "Use mail map file"
+msgstr "使用邮件映射文件"
-#: builtin/grep.c:844
-msgid "show <n> context lines before and after matches"
-msgstr "显示匹配项前后的 <n> 行上下文"
+#: builtin/log.c:171
+msgid "only decorate refs that match <pattern>"
+msgstr "只修饰与 <模式> 匹配的引用"
-#: builtin/grep.c:847
-msgid "show <n> context lines before matches"
-msgstr "显示匹配项前 <n> 行上下文"
+#: builtin/log.c:173
+msgid "do not decorate refs that match <pattern>"
+msgstr "不修饰和 <模式> 匹配的引用"
-#: builtin/grep.c:849
-msgid "show <n> context lines after matches"
-msgstr "显示匹配项后 <n> 行上下文"
+#: builtin/log.c:174
+msgid "decorate options"
+msgstr "修饰选项"
-#: builtin/grep.c:851
-msgid "use <n> worker threads"
-msgstr "使ç\94¨ <n> 个工ä½\9c线ç¨\8b"
+#: builtin/log.c:177
+msgid "Process line range n,m in file, counting from 1"
+msgstr "å¤\84ç\90\86æ\96\87件ä¸ç¬¬ n å\88° m ä¹\8bé\97´ç\9a\84è¡\8cï¼\8cä»\8e 1 å¼\80å§\8b"
-#: builtin/grep.c:852
-msgid "shortcut for -C NUM"
-msgstr "快捷键 -C 数字"
+#: builtin/log.c:275
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "最终输出：%d %s\n"
-#: builtin/grep.c:855
-msgid "show a line with the function name before matches"
-msgstr "在匹配的前面显示一行函数名"
+#: builtin/log.c:529
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: 损坏的文件"
-#: builtin/grep.c:857
-msgid "show the surrounding function"
-msgstr "显示所在函数的前后内容"
+#: builtin/log.c:544 builtin/log.c:638
+#, c-format
+msgid "could not read object %s"
+msgstr "不能读取对象 %s"
-#: builtin/grep.c:860
-msgid "read patterns from file"
-msgstr "从文件读取模式"
+#: builtin/log.c:663
+#, c-format
+msgid "unknown type: %d"
+msgstr "未知类型：%d"
-#: builtin/grep.c:862
-msgid "match <pattern>"
-msgstr "匹配 <模式>"
+#: builtin/log.c:784
+msgid "format.headers without value"
+msgstr "format.headers 没有值"
-#: builtin/grep.c:864
-msgid "combine patterns specified with -e"
-msgstr "组合用 -e 参数设定的模式"
+#: builtin/log.c:885
+msgid "name of output directory is too long"
+msgstr "输出目录名太长"
-#: builtin/grep.c:876
-msgid "indicate hit with exit status without output"
-msgstr "不输出，而用退出码标识命中状态"
+#: builtin/log.c:901
+#, c-format
+msgid "cannot open patch file %s"
+msgstr "无法打开补丁文件 %s"
-#: builtin/grep.c:878
-msgid "show only matches from files that match all patterns"
-msgstr "只显示匹配所有模式的文件中的匹配"
+#: builtin/log.c:918
+msgid "need exactly one range"
+msgstr "只需要一个范围"
-#: builtin/grep.c:880
-msgid "show parse tree for grep expression"
-msgstr "显示 grep 表达式的解析树"
+#: builtin/log.c:928
+msgid "not a range"
+msgstr "不是一个范围"
-#: builtin/grep.c:884
-msgid "pager"
-msgstr "分页"
+#: builtin/log.c:1051
+msgid "cover letter needs email format"
+msgstr "附函需要邮件地址格式"
-#: builtin/grep.c:884
-msgid "show matching files in the pager"
-msgstr "分页显示匹配的文件"
+#: builtin/log.c:1057
+msgid "failed to create cover-letter file"
+msgstr "无法创建附函文件"
-#: builtin/grep.c:887
-msgid "allow calling of grep(1) (ignored by this build)"
-msgstr "允许调用 grep(1)（本次构建忽略）"
+#: builtin/log.c:1136
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "不正常的 in-reply-to：%s"
-#: builtin/grep.c:950
-msgid "no pattern given."
-msgstr "未提供模式匹配。"
+#: builtin/log.c:1163
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/grep.c:982
-msgid "--no-index or --untracked cannot be used with revs"
-msgstr "--no-index 或 --untracked 不能和版本同时使用"
+#: builtin/log.c:1221
+msgid "two output directories?"
+msgstr "两个输出目录？"
-#: builtin/grep.c:989
+#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
#, c-format
-msgid "unable to resolve revision: %s"
-msgstr "不能解析版本：%s"
+msgid "unknown commit %s"
+msgstr "未知提交 %s"
-#: builtin/grep.c:1023 builtin/index-pack.c:1491
+#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
#, c-format
-msgid "invalid number of threads specified (%d)"
-msgstr "æ\8c\87å®\9aç\9a\84线ç¨\8bæ\95°æ\97 æ\95\88ï¼\88%dï¼\89"
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "æ\97 æ³\95å°\86 '%s' 解æ\9e\90为ä¸\80个æ\9c\89æ\95\88å¼\95ç\94¨"
-#: builtin/grep.c:1028
-msgid "no threads support, ignoring --threads"
-msgstr "没有线程支持，忽略 --threads"
+#: builtin/log.c:1347
+msgid "could not find exact merge base"
+msgstr "不能找到准确的合并基线"
-#: builtin/grep.c:1052
-msgid "--open-files-in-pager only works on the worktree"
-msgstr "--open-files-in-pager 仅用于工作区"
+#: builtin/log.c:1351
+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"
+"Or you could specify base commit by --base=<base-commit-id> manually"
+msgstr ""
+"无法得到上游地址，如果你想自动记录基线提交，请使用命令\n"
+"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
+"参数 --base=<基线提交> 手动指定一个基线提交"
-#: builtin/grep.c:1075
-msgid "option not supported with --recurse-submodules."
-msgstr "选项不支持和 --recurse-submodules 共用。"
+#: builtin/log.c:1371
+msgid "failed to find exact merge base"
+msgstr "无法找到准确的合并基线"
-#: builtin/grep.c:1081
-msgid "--cached or --untracked cannot be used with --no-index."
-msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
+#: builtin/log.c:1382
+msgid "base commit should be the ancestor of revision list"
+msgstr "基线提交应该是版本列表的祖先"
-#: builtin/grep.c:1087
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
-msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
+#: builtin/log.c:1386
+msgid "base commit shouldn't be in revision list"
+msgstr "基线提交不应该出现在版本列表中"
-#: builtin/grep.c:1095
-msgid "both --cached and trees are given."
-msgstr "同时给出了 --cached 和树对象。"
+#: builtin/log.c:1439
+msgid "cannot get patch id"
+msgstr "无法得到补丁 id"
-#: builtin/hash-object.c:82
-msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
-msgstr ""
-"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
-"[--] <文件>..."
+#: builtin/log.c:1491
+msgid "failed to infer range-diff ranges"
+msgstr "无法推断 range-diff 范围"
+
+#: builtin/log.c:1536
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "使用 [PATCH n/m]，即使只有一个补丁"
+
+#: builtin/log.c:1539
+msgid "use [PATCH] even with multiple patches"
+msgstr "使用 [PATCH]，即使有多个补丁"
+
+#: builtin/log.c:1543
+msgid "print patches to standard out"
+msgstr "打印补丁到标准输出"
+
+#: builtin/log.c:1545
+msgid "generate a cover letter"
+msgstr "生成一封附函"
+
+#: builtin/log.c:1547
+msgid "use simple number sequence for output file names"
+msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/hash-object.c:83
-msgid "git hash-object --stdin-paths"
-msgstr "git hash-object --stdin-paths"
+#: builtin/log.c:1548
+msgid "sfx"
+msgstr "后缀"
-#: builtin/hash-object.c:95
-msgid "type"
-msgstr "类型"
+#: builtin/log.c:1549
+msgid "use <sfx> instead of '.patch'"
+msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/hash-object.c:95
-msgid "object type"
-msgstr "对象类型"
+#: builtin/log.c:1551
+msgid "start numbering patches at <n> instead of 1"
+msgstr "补丁以 <n> 开始编号，而不是1"
-#: builtin/hash-object.c:96
-msgid "write the object into the object database"
-msgstr "将对象写入对象数据库"
+#: builtin/log.c:1553
+msgid "mark the series as Nth re-roll"
+msgstr "标记补丁系列是第几次重制"
-#: builtin/hash-object.c:98
-msgid "read the object from stdin"
-msgstr "ä»\8eæ \87å\87\86è¾\93å\85¥è¯»å\8f\96对象"
+#: builtin/log.c:1555
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "使ç\94¨ [RFC PATCH] 代æ\9b¿ [PATCH]"
-#: builtin/hash-object.c:100
-msgid "store file as is without filters"
-msgstr "原样存储文件不使用过滤器"
+#: builtin/log.c:1558
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/hash-object.c:101
-msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
-msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
+#: builtin/log.c:1561
+msgid "store resulting files in <dir>"
+msgstr "把结果文件存储在 <目录>"
-#: builtin/hash-object.c:102
-msgid "process file as it were from this path"
-msgstr "处理文件并假设其来自于此路径"
+#: builtin/log.c:1564
+msgid "don't strip/add [PATCH]"
+msgstr "不删除/添加 [PATCH]"
-#: builtin/help.c:43
-msgid "print all available commands"
-msgstr "打印所有可用的命令"
+#: builtin/log.c:1567
+msgid "don't output binary diffs"
+msgstr "不输出二进制差异"
-#: builtin/help.c:44
-msgid "exclude guides"
-msgstr "æ\8e\92é\99¤å\90\91导"
+#: builtin/log.c:1569
+msgid "output all-zero hash in From header"
+msgstr "å\9c¨ From 头信æ\81¯ä¸è¾\93å\87ºå\85¨ä¸ºé\9b¶ç\9a\84å\93\88å¸\8cå\80¼"
-#: builtin/help.c:45
-msgid "print list of useful guides"
-msgstr "显示有用的指南列表"
+#: builtin/log.c:1571
+msgid "don't include a patch matching a commit upstream"
+msgstr "不包含已在上游提交中的补丁"
-#: builtin/help.c:46
-msgid "show man page"
-msgstr "显示 man 手册"
+#: builtin/log.c:1573
+msgid "show patch format instead of default (patch + stat)"
+msgstr "显示纯补丁格式而非默认的（补丁+状态）"
-#: builtin/help.c:47
-msgid "show manual in web browser"
-msgstr "在 web 浏览器中显示手册"
+#: builtin/log.c:1575
+msgid "Messaging"
+msgstr "邮件发送"
-#: builtin/help.c:49
-msgid "show info page"
-msgstr "显示 info 手册"
+#: builtin/log.c:1576
+msgid "header"
+msgstr "header"
-#: builtin/help.c:55
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
+#: builtin/log.c:1577
+msgid "add email header"
+msgstr "添加邮件头"
-#: builtin/help.c:67
-#, c-format
-msgid "unrecognized help format '%s'"
-msgstr "未能识别的帮助格式 '%s'"
+#: builtin/log.c:1578 builtin/log.c:1580
+msgid "email"
+msgstr "邮件地址"
-#: builtin/help.c:94
-msgid "Failed to start emacsclient."
-msgstr "æ\97 æ³\95å\90¯å\8a¨ emacsclientã\80\82"
+#: builtin/log.c:1578
+msgid "add To: header"
+msgstr "æ·»å\8a æ\94¶ä»¶äºº"
-#: builtin/help.c:107
-msgid "Failed to parse emacsclient version."
-msgstr "æ\97 æ³\95解æ\9e\90 emacsclient ç\89\88æ\9c¬ã\80\82"
+#: builtin/log.c:1580
+msgid "add Cc: header"
+msgstr "æ·»å\8a æ\8a\84é\80\81"
-#: builtin/help.c:115
-#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
-msgstr "emacsclient 版本 '%d' 太老（< 22）。"
+#: builtin/log.c:1582
+msgid "ident"
+msgstr "标识"
-#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
-#, c-format
-msgid "failed to exec '%s'"
-msgstr "无法执行 '%s'"
+#: builtin/log.c:1583
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
-#: builtin/help.c:211
-#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
-msgstr ""
-"'%s'：不支持的 man 手册查看器的路径。\n"
-"请使用 'man.<工具>.cmd'。"
+#: builtin/log.c:1585
+msgid "message-id"
+msgstr "邮件标识"
-#: builtin/help.c:223
-#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
-msgstr ""
-"'%s': 支持的 man 手册查看器命令。\n"
-"请使用 'man.<工具>.path'。"
+#: builtin/log.c:1586
+msgid "make first mail a reply to <message-id>"
+msgstr "使第一封邮件作为对 <邮件标识> 的回复"
-#: builtin/help.c:340
-#, c-format
-msgid "'%s': unknown man viewer."
-msgstr "'%s'：未知的 man 查看器。"
+#: builtin/log.c:1587 builtin/log.c:1590
+msgid "boundary"
+msgstr "边界"
-#: builtin/help.c:357
-msgid "no man viewer handled the request"
-msgstr "没有 man 查看器处理此请求"
+#: builtin/log.c:1588
+msgid "attach the patch"
+msgstr "附件方式添加补丁"
-#: builtin/help.c:365
-msgid "no info viewer handled the request"
-msgstr "没有 info 查看器处理此请求"
+#: builtin/log.c:1591
+msgid "inline the patch"
+msgstr "内联显示补丁"
-#: builtin/help.c:407
-msgid "Defining attributes per path"
-msgstr "å®\9aä¹\89è·¯å¾\84ç\9a\84å±\9eæ\80§"
+#: builtin/log.c:1595
+msgid "enable message threading, styles: shallow, deep"
+msgstr "å\90¯ç\94¨é\82®ä»¶çº¿ç´¢ï¼\8cé£\8eæ ¼ï¼\9aæµ\85ï¼\8cæ·±"
-#: builtin/help.c:408
-msgid "Everyday Git With 20 Commands Or So"
-msgstr "每一天 Git 常用的约 20 条命令"
+#: builtin/log.c:1597
+msgid "signature"
+msgstr "签名"
-#: builtin/help.c:409
-msgid "A Git glossary"
-msgstr "Git 词汇表"
+#: builtin/log.c:1598
+msgid "add a signature"
+msgstr "添加一个签名"
-#: builtin/help.c:410
-msgid "Specifies intentionally untracked files to ignore"
-msgstr "忽ç\95¥æ\8c\87å®\9aç\9a\84æ\9cªè·\9f踪æ\96\87件"
+#: builtin/log.c:1599
+msgid "base-commit"
+msgstr "å\9fºçº¿æ\8f\90交"
-#: builtin/help.c:411
-msgid "Defining submodule properties"
-msgstr "定义子模组属性"
+#: builtin/log.c:1600
+msgid "add prerequisite tree info to the patch series"
+msgstr "为补丁列表添加前置树信息"
-#: builtin/help.c:412
-msgid "Specifying revisions and ranges for Git"
-msgstr "指定 Git 的版本和版本范围"
+#: builtin/log.c:1602
+msgid "add a signature from a file"
+msgstr "从文件添加一个签名"
-#: builtin/help.c:413
-msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
-msgstr "ä¸\80个 Git æ\95\99ç¨\8bï¼\88é\92\88对 1.5.1 æ\88\96æ\9b´æ\96°ç\89\88æ\9c¬ï¼\89"
+#: builtin/log.c:1603
+msgid "don't print the patch filenames"
+msgstr "ä¸\8dè¦\81æ\89\93å\8d°è¡¥ä¸\81æ\96\87件å\90\8d"
-#: builtin/help.c:414
-msgid "An overview of recommended workflows with Git"
-msgstr "Git 推荐的工作流概览"
+#: builtin/log.c:1605
+msgid "show progress while generating patches"
+msgstr "在生成补丁时显示进度"
-#: builtin/help.c:426
-msgid "The common Git guides are:\n"
-msgstr "最常用的 Git 向导有：\n"
+#: builtin/log.c:1606
+msgid "rev"
+msgstr "版本"
-#: builtin/help.c:444
-#, c-format
-msgid "'%s' is aliased to '%s'"
-msgstr "'%s' 是 '%s' 的别名"
+#: builtin/log.c:1607
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr "在附函或单个补丁中显示和 <rev> 的差异"
-#: builtin/help.c:466 builtin/help.c:483
-#, c-format
-msgid "usage: %s%s"
-msgstr "用法：%s%s"
+#: builtin/log.c:1610
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
-#: builtin/index-pack.c:156
-#, c-format
-msgid "unable to open %s"
-msgstr "不能打开 %s"
+#: builtin/log.c:1612
+msgid "percentage by which creation is weighted"
+msgstr "创建权重的百分比"
-#: builtin/index-pack.c:206
+#: builtin/log.c:1687
#, c-format
-msgid "object type mismatch at %s"
-msgstr "%s 的对象类型不匹配"
+msgid "invalid ident line: %s"
+msgstr "包含无效的身份标识：%s"
-#: builtin/index-pack.c:226
-#, c-format
-msgid "did not receive expected object %s"
-msgstr "未能获取预期的对象 %s"
+#: builtin/log.c:1702
+msgid "-n and -k are mutually exclusive"
+msgstr "-n 和 -k 互斥"
-#: builtin/index-pack.c:229
-#, c-format
-msgid "object %s: expected type %s, found %s"
-msgstr "对象 %s：应为类型 %s，却是 %s"
+#: builtin/log.c:1704
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr "--subject-prefix/--rfc 和 -k 互斥"
-#: builtin/index-pack.c:271
-#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] "无法填充 %d 字节"
-msgstr[1] "无法填充 %d 字节"
+#: builtin/log.c:1712
+msgid "--name-only does not make sense"
+msgstr "--name-only 无意义"
-#: builtin/index-pack.c:281
-msgid "early EOF"
-msgstr "è¿\87æ\97©ç\9a\84æ\96\87件ç»\93æ\9d\9f符ï¼\88EOFï¼\89"
+#: builtin/log.c:1714
+msgid "--name-status does not make sense"
+msgstr "--name-status æ\97 æ\84\8fä¹\89"
-#: builtin/index-pack.c:282
-msgid "read error on input"
-msgstr "输入上的读错误"
+#: builtin/log.c:1716
+msgid "--check does not make sense"
+msgstr "--check 无意义"
-#: builtin/index-pack.c:294
-msgid "used more bytes than were available"
-msgstr "用掉了超过可用的字节"
+#: builtin/log.c:1748
+msgid "standard output, or directory, which one?"
+msgstr "标准输出或目录，哪一个？"
-#: builtin/index-pack.c:301
-msgid "pack too large for current definition of off_t"
-msgstr "包太大超过了当前 off_t 的定义"
+#: builtin/log.c:1837
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr "--interdiff 需要 --cover-letter 或单一补丁"
-#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
-msgid "pack exceeds maximum allowed size"
-msgstr "包超过了最大允许值"
+#: builtin/log.c:1841
+msgid "Interdiff:"
+msgstr "版本间差异："
-#: builtin/index-pack.c:319
+#: builtin/log.c:1842
#, c-format
-msgid "unable to create '%s'"
-msgstr "不能创建 '%s'"
+msgid "Interdiff against v%d:"
+msgstr "对 v%d 的版本差异："
-#: builtin/index-pack.c:325
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "无法打开包文件 '%s'"
+#: builtin/log.c:1848
+msgid "--creation-factor requires --range-diff"
+msgstr "--creation-factor 需要 --range-diff"
-#: builtin/index-pack.c:339
-msgid "pack signature mismatch"
-msgstr "包签名不匹配"
+#: builtin/log.c:1852
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr "--range-diff 需要 --cover-letter 或单一补丁"
-#: builtin/index-pack.c:341
-#, c-format
-msgid "pack version %<PRIu32> unsupported"
-msgstr "不支持包版本 %<PRIu32>"
+#: builtin/log.c:1860
+msgid "Range-diff:"
+msgstr "范围差异："
-#: builtin/index-pack.c:359
+#: builtin/log.c:1861
#, c-format
-msgid "pack has bad object at offset %<PRIuMAX>: %s"
-msgstr "å\8c\85ä¸æ\9c\89é\94\99误ç\9a\84对象ä½\8däº\8eå\81\8f移é\87\8f %<PRIuMAX>ï¼\9a%s"
+msgid "Range-diff against v%d:"
+msgstr "对 v%d ç\9a\84è\8c\83å\9b´å·®å¼\82ï¼\9a"
-#: builtin/index-pack.c:480
+#: builtin/log.c:1872
#, c-format
-msgid "inflate returned %d"
-msgstr "解压缩返回 %d"
-
-#: builtin/index-pack.c:529
-msgid "offset value overflow for delta base object"
-msgstr "偏移值覆盖了 delta 基准对象"
+msgid "unable to read signature file '%s'"
+msgstr "无法读取签名文件 '%s'"
-#: builtin/index-pack.c:537
-msgid "delta base offset is out of bound"
-msgstr "delta 基准偏移越界"
+#: builtin/log.c:1908
+msgid "Generating patches"
+msgstr "生成补丁"
-#: builtin/index-pack.c:545
-#, c-format
-msgid "unknown object type %d"
-msgstr "未知对象类型 %d"
+#: builtin/log.c:1952
+msgid "failed to create output files"
+msgstr "无法创建输出文件"
-#: builtin/index-pack.c:576
-msgid "cannot pread pack file"
-msgstr "无法读取包文件"
+#: builtin/log.c:2011
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/index-pack.c:578
+#: builtin/log.c:2065
#, 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> 字节"
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
-#: builtin/index-pack.c:604
-msgid "serious inflate inconsistency"
-msgstr "解压缩严重的不一致"
+#: builtin/ls-files.c:470
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<选项>] [<文件>...]"
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:817 builtin/index-pack.c:826
-#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
-msgstr "发现 %s 出现 SHA1 冲突！"
+#: builtin/ls-files.c:526
+msgid "identify the file status with tags"
+msgstr "用标签标识文件的状态"
-#: builtin/index-pack.c:752 builtin/pack-objects.c:168
-#: builtin/pack-objects.c:262
-#, c-format
-msgid "unable to read %s"
-msgstr "不能读 %s"
+#: builtin/ls-files.c:528
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "使用小写字母表示 '假设未改变的' 文件"
-#: builtin/index-pack.c:815
-#, c-format
-msgid "cannot read existing object info %s"
-msgstr "不能读取现存对象信息 %s"
+#: builtin/ls-files.c:530
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "使用小写字母表示 'fsmonitor clean' 文件"
-#: builtin/index-pack.c:823
-#, c-format
-msgid "cannot read existing object %s"
-msgstr "不能读取现存对象 %s"
+#: builtin/ls-files.c:532
+msgid "show cached files in the output (default)"
+msgstr "显示缓存的文件（默认）"
-#: builtin/index-pack.c:837
-#, c-format
-msgid "invalid blob object %s"
-msgstr "无效的数据对象 %s"
+#: builtin/ls-files.c:534
+msgid "show deleted files in the output"
+msgstr "显示已删除的文件"
-#: builtin/index-pack.c:852
-#, c-format
-msgid "invalid %s"
-msgstr "无效的 %s"
+#: builtin/ls-files.c:536
+msgid "show modified files in the output"
+msgstr "显示已修改的文件"
-#: builtin/index-pack.c:855
-msgid "Error in object"
-msgstr "对象中出错"
+#: builtin/ls-files.c:538
+msgid "show other files in the output"
+msgstr "显示其它文件"
-#: builtin/index-pack.c:857
-#, c-format
-msgid "Not all child objects of %s are reachable"
-msgstr "%s 的所有子对象并非都可达"
+#: builtin/ls-files.c:540
+msgid "show ignored files in the output"
+msgstr "显示忽略的文件"
-#: builtin/index-pack.c:929 builtin/index-pack.c:960
-msgid "failed to apply delta"
-msgstr "æ\97 æ³\95åº\94ç\94¨ delta"
+#: builtin/ls-files.c:543
+msgid "show staged contents' object name in the output"
+msgstr "æ\98¾ç¤ºæ\9a\82å\98å\8cºå\86\85容ç\9a\84对象å\90\8d称"
-#: builtin/index-pack.c:1131
-msgid "Receiving objects"
-msgstr "æ\8e¥æ\94¶å¯¹è±¡ä¸"
+#: builtin/ls-files.c:545
+msgid "show files on the filesystem that need to be removed"
+msgstr "æ\98¾ç¤ºæ\96\87件系ç»\9fé\9c\80è¦\81å\88 é\99¤ç\9a\84æ\96\87件"
-#: builtin/index-pack.c:1131
-msgid "Indexing objects"
-msgstr "索引对象中"
+#: builtin/ls-files.c:547
+msgid "show 'other' directories' names only"
+msgstr "只显示“其他”目录的名称"
-#: builtin/index-pack.c:1165
-msgid "pack is corrupted (SHA1 mismatch)"
-msgstr "包冲突（SHA1 不匹配）"
+#: builtin/ls-files.c:549
+msgid "show line endings of files"
+msgstr "显示文件换行符格式"
-#: builtin/index-pack.c:1170
-msgid "cannot fstat packfile"
-msgstr "不能对包文件调用 fstat"
+#: builtin/ls-files.c:551
+msgid "don't show empty directories"
+msgstr "不显示空目录"
-#: builtin/index-pack.c:1173
-msgid "pack has junk at the end"
-msgstr "包的结尾有垃圾数据"
+#: builtin/ls-files.c:554
+msgid "show unmerged files in the output"
+msgstr "显示未合并的文件"
-#: builtin/index-pack.c:1185
-msgid "confusion beyond insanity in parse_pack_objects()"
-msgstr "parse_pack_objects() 中遇到不可理喻的问题"
+#: builtin/ls-files.c:556
+msgid "show resolve-undo information"
+msgstr "显示 resolve-undo 信息"
-#: builtin/index-pack.c:1208
-msgid "Resolving deltas"
-msgstr "å¤\84ç\90\86 delta ä¸"
+#: builtin/ls-files.c:558
+msgid "skip files matching pattern"
+msgstr "å\8c¹é\85\8dæ\8e\92é\99¤æ\96\87件ç\9a\84模å¼\8f"
-#: builtin/index-pack.c:1219
-#, c-format
-msgid "unable to create thread: %s"
-msgstr "不能创建线程：%s"
+#: builtin/ls-files.c:561
+msgid "exclude patterns are read from <file>"
+msgstr "从 <文件> 中读取排除模式"
-#: builtin/index-pack.c:1261
-msgid "confusion beyond insanity"
-msgstr "ä¸\8då\8f¯ç\90\86å\96»"
+#: builtin/ls-files.c:564
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr "ä»\8e <æ\96\87件> 读å\8f\96é¢\9då¤\96ç\9a\84æ¯\8f个ç\9b®å½\95ç\9a\84æ\8e\92é\99¤æ¨¡å¼\8f"
-#: builtin/index-pack.c:1267
-#, c-format
-msgid "completed with %d local object"
-msgid_plural "completed with %d local objects"
-msgstr[0] "完成 %d 个本地对象"
-msgstr[1] "完成 %d 个本地对象"
+#: builtin/ls-files.c:566
+msgid "add the standard git exclusions"
+msgstr "添加标准的 git 排除"
-#: builtin/index-pack.c:1279
-#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
-msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
+#: builtin/ls-files.c:570
+msgid "make the output relative to the project top directory"
+msgstr "显示相对于顶级目录的文件名"
-#: builtin/index-pack.c:1283
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] "包有 %d 个未解决的 delta"
-msgstr[1] "包有 %d 个未解决的 delta"
+#: builtin/ls-files.c:573
+msgid "recurse through submodules"
+msgstr "在子模组中递归"
-#: builtin/index-pack.c:1307
-#, c-format
-msgid "unable to deflate appended object (%d)"
-msgstr "不能压缩附加对象（%d）"
+#: builtin/ls-files.c:575
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr "如果任何 <文件> 都不在索引区，视为错误"
-#: builtin/index-pack.c:1383
-#, c-format
-msgid "local object %s is corrupt"
-msgstr "本地对象 %s 已损坏"
+#: builtin/ls-files.c:576
+msgid "tree-ish"
+msgstr "树或提交"
-#: builtin/index-pack.c:1409
-msgid "error while closing pack file"
-msgstr "å\85³é\97å\8c\85æ\96\87件æ\97¶å\87ºé\94\99"
+#: builtin/ls-files.c:577
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr "å\81\87è£\85è\87ªä»\8e <æ \91æ\88\96æ\8f\90交> ä¹\8bå\90\8eå\88 é\99¤ç\9a\84è·¯å¾\84ä»\8dç\84¶å\98å\9c¨"
-#: builtin/index-pack.c:1421
-#, c-format
-msgid "cannot write keep file '%s'"
-msgstr "无法写保留文件 '%s'"
+#: builtin/ls-files.c:579
+msgid "show debugging data"
+msgstr "显示调试数据"
-#: builtin/index-pack.c:1429
-#, c-format
-msgid "cannot close written keep file '%s'"
-msgstr "无法关闭保留文件 '%s'"
+#: builtin/ls-remote.c:9
+msgid ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
+msgstr ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<仓库> [<引用>...]]"
-#: builtin/index-pack.c:1439
-msgid "cannot store pack file"
-msgstr "无法存储包文件"
+#: builtin/ls-remote.c:59
+msgid "do not print remote URL"
+msgstr "不打印远程 URL"
-#: builtin/index-pack.c:1447
-msgid "cannot store index file"
-msgstr "无法存储索引文件"
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+msgid "exec"
+msgstr "exec"
-#: builtin/index-pack.c:1485
-#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr "坏的 pack.indexversion=%<PRIu32>"
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+msgid "path of git-upload-pack on the remote host"
+msgstr "远程主机上的 git-upload-pack 路径"
-#: builtin/index-pack.c:1553
-#, c-format
-msgid "Cannot open existing pack file '%s'"
-msgstr "无法打开现存包文件 '%s'"
+#: builtin/ls-remote.c:65
+msgid "limit to tags"
+msgstr "仅限于标签"
-#: builtin/index-pack.c:1555
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
-msgstr "无法为 %s 打开包索引文件"
+#: builtin/ls-remote.c:66
+msgid "limit to heads"
+msgstr "仅限于分支"
-#: builtin/index-pack.c:1603
-#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] "非 delta：%d 个对象"
-msgstr[1] "非 delta：%d 个对象"
+#: builtin/ls-remote.c:67
+msgid "do not show peeled tags"
+msgstr "不显示已解析的标签"
-#: builtin/index-pack.c:1610
-#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] "链长 = %d: %lu 对象"
-msgstr[1] "链长 = %d: %lu 对象"
+#: builtin/ls-remote.c:69
+msgid "take url.<base>.insteadOf into account"
+msgstr "参考 url.<base>.insteadOf 设置"
-#: builtin/index-pack.c:1623
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
+#: builtin/ls-remote.c:72
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr "若未找到匹配的引用则以退出码2退出"
-#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
-#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
-#, c-format
-msgid "bad %s"
-msgstr "错误选项 %s"
+#: builtin/ls-remote.c:75
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "除了显示指向的对象外，显示指向的引用名"
-#: builtin/index-pack.c:1744
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin 不能和 --stdin 同时使用"
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
-#: builtin/index-pack.c:1746
-msgid "--stdin requires a git repository"
-msgstr "--stdin 需要一个 git 仓库"
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr "只显示树"
-#: builtin/index-pack.c:1754
-msgid "--verify with no packfile name given"
-msgstr "--verify 没有提供包文件名参数"
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr "递归到子树"
-#: builtin/init-db.c:55
-#, c-format
-msgid "cannot stat '%s'"
-msgstr "不能对 '%s' 调用 stat"
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr "当递归时显示树"
-#: builtin/init-db.c:61
-#, c-format
-msgid "cannot stat template '%s'"
-msgstr "不能对模版 '%s' 调用 stat"
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr "条目以 NUL 字符终止"
-#: builtin/init-db.c:66
-#, c-format
-msgid "cannot opendir '%s'"
-msgstr "不能打开目录 '%s'"
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr "包括对象大小"
-#: builtin/init-db.c:77
-#, c-format
-msgid "cannot readlink '%s'"
-msgstr "不能读取链接 '%s'"
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr "只列出文件名"
-#: builtin/init-db.c:79
-#, c-format
-msgid "cannot symlink '%s' '%s'"
-msgstr "不能自 '%s' 到 '%s' 创建符号链接"
+#: builtin/ls-tree.c:143
+msgid "use full path names"
+msgstr "使用文件的全路径"
-#: builtin/init-db.c:85
-#, c-format
-msgid "cannot copy '%s' to '%s'"
-msgstr "不能拷贝 '%s' 至 '%s'"
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）"
-#: builtin/init-db.c:89
+#: builtin/mailsplit.c:241
#, c-format
-msgid "ignoring template %s"
-msgstr "忽略模版 %s"
+msgid "empty mbox: '%s'"
+msgstr "空的 mbox：'%s'"
-#: builtin/init-db.c:120
-#, c-format
-msgid "templates not found %s"
-msgstr "模版未找到 %s"
+#: builtin/merge.c:54
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<选项>] [<提交>...]"
-#: builtin/init-db.c:135
-#, c-format
-msgid "not copying templates from '%s': %s"
-msgstr "没有从 '%s' 复制模版：%s"
+#: builtin/merge.c:55
+msgid "git merge --abort"
+msgstr "git merge --abort"
-#: builtin/init-db.c:328
-#, c-format
-msgid "unable to handle file type %d"
-msgstr "不能处理 %d 类型的文件"
+#: builtin/merge.c:56
+msgid "git merge --continue"
+msgstr "git merge --continue"
-#: builtin/init-db.c:331
-#, c-format
-msgid "unable to move %s to %s"
-msgstr "不能移动 %s 至 %s"
+#: builtin/merge.c:116
+msgid "switch `m' requires a value"
+msgstr "开关 `m' 需要一个值"
-#: builtin/init-db.c:348 builtin/init-db.c:351
+#: builtin/merge.c:139
#, c-format
-msgid "%s already exists"
-msgstr "%s 已经存在"
+msgid "option `%s' requires a value"
+msgstr "选项 `%s' 需要一个值"
-#: builtin/init-db.c:404
+#: builtin/merge.c:185
#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
-msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "不能找到合并策略 '%s'。\n"
-#: builtin/init-db.c:405
+#: builtin/merge.c:186
#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
-msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
+msgid "Available strategies are:"
+msgstr "可用的策略有："
-#: builtin/init-db.c:409
+#: builtin/merge.c:191
#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
-msgstr "å·²å\88\9då§\8bå\8c\96空ç\9a\84å\85±äº« Git ä»\93åº\93äº\8e %s%s\n"
+msgid "Available custom strategies are:"
+msgstr "å\8f¯ç\94¨ç\9a\84è\87ªå®\9aä¹\89ç\96ç\95¥æ\9c\89ï¼\9a"
-#: builtin/init-db.c:410
-#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
-msgstr "已初始化空的 Git 仓库于 %s%s\n"
+#: builtin/merge.c:242 builtin/pull.c:150
+msgid "do not show a diffstat at the end of the merge"
+msgstr "在合并的最后不显示差异统计"
-#: builtin/init-db.c:458
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
-msgstr ""
-"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
-"[<目录>]"
+#: builtin/merge.c:245 builtin/pull.c:153
+msgid "show a diffstat at the end of the merge"
+msgstr "在合并的最后显示差异统计"
-#: builtin/init-db.c:481
-msgid "permissions"
-msgstr "权限"
+#: builtin/merge.c:246 builtin/pull.c:156
+msgid "(synonym to --stat)"
+msgstr "（和 --stat 同义）"
-#: builtin/init-db.c:482
-msgid "specify that the git repository is to be shared amongst several users"
-msgstr "指定 git 仓库是多个用户之间共享的"
+#: builtin/merge.c:248 builtin/pull.c:159
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
-#: builtin/init-db.c:516 builtin/init-db.c:521
-#, c-format
-msgid "cannot mkdir %s"
-msgstr "不能创建目录 %s"
+#: builtin/merge.c:251 builtin/pull.c:165
+msgid "create a single commit instead of doing a merge"
+msgstr "创建一个单独的提交而不是做一次合并"
-#: builtin/init-db.c:525
-#, c-format
-msgid "cannot chdir to %s"
-msgstr "不能切换目录到 %s"
+#: builtin/merge.c:253 builtin/pull.c:168
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "如果合并成功，执行一次提交（默认）"
-#: builtin/init-db.c:546
-#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
-msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
+#: builtin/merge.c:255 builtin/pull.c:171
+msgid "edit message before committing"
+msgstr "在提交前编辑提交说明"
-#: builtin/init-db.c:574
-#, c-format
-msgid "Cannot access work tree '%s'"
-msgstr "不能访问工作区 '%s'"
+#: builtin/merge.c:257
+msgid "allow fast-forward (default)"
+msgstr "允许快进（默认）"
-#: builtin/interpret-trailers.c:15
-msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<value>])...] [<file>...]"
-msgstr ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
-">])...] [<文件>...]"
+#: builtin/merge.c:259 builtin/pull.c:178
+msgid "abort if fast-forward is not possible"
+msgstr "如果不能快进就放弃合并"
-#: builtin/interpret-trailers.c:92
-msgid "edit files in place"
-msgstr "在原位编辑文件"
+#: builtin/merge.c:263 builtin/pull.c:181
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/interpret-trailers.c:93
-msgid "trim empty trailers"
-msgstr "删除空的尾部署名"
+#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
+#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
+msgid "strategy"
+msgstr "策略"
-#: builtin/interpret-trailers.c:96
-msgid "where to place the new trailer"
-msgstr "在哪里放置新的尾部署名"
+#: builtin/merge.c:265 builtin/pull.c:186
+msgid "merge strategy to use"
+msgstr "要使用的合并策略"
-#: builtin/interpret-trailers.c:98
-msgid "action if trailer already exists"
-msgstr "当尾部署名已经存在时所采取的动作"
+#: builtin/merge.c:266 builtin/pull.c:189
+msgid "option=value"
+msgstr "option=value"
-#: builtin/interpret-trailers.c:100
-msgid "action if trailer is missing"
-msgstr "当尾部署名缺失时所采取的动作"
+#: builtin/merge.c:267 builtin/pull.c:190
+msgid "option for selected merge strategy"
+msgstr "所选的合并策略的选项"
-#: builtin/interpret-trailers.c:102
-msgid "output only the trailers"
-msgstr "å\8fªè¾\93å\87ºå°¾é\83¨ç½²å\90\8d"
+#: builtin/merge.c:269
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "å\90\88并ç\9a\84æ\8f\90交说æ\98\8eï¼\88é\92\88对é\9d\9eå¿«è¿\9bå¼\8få\90\88并ï¼\89"
-#: builtin/interpret-trailers.c:103
-msgid "do not apply config rules"
-msgstr "不要应用配置规则"
+#: builtin/merge.c:276
+msgid "abort the current in-progress merge"
+msgstr "放弃当前正在进行的合并"
-#: builtin/interpret-trailers.c:104
-msgid "join whitespace-continued values"
-msgstr "连接空白折行的值"
+#: builtin/merge.c:278
+msgid "continue the current in-progress merge"
+msgstr "继续当前正在进行的合并"
-#: builtin/interpret-trailers.c:105
-msgid "set parsing options"
-msgstr "设置解析选项"
+#: builtin/merge.c:280 builtin/pull.c:197
+msgid "allow merging unrelated histories"
+msgstr "允许合并不相关的历史"
-#: builtin/interpret-trailers.c:107
-msgid "trailer"
-msgstr "尾部署名"
+#: builtin/merge.c:286
+msgid "verify commit-msg hook"
+msgstr "校验 commit-msg 钩子"
-#: builtin/interpret-trailers.c:108
-msgid "trailer(s) to add"
-msgstr "要添加的尾部署名"
+#: builtin/merge.c:311
+msgid "could not run stash."
+msgstr "不能运行贮藏。"
-#: builtin/interpret-trailers.c:117
-msgid "--trailer with --only-input does not make sense"
-msgstr "--trailer 和 --only-input 同时使用没有意义"
+#: builtin/merge.c:316
+msgid "stash failed"
+msgstr "贮藏失败"
-#: builtin/interpret-trailers.c:127
-msgid "no input file given for in-place editing"
-msgstr "没有给出要原位编辑的文件"
+#: builtin/merge.c:321
+#, c-format
+msgid "not a valid object: %s"
+msgstr "不是一个有效对象：%s"
-#: builtin/log.c:46
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
+#: builtin/merge.c:343 builtin/merge.c:360
+msgid "read-tree failed"
+msgstr "读取树失败"
-#: builtin/log.c:47
-msgid "git show [<options>] <object>..."
-msgstr "git show [<选项>] <对象>..."
+# 译者：注意保持前导空格
+#: builtin/merge.c:390
+msgid " (nothing to squash)"
+msgstr " （无可压缩）"
-#: builtin/log.c:91
+#: builtin/merge.c:401
#, c-format
-msgid "invalid --decorate option: %s"
-msgstr "无效的 --decorate 选项：%s"
-
-#: builtin/log.c:148
-msgid "suppress diff output"
-msgstr "不显示差异输出"
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "压缩提交 -- 未更新 HEAD\n"
-#: builtin/log.c:149
-msgid "show source"
-msgstr "显示源"
+#: builtin/merge.c:451
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "无合并信息 -- 未更新 HEAD\n"
-#: builtin/log.c:150
-msgid "Use mail map file"
-msgstr "使用邮件映射文件"
+#: builtin/merge.c:502
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' 没有指向一个提交"
-#: builtin/log.c:151
-msgid "decorate options"
-msgstr "修饰选项"
+#: builtin/merge.c:589
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
-#: builtin/log.c:154
-msgid "Process line range n,m in file, counting from 1"
-msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
+#: builtin/merge.c:712
+msgid "Not handling anything other than two heads merge."
+msgstr "未处理两个头合并之外的任何操作。"
-#: builtin/log.c:250
+#: builtin/merge.c:726
#, c-format
-msgid "Final output: %d %s\n"
-msgstr "最终输出：%d %s\n"
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "merge-recursive 的未知选项：-X%s"
-#: builtin/log.c:501
+#: builtin/merge.c:741
#, c-format
-msgid "git show %s: bad file"
-msgstr "git show %s: 损坏的文件"
+msgid "unable to write %s"
+msgstr "不能写 %s"
-#: builtin/log.c:516 builtin/log.c:610
+#: builtin/merge.c:793
#, c-format
-msgid "Could not read object %s"
-msgstr "不能读取对象 %s"
+msgid "Could not read from '%s'"
+msgstr "不能从 '%s' 读取"
-#: builtin/log.c:634
+#: builtin/merge.c:802
#, c-format
-msgid "Unknown type: %d"
-msgstr "未知类型：%d"
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
-#: builtin/log.c:755
-msgid "format.headers without value"
-msgstr "format.headers 没有值"
+#: builtin/merge.c:808
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+msgstr ""
+"请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n"
+"合并到主题分支。\n"
+"\n"
-#: builtin/log.c:856
-msgid "name of output directory is too long"
-msgstr "输出目录名太长"
+#: builtin/merge.c:813
+msgid "An empty message aborts the commit.\n"
+msgstr "空的提交说明会终止提交。\n"
-#: builtin/log.c:872
+#: builtin/merge.c:816
#, c-format
-msgid "Cannot open patch file %s"
-msgstr "无法打开补丁文件 %s"
-
-#: builtin/log.c:889
-msgid "Need exactly one range."
-msgstr "只需要一个范围。"
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n"
-#: builtin/log.c:899
-msgid "Not a range."
-msgstr "不是一个范围。"
+#: builtin/merge.c:857
+msgid "Empty commit message."
+msgstr "空提交信息。"
-#: builtin/log.c:1005
-msgid "Cover letter needs email format"
-msgstr "信封需要邮件地址格式"
+#: builtin/merge.c:876
+#, c-format
+msgid "Wonderful.\n"
+msgstr "太棒了。\n"
-#: builtin/log.c:1085
+#: builtin/merge.c:936
#, c-format
-msgid "insane in-reply-to: %s"
-msgstr "不正常的 in-reply-to：%s"
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
-#: builtin/log.c:1112
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
-msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
+#: builtin/merge.c:975
+msgid "No current branch."
+msgstr "没有当前分支。"
-#: builtin/log.c:1162
-msgid "Two output directories?"
-msgstr "两个输出目录？"
+#: builtin/merge.c:977
+msgid "No remote for the current branch."
+msgstr "当前分支没有对应的远程仓库。"
+
+#: builtin/merge.c:979
+msgid "No default upstream defined for the current branch."
+msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
+#: builtin/merge.c:984
#, c-format
-msgid "Unknown commit %s"
-msgstr "未知提交 %s"
+msgid "No remote-tracking branch for %s from %s"
+msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
+#: builtin/merge.c:1041
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "无法解析 '%s' 为一个有效引用。"
+msgid "Bad value '%s' in environment '%s'"
+msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
-#: builtin/log.c:1284
-msgid "Could not find exact merge base."
-msgstr "不能找到准确的合并基线。"
+#: builtin/merge.c:1144
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "不能在 %s 中合并：%s"
-#: builtin/log.c:1288
-msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
-"please use git branch --set-upstream-to to track a remote branch.\n"
-"Or you could specify base commit by --base=<base-commit-id> manually."
-msgstr ""
-"无法得到上游地址，如果你想自动记录基线提交，请使用命令\n"
-"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
-"参数 --base=<base-commit-id> 手动指定一个基线提交。"
+#: builtin/merge.c:1178
+msgid "not something we can merge"
+msgstr "不能合并"
-#: builtin/log.c:1308
-msgid "Failed to find exact merge base"
-msgstr "无法找到准确的合并基线"
+#: builtin/merge.c:1281
+msgid "--abort expects no arguments"
+msgstr "--abort 不带参数"
-#: builtin/log.c:1319
-msgid "base commit should be the ancestor of revision list"
-msgstr "基线提交应该是版本列表的祖先"
+#: builtin/merge.c:1285
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
-#: builtin/log.c:1323
-msgid "base commit shouldn't be in revision list"
-msgstr "基线提交不应该出现在版本列表中"
+#: builtin/merge.c:1297
+msgid "--continue expects no arguments"
+msgstr "--continue 不带参数"
-#: builtin/log.c:1372
-msgid "cannot get patch id"
-msgstr "æ\97 æ³\95å¾\97å\88°è¡¥ä¸\81 id"
+#: builtin/merge.c:1301
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "没æ\9c\89è¿\9bè¡\8cä¸ç\9a\84å\90\88并ï¼\88MERGE_HEAD 丢失ï¼\89ã\80\82"
-#: builtin/log.c:1431
-msgid "use [PATCH n/m] even with a single patch"
-msgstr "使用 [PATCH n/m]，即使只有一个补丁"
+#: builtin/merge.c:1317
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
+"请在合并前先提交您的修改。"
-#: builtin/log.c:1434
-msgid "use [PATCH] even with multiple patches"
-msgstr "使用 [PATCH]，即使有多个补丁"
+#: builtin/merge.c:1324
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
+"请在合并前先提交您的修改。"
-#: builtin/log.c:1438
-msgid "print patches to standard out"
-msgstr "æ\89\93å\8d°è¡¥ä¸\81å\88°æ \87å\87\86è¾\93å\87º"
+#: builtin/merge.c:1327
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "æ\82¨å°\9aæ\9cªç»\93æ\9d\9fæ\82¨ç\9a\84æ\8b£é\80\89ï¼\88å\98å\9c¨ CHERRY_PICK_HEADï¼\89ã\80\82"
-#: builtin/log.c:1440
-msgid "generate a cover letter"
-msgstr "生成一封附信"
+#: builtin/merge.c:1341
+msgid "You cannot combine --squash with --no-ff."
+msgstr "您不能将 --squash 与 --no-ff 同时使用。"
-#: builtin/log.c:1442
-msgid "use simple number sequence for output file names"
-msgstr "使用简单的数字序列作为输出文件名"
+#: builtin/merge.c:1349
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
+
+#: builtin/merge.c:1366
+msgid "Squash commit into empty head not supported yet"
+msgstr "尚不支持到空分支的压缩提交"
+
+#: builtin/merge.c:1368
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "到空分支的非快进式提交没有意义"
+
+#: builtin/merge.c:1373
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - 不能被合并"
-#: builtin/log.c:1443
-msgid "sfx"
-msgstr "å\90\8eç¼\80"
+#: builtin/merge.c:1375
+msgid "Can merge only exactly one commit into empty head"
+msgstr "å\8fªè\83½å°\86ä¸\80个æ\8f\90交å\90\88并å\88°ç©ºå\88\86æ\94¯ä¸\8a"
-#: builtin/log.c:1444
-msgid "use <sfx> instead of '.patch'"
-msgstr "使用 <后缀> 代替 '.patch'"
+#: builtin/merge.c:1454
+msgid "refusing to merge unrelated histories"
+msgstr "拒绝合并无关的历史"
-#: builtin/log.c:1446
-msgid "start numbering patches at <n> instead of 1"
-msgstr "补丁以 <n> 开始编号，而不是1"
+#: builtin/merge.c:1463
+msgid "Already up to date."
+msgstr "已经是最新的。"
-#: builtin/log.c:1448
-msgid "mark the series as Nth re-roll"
-msgstr "标记补丁系列是第几次重制"
+#: builtin/merge.c:1473
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "更新 %s..%s\n"
-#: builtin/log.c:1450
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr "使用 [RFC PATCH] 代替 [PATCH]"
+#: builtin/merge.c:1515
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "尝试非常小的索引内合并...\n"
-#: builtin/log.c:1453
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "使用 [<前缀>] 代替 [PATCH]"
+#: builtin/merge.c:1522
+#, c-format
+msgid "Nope.\n"
+msgstr "无。\n"
-#: builtin/log.c:1456
-msgid "store resulting files in <dir>"
-msgstr "把结果文件存储在 <目录>"
+#: builtin/merge.c:1547
+msgid "Already up to date. Yeeah!"
+msgstr "已经是最新的。耶！"
-#: builtin/log.c:1459
-msgid "don't strip/add [PATCH]"
-msgstr "不删除/添加 [PATCH]"
+#: builtin/merge.c:1553
+msgid "Not possible to fast-forward, aborting."
+msgstr "无法快进，终止。"
-#: builtin/log.c:1462
-msgid "don't output binary diffs"
-msgstr "不输出二进制差异"
+#: builtin/merge.c:1576 builtin/merge.c:1655
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "将树回滚至原始状态...\n"
-#: builtin/log.c:1464
-msgid "output all-zero hash in From header"
-msgstr "在 From 头信息中输出全为零的哈希值"
+#: builtin/merge.c:1580
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "尝试合并策略 %s...\n"
-#: builtin/log.c:1466
-msgid "don't include a patch matching a commit upstream"
-msgstr "不包含已在上游提交中的补丁"
+#: builtin/merge.c:1646
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "没有合并策略处理此合并。\n"
-#: builtin/log.c:1468
-msgid "show patch format instead of default (patch + stat)"
-msgstr "显示纯补丁格式而非默认的（补丁+状态）"
+#: builtin/merge.c:1648
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "使用策略 %s 合并失败。\n"
-#: builtin/log.c:1470
-msgid "Messaging"
-msgstr "邮件发送"
+#: builtin/merge.c:1657
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/log.c:1471
-msgid "header"
-msgstr "header"
+#: builtin/merge.c:1669
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr "自动合并进展顺利，按要求在提交前停止\n"
-#: builtin/log.c:1472
-msgid "add email header"
-msgstr "添加邮件头"
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <提交> <提交>..."
-#: builtin/log.c:1473 builtin/log.c:1475
-msgid "email"
-msgstr "邮件地址"
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <提交>..."
-#: builtin/log.c:1473
-msgid "add To: header"
-msgstr "添加收件人"
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <提交>..."
-#: builtin/log.c:1475
-msgid "add Cc: header"
-msgstr "添加抄送"
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <提交> <提交>"
-#: builtin/log.c:1477
-msgid "ident"
-msgstr "标识"
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <引用> [<提交>]"
-#: builtin/log.c:1478
-msgid "set From address to <ident> (or committer ident if absent)"
-msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
+#: builtin/merge-base.c:153
+msgid "output all common ancestors"
+msgstr "输出所有共同的祖先"
-#: builtin/log.c:1480
-msgid "message-id"
-msgstr "邮件标识"
+#: builtin/merge-base.c:155
+msgid "find ancestors for a single n-way merge"
+msgstr "查找一个多路合并的祖先提交"
-#: builtin/log.c:1481
-msgid "make first mail a reply to <message-id>"
-msgstr "使第一封邮件作为对 <邮件标识> 的回复"
+#: builtin/merge-base.c:157
+msgid "list revs not reachable from others"
+msgstr "显示不能被其他访问到的版本"
-#: builtin/log.c:1482 builtin/log.c:1485
-msgid "boundary"
-msgstr "边界"
+#: builtin/merge-base.c:159
+msgid "is the first one ancestor of the other?"
+msgstr "第一个是其他的祖先提交么？"
-#: builtin/log.c:1483
-msgid "attach the patch"
-msgstr "附件方式添加补丁"
+#: builtin/merge-base.c:161
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
-#: builtin/log.c:1486
-msgid "inline the patch"
-msgstr "内联显示补丁"
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
+"件> <文件2>"
-#: builtin/log.c:1490
-msgid "enable message threading, styles: shallow, deep"
-msgstr "å\90¯ç\94¨é\82®ä»¶çº¿ç´¢ï¼\8cé£\8eæ ¼ï¼\9aæµ\85ï¼\8cæ·±"
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "å°\86ç»\93æ\9e\9cå\8f\91é\80\81å\88°æ \87å\87\86è¾\93å\87º"
-#: builtin/log.c:1492
-msgid "signature"
-msgstr "签名"
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "使用基于 diff3 的合并"
-#: builtin/log.c:1493
-msgid "add a signature"
-msgstr "添加一个签名"
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "如果冲突，使用我们的版本"
-#: builtin/log.c:1494
-msgid "base-commit"
-msgstr "å\9fºçº¿æ\8f\90交"
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "å¦\82æ\9e\9cå\86²çª\81ï¼\8c使ç\94¨ä»\96们ç\9a\84ç\89\88æ\9c¬"
-#: builtin/log.c:1495
-msgid "add prerequisite tree info to the patch series"
-msgstr "为补丁列表添加前置树信息"
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "如果冲突，使用联合版本"
-#: builtin/log.c:1497
-msgid "add a signature from a file"
-msgstr "从文件添加一个签名"
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "如果冲突，使用指定长度的标记"
-#: builtin/log.c:1498
-msgid "don't print the patch filenames"
-msgstr "不要打印补丁文件名"
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "不要警告冲突"
-#: builtin/log.c:1500
-msgid "show progress while generating patches"
-msgstr "在生成补丁时显示进度"
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "为 文件1/初始文件/文件2 设置标签"
-#: builtin/log.c:1575
+#: builtin/merge-recursive.c:46
#, c-format
-msgid "invalid ident line: %s"
-msgstr "包含无效的身份标识：%s"
+msgid "unknown option %s"
+msgstr "未知选项 %s"
-#: builtin/log.c:1590
-msgid "-n and -k are mutually exclusive."
-msgstr "-n 和 -k 互斥。"
+#: builtin/merge-recursive.c:52
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "不能解析对象 '%s'"
-#: builtin/log.c:1592
-msgid "--subject-prefix/--rfc and -k are mutually exclusive."
-msgstr "--subject-prefix/--rfc 和 -k 互斥。"
+#: builtin/merge-recursive.c:56
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
+msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
-#: builtin/log.c:1600
-msgid "--name-only does not make sense"
-msgstr "--name-only 无意义"
+#: builtin/merge-recursive.c:64
+msgid "not handling anything other than two heads merge."
+msgstr "不能处理两个头合并之外的任何操作。"
-#: builtin/log.c:1602
-msgid "--name-status does not make sense"
-msgstr "--name-status 无意义"
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "无法解析引用 '%s'"
-#: builtin/log.c:1604
-msgid "--check does not make sense"
-msgstr "--check 无意义"
+#: builtin/merge-recursive.c:78
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "合并 %s 和 %s\n"
-#: builtin/log.c:1634
-msgid "standard output, or directory, which one?"
-msgstr "标准输出或目录，哪一个？"
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr "git mktree [-z] [--missing] [--batch]"
-#: builtin/log.c:1636
-#, c-format
-msgid "Could not create directory '%s'"
-msgstr "不能创建目录 '%s'"
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr "输入以 NUL 字符终止"
-#: builtin/log.c:1729
-#, c-format
-msgid "unable to read signature file '%s'"
-msgstr "无法读取签名文件 '%s'"
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
+msgstr "允许丢失的对象"
-#: builtin/log.c:1761
-msgid "Generating patches"
-msgstr "生成补丁"
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
+msgstr "允许创建一个以上的树"
-#: builtin/log.c:1805
-msgid "Failed to create output files"
-msgstr "无法创建输出文件"
+#: builtin/multi-pack-index.c:9
+msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgstr "git multi-pack-index [--object-dir=<目录>] (write|verify)"
-#: builtin/log.c:1855
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
-msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
+#: builtin/multi-pack-index.c:22
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr "包含成对包文件和包索引的对象目录"
-#: builtin/log.c:1909
-#, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
-msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
+#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+msgid "too many arguments"
+msgstr "太多参数"
-#: builtin/ls-files.c:466
-msgid "git ls-files [<options>] [<file>...]"
-msgstr "git ls-files [<选项>] [<文件>...]"
+#: builtin/multi-pack-index.c:51
+#, c-format
+msgid "unrecognized verb: %s"
+msgstr "未能识别的动作：%s"
-#: builtin/ls-files.c:515
-msgid "identify the file status with tags"
-msgstr "用标签标识文件的状态"
+#: builtin/mv.c:18
+msgid "git mv [<options>] <source>... <destination>"
+msgstr "git mv [<选项>] <源>... <目标>"
-#: builtin/ls-files.c:517
-msgid "use lowercase letters for 'assume unchanged' files"
-msgstr "使用小写字母表示 '假设未改变的' 文件"
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "目录 %s 在索引中并且不是子模组？"
-#: builtin/ls-files.c:519
-msgid "show cached files in the output (default)"
-msgstr "显示缓存的文件（默认）"
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
-#: builtin/ls-files.c:521
-msgid "show deleted files in the output"
-msgstr "显示已删除的文件"
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*s 在索引中"
-#: builtin/ls-files.c:523
-msgid "show modified files in the output"
-msgstr "显示已修改的文件"
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr "强制移动/重命令，即使目标存在"
-#: builtin/ls-files.c:525
-msgid "show other files in the output"
-msgstr "显示其它文件"
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
+msgstr "跳过移动/重命名错误"
-#: builtin/ls-files.c:527
-msgid "show ignored files in the output"
-msgstr "显示忽略的文件"
+#: builtin/mv.c:169
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "目标 '%s' 不是一个目录"
-#: builtin/ls-files.c:530
-msgid "show staged contents' object name in the output"
-msgstr "显示暂存区内容的对象名称"
+#: builtin/mv.c:180
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "检查 '%s' 到 '%s' 的重命名\n"
-#: builtin/ls-files.c:532
-msgid "show files on the filesystem that need to be removed"
-msgstr "显示文件系统需要删除的文件"
+#: builtin/mv.c:184
+msgid "bad source"
+msgstr "坏的源"
-#: builtin/ls-files.c:534
-msgid "show 'other' directories' names only"
-msgstr "只显示“其他”目录的名称"
+#: builtin/mv.c:187
+msgid "can not move directory into itself"
+msgstr "不能将目录移动到自身"
-#: builtin/ls-files.c:536
-msgid "show line endings of files"
-msgstr "显示文件换行符格式"
+#: builtin/mv.c:190
+msgid "cannot move directory over file"
+msgstr "不能将目录移动到文件"
-#: builtin/ls-files.c:538
-msgid "don't show empty directories"
-msgstr "不显示空目录"
+#: builtin/mv.c:199
+msgid "source directory is empty"
+msgstr "源目录为空"
-#: builtin/ls-files.c:541
-msgid "show unmerged files in the output"
-msgstr "显示未合并的文件"
+#: builtin/mv.c:224
+msgid "not under version control"
+msgstr "不在版本控制之下"
-#: builtin/ls-files.c:543
-msgid "show resolve-undo information"
-msgstr "显示 resolve-undo 信息"
+#: builtin/mv.c:227
+msgid "destination exists"
+msgstr "目标已存在"
-#: builtin/ls-files.c:545
-msgid "skip files matching pattern"
-msgstr "匹配排除文件的模式"
+#: builtin/mv.c:235
+#, c-format
+msgid "overwriting '%s'"
+msgstr "覆盖 '%s'"
-#: builtin/ls-files.c:548
-msgid "exclude patterns are read from <file>"
-msgstr "ä»\8e <æ\96\87件> ä¸è¯»å\8f\96æ\8e\92é\99¤æ¨¡å¼\8f"
+#: builtin/mv.c:238
+msgid "Cannot overwrite"
+msgstr "ä¸\8dè\83½è¦\86ç\9b\96"
-#: builtin/ls-files.c:551
-msgid "read additional per-directory exclude patterns in <file>"
-msgstr "从 <文件> 读取额外的每个目录的排除模式"
+#: builtin/mv.c:241
+msgid "multiple sources for the same target"
+msgstr "同一目标具有多个源"
-#: builtin/ls-files.c:553
-msgid "add the standard git exclusions"
-msgstr "添加标准的 git 排除"
+#: builtin/mv.c:243
+msgid "destination directory does not exist"
+msgstr "目标目录不存在"
-#: builtin/ls-files.c:556
-msgid "make the output relative to the project top directory"
-msgstr "显示相对于顶级目录的文件名"
+#: builtin/mv.c:250
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s，源=%s，目标=%s"
-#: builtin/ls-files.c:559
-msgid "recurse through submodules"
-msgstr "在子模组中递归"
+#: builtin/mv.c:271
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr "重命名 %s 至 %s\n"
-#: builtin/ls-files.c:561
-msgid "if any <file> is not in the index, treat this as an error"
-msgstr "如果任何 <文件> 都不在索引区，视为错误"
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "重命名 '%s' 失败"
-#: builtin/ls-files.c:562
-msgid "tree-ish"
-msgstr "树或提交"
+#: builtin/name-rev.c:355
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<选项>] <提交>..."
-#: builtin/ls-files.c:563
-msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
+#: builtin/name-rev.c:356
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<选项>] --all"
-#: builtin/ls-files.c:565
-msgid "show debugging data"
-msgstr "显示调试数据"
+#: builtin/name-rev.c:357
+msgid "git name-rev [<options>] --stdin"
+msgstr "git name-rev [<选项>] --stdin"
-#: builtin/ls-remote.c:7
-msgid ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
-msgstr ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<仓库> [<引用>...]]"
+#: builtin/name-rev.c:415
+msgid "print only names (no SHA-1)"
+msgstr "只打印名称（无 SHA-1）"
-#: builtin/ls-remote.c:52
-msgid "do not print remote URL"
-msgstr "不打印远程 URL"
+#: builtin/name-rev.c:416
+msgid "only use tags to name the commits"
+msgstr "只使用标签来命名提交"
-#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
-msgid "exec"
-msgstr "exec"
+#: builtin/name-rev.c:418
+msgid "only use refs matching <pattern>"
+msgstr "只使用和 <模式> 相匹配的引用"
-#: 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/name-rev.c:420
+msgid "ignore refs matching <pattern>"
+msgstr "忽略和 <模式> 相匹配的引用"
-#: builtin/ls-remote.c:58
-msgid "limit to tags"
-msgstr "仅限于标签"
+#: builtin/name-rev.c:422
+msgid "list all commits reachable from all refs"
+msgstr "列出可以从所有引用访问的提交"
-#: builtin/ls-remote.c:59
-msgid "limit to heads"
-msgstr "ä»\85é\99\90äº\8eå\88\86æ\94¯"
+#: builtin/name-rev.c:423
+msgid "read from stdin"
+msgstr "ä»\8eæ \87å\87\86è¾\93å\85¥è¯»å\8f\96"
-#: builtin/ls-remote.c:60
-msgid "do not show peeled tags"
-msgstr "不显示已解析的标签"
+#: builtin/name-rev.c:424
+msgid "allow to print `undefined` names (default)"
+msgstr "允许打印 `未定义` 的名称（默认）"
-#: builtin/ls-remote.c:62
-msgid "take url.<base>.insteadOf into account"
-msgstr "å\8f\82è\80\83 url.<base>.insteadOf 设置"
+#: builtin/name-rev.c:430
+msgid "dereference tags in the input (internal use)"
+msgstr "å\8f\8då\90\91解æ\9e\90è¾\93å\85¥ä¸ç\9a\84æ \87ç¾ï¼\88å\86\85é\83¨ä½¿ç\94¨ï¼\89"
-#: builtin/ls-remote.c:64
-msgid "exit with exit code 2 if no matching refs are found"
-msgstr "若未找到匹配的引用则以退出码2退出"
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
-#: builtin/ls-remote.c:66
-msgid "show underlying ref in addition to the object pointed by it"
-msgstr "除了显示指向的对象外，显示指向的引用名"
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
+"| (-c | -C) <对象>] [<对象>]"
-#: builtin/ls-tree.c:29
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
-#: builtin/ls-tree.c:127
-msgid "only show trees"
-msgstr "只显示树"
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
+"(-c | -C) <对象>] [<对象>]"
-#: builtin/ls-tree.c:129
-msgid "recurse into subtrees"
-msgstr "递归到子树"
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
-#: builtin/ls-tree.c:131
-msgid "show trees when recursing"
-msgstr "当递归时显示树"
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <注解引用>] show [<对象>]"
-#: builtin/ls-tree.c:134
-msgid "terminate entries with NUL byte"
-msgstr "条目以 NUL 字符终止"
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
-#: builtin/ls-tree.c:135
-msgid "include object size"
-msgstr "包括对象大小"
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
+msgstr "git notes merge --commit [-v | -q]"
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
-msgid "list only filenames"
-msgstr "只列出文件名"
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
+msgstr "git notes merge --abort [-v | -q]"
-#: builtin/ls-tree.c:142
-msgid "use full path names"
-msgstr "使用文件的全路径"
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
-#: builtin/ls-tree.c:144
-msgid "list entire tree; not just current directory (implies --full-name)"
-msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）"
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
-#: builtin/mailsplit.c:241
-#, c-format
-msgid "empty mbox: '%s'"
-msgstr "空的 mbox：'%s'"
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <注解引用>] get-ref"
-#: builtin/merge.c:48
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<选项>] [<提交>...]"
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<对象>]]"
-#: builtin/merge.c:49
-msgid "git merge --abort"
-msgstr "git merge --abort"
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<选项>] [<对象>]"
-#: builtin/merge.c:50
-msgid "git merge --continue"
-msgstr "git merge --continue"
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<选项>] <源对象> <目标对象>"
-#: builtin/merge.c:107
-msgid "switch `m' requires a value"
-msgstr "开关 `m' 需要一个值"
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
-#: builtin/merge.c:144
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "不能找到合并策略 '%s'。\n"
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<选项>] [<对象>]"
-#: builtin/merge.c:145
-#, c-format
-msgid "Available strategies are:"
-msgstr "可用的策略有："
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<对象>]"
-#: builtin/merge.c:150
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "可用的自定义策略有："
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr "git notes show [<对象>]"
-#: builtin/merge.c:200 builtin/pull.c:134
-msgid "do not show a diffstat at the end of the merge"
-msgstr "在合并的最后不显示差异统计"
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<选项>] <注解引用>"
-#: builtin/merge.c:203 builtin/pull.c:137
-msgid "show a diffstat at the end of the merge"
-msgstr "在合并的最后显示差异统计"
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<选项>]"
-#: builtin/merge.c:204 builtin/pull.c:140
-msgid "(synonym to --stat)"
-msgstr "（和 --stat 同义）"
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<选项>]"
-#: builtin/merge.c:206 builtin/pull.c:143
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<对象>]"
-#: builtin/merge.c:209 builtin/pull.c:146
-msgid "create a single commit instead of doing a merge"
-msgstr "创建一个单独的提交而不是做一次合并"
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<选项>]"
-#: builtin/merge.c:211 builtin/pull.c:149
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "如果合并成功，执行一次提交（默认）"
+#: builtin/notes.c:92
+msgid "git notes get-ref"
+msgstr "git notes get-ref"
-#: builtin/merge.c:213 builtin/pull.c:152
-msgid "edit message before committing"
-msgstr "在提交前编辑提交说明"
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
+msgstr "为下面的对象写/编辑说明："
-#: builtin/merge.c:214
-msgid "allow fast-forward (default)"
-msgstr "允许快进（默认）"
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "不能为对象 '%s' 开始 'show'"
-#: builtin/merge.c:216 builtin/pull.c:158
-msgid "abort if fast-forward is not possible"
-msgstr "如果不能快进就放弃合并"
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr "不能读取 'show' 的输出"
-#: builtin/merge.c:220 builtin/pull.c:161
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr "无法为对象 '%s' 完成 'show'"
-#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
-#: builtin/revert.c:109
-msgid "strategy"
-msgstr "策略"
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
+msgstr "请通过 -m 或 -F 选项为注解提供内容"
-#: builtin/merge.c:222 builtin/pull.c:166
-msgid "merge strategy to use"
-msgstr "要使用的合并策略"
+#: builtin/notes.c:206
+msgid "unable to write note object"
+msgstr "不能写注解对象"
-#: builtin/merge.c:223 builtin/pull.c:169
-msgid "option=value"
-msgstr "option=value"
+#: builtin/notes.c:208
+#, c-format
+msgid "the note contents have been left in %s"
+msgstr "注解内容被留在 %s 中"
-#: builtin/merge.c:224 builtin/pull.c:170
-msgid "option for selected merge strategy"
-msgstr "所选的合并策略的选项"
+#: builtin/notes.c:242 builtin/tag.c:522
+#, c-format
+msgid "could not open or read '%s'"
+msgstr "不能打开或读取 '%s'"
-#: builtin/merge.c:226
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "合并的提交说明（针对非快进式合并）"
+#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "无法解析 '%s' 为一个有效引用。"
-#: builtin/merge.c:230
-msgid "abort the current in-progress merge"
-msgstr "放弃当前正在进行的合并"
+#: builtin/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
+msgstr "读取对象 '%s' 失败。"
-#: builtin/merge.c:232
-msgid "continue the current in-progress merge"
-msgstr "继续当前正在进行的合并"
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "不能从非数据对象 '%s' 中读取注解数据。"
-#: builtin/merge.c:234 builtin/pull.c:177
-msgid "allow merging unrelated histories"
-msgstr "允许合并不相关的历史"
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "格式错误的输入行：'%s'。"
-#: builtin/merge.c:240
-msgid "verify commit-msg hook"
-msgstr "校验 commit-msg 钩子"
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/merge.c:265
-msgid "could not run stash."
-msgstr "不能运行贮藏。"
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:356
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解"
-#: builtin/merge.c:270
-msgid "stash failed"
-msgstr "贮藏失败"
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
+#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
+#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
+msgid "too many parameters"
+msgstr "参数太多"
-#: builtin/merge.c:275
+#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
-msgid "not a valid object: %s"
-msgstr "不是一个有效对象：%s"
+msgid "no note found for object %s."
+msgstr "未发现对象 %s 的注解。"
-#: builtin/merge.c:297 builtin/merge.c:314
-msgid "read-tree failed"
-msgstr "读取树失败"
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
+msgstr "注解内容作为一个字符串"
-# 译者：注意保持前导空格
-#: builtin/merge.c:344
-msgid " (nothing to squash)"
-msgstr " （无可压缩）"
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
+msgstr "注解内容到一个文件中"
-#: builtin/merge.c:355
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "压缩提交 -- 未更新 HEAD\n"
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
+msgstr "重用和编辑指定的注解对象"
+
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
+msgstr "重用指定的注解对象"
+
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
+msgstr "允许保存空白注释"
+
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
+msgstr "替换已存在的注解"
-#: builtin/merge.c:405
+#: builtin/notes.c:448
#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr "无合并信息 -- 未更新 HEAD\n"
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/merge.c:456
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "'%s' 没有指向一个提交"
+msgid "Overwriting existing notes for object %s\n"
+msgstr "覆盖对象 %s 现存注解\n"
-#: builtin/merge.c:546
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "å\9d\8fç\9a\84 branch.%s.mergeoptions å\97符串ï¼\9a%s"
+msgid "Removing note for object %s\n"
+msgstr "å\88 é\99¤å¯¹è±¡ %s ç\9a\84注解\n"
-#: builtin/merge.c:666
-msgid "Not handling anything other than two heads merge."
-msgstr "未处理两个头合并之外的任何操作。"
+#: builtin/notes.c:497
+msgid "read objects from stdin"
+msgstr "从标准输入读取对象"
-#: builtin/merge.c:680
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive 的未知选项：-X%s"
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
-#: builtin/merge.c:695
-#, c-format
-msgid "unable to write %s"
-msgstr "不能写 %s"
+#: builtin/notes.c:517
+msgid "too few parameters"
+msgstr "参数太少"
-#: builtin/merge.c:747
+#: builtin/notes.c:538
#, c-format
-msgid "Could not read from '%s'"
-msgstr "不能从 '%s' 读取"
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/merge.c:756
+#: builtin/notes.c:550
#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr "æ\9cªæ\8f\90交å\90\88并ï¼\8c使ç\94¨ 'git commit' å®\8cæ\88\90æ¤æ¬¡å\90\88并ã\80\82\n"
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "æº\90对象 %s 缺å°\91注解ã\80\82ä¸\8dè\83½æ\8b·è´\9dã\80\82"
-#: builtin/merge.c:762
+#: builtin/notes.c:603
#, c-format
msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
+"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
+"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-"请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n"
-"合并到主题分支。\n"
-"\n"
-"以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
+"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
+"请换用 'git notes add -f -m/-F/-c/-C'。\n"
-#: builtin/merge.c:798
-msgid "Empty commit message."
-msgstr "空提交信息。"
+#: builtin/notes.c:698
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
-#: builtin/merge.c:818
-#, c-format
-msgid "Wonderful.\n"
-msgstr "太棒了。\n"
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "删除引用 NOTES_MERGE_REF 失败"
-#: builtin/merge.c:871
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "删除 'git notes merge' 工作区失败"
-#: builtin/merge.c:910
-msgid "No current branch."
-msgstr "没有当前分支。"
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
-#: builtin/merge.c:912
-msgid "No remote for the current branch."
-msgstr "当前分支没有对应的远程仓库。"
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
-#: builtin/merge.c:914
-msgid "No default upstream defined for the current branch."
-msgstr "当前分支没有定义默认的上游分支。"
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
-#: builtin/merge.c:919
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "解析 NOTES_MERGE_REF 失败"
-#: builtin/merge.c:972
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr "无法完成注解合并"
-#: builtin/merge.c:1073
+#: builtin/notes.c:768
#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "不能在 %s 中合并：%s"
+msgid "unknown notes merge strategy %s"
+msgstr "未知的注解合并策略 %s"
-#: builtin/merge.c:1107
-msgid "not something we can merge"
-msgstr "不能合并"
+#: builtin/notes.c:784
+msgid "General options"
+msgstr "通用选项"
-#: builtin/merge.c:1172
-msgid "--abort expects no arguments"
-msgstr "--abort 不带参数"
+#: builtin/notes.c:786
+msgid "Merge options"
+msgstr "合并选项"
-#: builtin/merge.c:1176
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
+#: builtin/notes.c:788
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
-#: builtin/merge.c:1188
-msgid "--continue expects no arguments"
-msgstr "--continue 不带参数"
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
+msgstr "提交未合并的注解"
-#: builtin/merge.c:1192
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
+msgstr "通过提交未合并的注解来完成注解合并"
-#: builtin/merge.c:1208
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
-"请在合并前先提交您的修改。"
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
+msgstr "中止注解合并的方案"
+
+#: builtin/notes.c:796
+msgid "abort notes merge"
+msgstr "中止注解合并"
+
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "不能混用 --commit、--abort 或 -s/--strategy"
+
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
+msgstr "必须指定一个注解引用来合并"
+
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr "未知的 -s/--strategy：%s"
+
+#: builtin/notes.c:873
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
+
+#: builtin/notes.c:876
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr "无法存储链接到当前的注解引用（%s）"
-#: builtin/merge.c:1215
+#: builtin/notes.c:878
+#, c-format
msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
msgstr ""
-"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
-"请在合并前先提交您的修改。"
+"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
+"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
-#: builtin/merge.c:1218
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
+#: builtin/notes.c:897 builtin/tag.c:535
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "无法解析 '%s' 为一个有效引用。"
-#: builtin/merge.c:1227
-msgid "You cannot combine --squash with --no-ff."
-msgstr "您不能将 --squash 与 --no-ff 同时使用。"
+#: builtin/notes.c:900
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "对象 %s 没有注解\n"
-#: builtin/merge.c:1235
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
+#: builtin/notes.c:912
+msgid "attempt to remove non-existent note is not an error"
+msgstr "尝试删除不存在的注解不是一个错误"
-#: builtin/merge.c:1252
-msgid "Squash commit into empty head not supported yet"
-msgstr "尚不支持到空分支的压缩提交"
+#: builtin/notes.c:915
+msgid "read object names from the standard input"
+msgstr "从标准输入读取对象名称"
+
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+msgid "do not remove, show only"
+msgstr "不删除，只显示"
+
+#: builtin/notes.c:955
+msgid "report pruned notes"
+msgstr "报告清除的注解"
+
+#: builtin/notes.c:998
+msgid "notes-ref"
+msgstr "注解引用"
-#: builtin/merge.c:1254
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "到空分支的非快进式提交没有意义"
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
+msgstr "从 <注解引用> 使用注解"
-#: builtin/merge.c:1259
+#: builtin/notes.c:1034 builtin/stash.c:1611
#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s - 不能被合并"
+msgid "unknown subcommand: %s"
+msgstr "未知子命令：%s"
-#: builtin/merge.c:1261
-msgid "Can merge only exactly one commit into empty head"
-msgstr "只能将一个提交合并到空分支上"
+#: builtin/pack-objects.c:52
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
-#: builtin/merge.c:1295
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
+#: builtin/pack-objects.c:53
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
-#: builtin/merge.c:1298
+#: builtin/pack-objects.c:424
#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
+msgid "bad packed object CRC for %s"
+msgstr "%s 错的包对象 CRC"
-#: builtin/merge.c:1301
+#: builtin/pack-objects.c:435
#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "提交 %s 没有一个 GPG 签名。"
+msgid "corrupt packed object for %s"
+msgstr "%s 损坏的包对象"
-#: builtin/merge.c:1304
+#: builtin/pack-objects.c:566
#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-
-#: builtin/merge.c:1366
-msgid "refusing to merge unrelated histories"
-msgstr "拒绝合并无关的历史"
-
-#: builtin/merge.c:1375
-msgid "Already up to date."
-msgstr "已经是最新的。"
+msgid "recursive delta detected for object %s"
+msgstr "发现对象 %s 递归 delta"
-#: builtin/merge.c:1385
+#: builtin/pack-objects.c:777
#, c-format
-msgid "Updating %s..%s\n"
-msgstr "æ\9b´æ\96° %s..%s\n"
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr "æ\8e\92åº\8fäº\86 %u 个对象ï¼\8cé¢\84æ\9c\9f %<PRIu32> 个"
-#: builtin/merge.c:1426
+#: builtin/pack-objects.c:790
#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "尝试非常小的索引内合并...\n"
+msgid "packfile is invalid: %s"
+msgstr "无效的包文件：%s"
-#: builtin/merge.c:1433
+#: builtin/pack-objects.c:794
#, c-format
-msgid "Nope.\n"
-msgstr "无。\n"
+msgid "unable to open packfile for reuse: %s"
+msgstr "无法为重用打开包文件：%s"
-#: builtin/merge.c:1458
-msgid "Already up to date. Yeeah!"
-msgstr "已经是最新的。耶！"
+#: builtin/pack-objects.c:798
+msgid "unable to seek in reused packfile"
+msgstr "无法在重用的包文件中查找"
-#: builtin/merge.c:1464
-msgid "Not possible to fast-forward, aborting."
-msgstr "无法快进，终止。"
+#: builtin/pack-objects.c:809
+msgid "unable to read from reused packfile"
+msgstr "无法读取索引文件"
-#: builtin/merge.c:1487 builtin/merge.c:1566
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "将树回滚至原始状态...\n"
+#: builtin/pack-objects.c:837
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
-#: builtin/merge.c:1491
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "尝试合并策略 %s...\n"
+#: builtin/pack-objects.c:850
+msgid "Writing objects"
+msgstr "写入对象中"
-#: builtin/merge.c:1557
+#: builtin/pack-objects.c:912 builtin/update-index.c:89
#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "没有合并策略处理此合并。\n"
+msgid "failed to stat %s"
+msgstr "对 %s 调用 stat 失败"
-#: builtin/merge.c:1559
+#: builtin/pack-objects.c:965
#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "使用策略 %s 合并失败。\n"
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
+
+#: builtin/pack-objects.c:1161
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
-#: builtin/merge.c:1568
+#: builtin/pack-objects.c:1589
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "使用 %s 以准备手工解决。\n"
+msgid "delta base offset overflow in pack for %s"
+msgstr "%s 压缩中 delta 基准偏移越界"
-#: builtin/merge.c:1580
+#: builtin/pack-objects.c:1598
#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr "自动合并进展顺利，按要求在提交前停止\n"
+msgid "delta base offset out of bound for %s"
+msgstr "%s 的 delta 基准偏移越界"
-#: builtin/merge-base.c:30
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <提交> <提交>..."
+#: builtin/pack-objects.c:1867
+msgid "Counting objects"
+msgstr "对象计数中"
-#: builtin/merge-base.c:31
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <提交>..."
+#: builtin/pack-objects.c:1997
+#, c-format
+msgid "unable to get size of %s"
+msgstr "不能得到 %s 的大小"
-#: builtin/merge-base.c:32
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <提交>..."
+#: builtin/pack-objects.c:2012
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr "无法解析对象 %s 头信息"
-#: builtin/merge-base.c:33
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <提交> <提交>"
+#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
+#: builtin/pack-objects.c:2108
+#, c-format
+msgid "object %s cannot be read"
+msgstr "对象 %s 无法读取"
-#: builtin/merge-base.c:34
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <引用> [<提交>]"
+#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr "对象 %s 不一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）"
-#: builtin/merge-base.c:218
-msgid "output all common ancestors"
-msgstr "输出所有共同的祖先"
+#: builtin/pack-objects.c:2122
+msgid "suboptimal pack - out of memory"
+msgstr "次优（suboptimal）打包 - 内存不足"
-#: builtin/merge-base.c:220
-msgid "find ancestors for a single n-way merge"
-msgstr "查找一个多路合并的祖先提交"
+#: builtin/pack-objects.c:2448
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr "使用 %d 个线程进行压缩"
-#: builtin/merge-base.c:222
-msgid "list revs not reachable from others"
-msgstr "显示不能被其他访问到的版本"
+#: builtin/pack-objects.c:2580
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr "无法为标签 %s 压缩对象"
-#: builtin/merge-base.c:224
-msgid "is the first one ancestor of the other?"
-msgstr "第一个是其他的祖先提交么？"
+#: builtin/pack-objects.c:2667
+msgid "Compressing objects"
+msgstr "压缩对象中"
-#: builtin/merge-base.c:226
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
+#: builtin/pack-objects.c:2673
+msgid "inconsistency with delta count"
+msgstr "不一致的差异计数"
-#: builtin/merge-file.c:9
+#: builtin/pack-objects.c:2754
+#, c-format
msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
+"expected edge object ID, got garbage:\n"
+" %s"
msgstr ""
-"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
-"件> <文件2>"
-
-#: builtin/merge-file.c:33
-msgid "send results to standard output"
-msgstr "将结果发送到标准输出"
-
-#: builtin/merge-file.c:34
-msgid "use a diff3 based merge"
-msgstr "使用基于 diff3 的合并"
-
-#: builtin/merge-file.c:35
-msgid "for conflicts, use our version"
-msgstr "如果冲突，使用我们的版本"
-
-#: builtin/merge-file.c:37
-msgid "for conflicts, use their version"
-msgstr "如果冲突，使用他们的版本"
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use a union version"
-msgstr "如果冲突，使用联合版本"
+"预期边界对象（edge object）ID，却得到垃圾数据：\n"
+" %s"
-#: builtin/merge-file.c:42
-msgid "for conflicts, use this marker size"
-msgstr "如果冲突，使用指定长度的标记"
+#: builtin/pack-objects.c:2760
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+"预期对象 ID，却得到垃圾数据：\n"
+" %s"
-#: builtin/merge-file.c:43
-msgid "do not warn about conflicts"
-msgstr "不要警告冲突"
+#: builtin/pack-objects.c:2858
+msgid "invalid value for --missing"
+msgstr "选项 --missing 的值无效"
-#: builtin/merge-file.c:45
-msgid "set labels for file1/orig-file/file2"
-msgstr "为 文件1/初始文件/文件2 设置标签"
+#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+msgid "cannot open pack index"
+msgstr "无法打开包文件索引"
-#: builtin/merge-recursive.c:45
+#: builtin/pack-objects.c:2948
#, c-format
-msgid "unknown option %s"
-msgstr "未知选项 %s"
+msgid "loose object at %s could not be examined"
+msgstr "无法检查 %s 处的松散对象"
+
+#: builtin/pack-objects.c:3033
+msgid "unable to force loose object"
+msgstr "无法强制松散对象"
-#: builtin/merge-recursive.c:51
+#: builtin/pack-objects.c:3125
#, c-format
-msgid "could not parse object '%s'"
-msgstr "不能解析对象 '%s'"
+msgid "not a rev '%s'"
+msgstr "不是一个版本 '%s'"
-#: builtin/merge-recursive.c:55
+#: builtin/pack-objects.c:3128
#, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
-msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
+msgid "bad revision '%s'"
+msgstr "坏的版本 '%s'"
-#: builtin/merge-recursive.c:63
-msgid "not handling anything other than two heads merge."
-msgstr "不能处理两个头合并之外的任何操作。"
+#: builtin/pack-objects.c:3153
+msgid "unable to add recent objects"
+msgstr "无法添加最近的对象"
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/pack-objects.c:3206
#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "无法解析引用 '%s'"
+msgid "unsupported index version %s"
+msgstr "不支持的索引版本 %s"
-#: builtin/merge-recursive.c:77
+#: builtin/pack-objects.c:3210
#, c-format
-msgid "Merging %s with %s\n"
-msgstr "合并 %s 和 %s\n"
-
-#: builtin/mktree.c:65
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
-
-#: builtin/mktree.c:153
-msgid "input is NUL terminated"
-msgstr "输入以 NUL 字符终止"
-
-#: builtin/mktree.c:154 builtin/write-tree.c:25
-msgid "allow missing objects"
-msgstr "允许丢失的对象"
-
-#: builtin/mktree.c:155
-msgid "allow creation of more than one tree"
-msgstr "允许创建一个以上的树"
+msgid "bad index version '%s'"
+msgstr "坏的索引版本 '%s'"
-#: builtin/mv.c:17
-msgid "git mv [<options>] <source>... <destination>"
-msgstr "git mv [<选项>] <源>... <目标>"
+#: builtin/pack-objects.c:3240
+msgid "do not show progress meter"
+msgstr "不显示进度表"
-#: builtin/mv.c:83
-#, c-format
-msgid "Directory %s is in index and no submodule?"
-msgstr "目录 %s 在索引中并且不是子模组？"
+#: builtin/pack-objects.c:3242
+msgid "show progress meter"
+msgstr "显示进度表"
-#: builtin/mv.c:85 builtin/rm.c:289
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
+#: builtin/pack-objects.c:3244
+msgid "show progress meter during object writing phase"
+msgstr "在对象写入阶段显示进度表"
-#: builtin/mv.c:103
-#, c-format
-msgid "%.*s is in index"
-msgstr "%.*s 在索引中"
+#: builtin/pack-objects.c:3247
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/mv.c:125
-msgid "force move/rename even if target exists"
-msgstr "强制移动/重命令，即使目标存在"
+#: builtin/pack-objects.c:3248
+msgid "<version>[,<offset>]"
+msgstr "<版本>[,<偏移>]"
-#: builtin/mv.c:126
-msgid "skip move/rename errors"
-msgstr "跳过移动/重命名错误"
+#: builtin/pack-objects.c:3249
+msgid "write the pack index file in the specified idx format version"
+msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/mv.c:167
-#, c-format
-msgid "destination '%s' is not a directory"
-msgstr "目标 '%s' 不是一个目录"
+#: builtin/pack-objects.c:3252
+msgid "maximum size of each output pack file"
+msgstr "每个输出包的最大尺寸"
-#: builtin/mv.c:178
-#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
-msgstr "检查 '%s' 到 '%s' 的重命名\n"
+#: builtin/pack-objects.c:3254
+msgid "ignore borrowed objects from alternate object store"
+msgstr "忽略从备用对象存储里借用对象"
-#: builtin/mv.c:182
-msgid "bad source"
-msgstr "å\9d\8fç\9a\84æº\90"
+#: builtin/pack-objects.c:3256
+msgid "ignore packed objects"
+msgstr "忽ç\95¥å\8c\85对象"
-#: builtin/mv.c:185
-msgid "can not move directory into itself"
-msgstr "不能将目录移动到自身"
+#: builtin/pack-objects.c:3258
+msgid "limit pack window by objects"
+msgstr "限制打包窗口的对象数"
-#: builtin/mv.c:188
-msgid "cannot move directory over file"
-msgstr "ä¸\8dè\83½å°\86ç\9b®å½\95移å\8a¨å\88°æ\96\87件"
+#: builtin/pack-objects.c:3260
+msgid "limit pack window by memory in addition to object limit"
+msgstr "é\99¤å¯¹è±¡æ\95°é\87\8fé\99\90å\88¶å¤\96设置æ\89\93å\8c\85çª\97å\8f£ç\9a\84å\86\85å\98é\99\90å\88¶"
-#: builtin/mv.c:197
-msgid "source directory is empty"
-msgstr "æº\90ç\9b®å½\95为空"
+#: builtin/pack-objects.c:3262
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr "æ\89\93å\8c\85å\85\81许ç\9a\84 delta é\93¾ç\9a\84æ\9c\80大é\95¿åº¦"
-#: builtin/mv.c:222
-msgid "not under version control"
-msgstr "不在版本控制之下"
+#: builtin/pack-objects.c:3264
+msgid "reuse existing deltas"
+msgstr "重用已存在的 deltas"
-#: builtin/mv.c:225
-msgid "destination exists"
-msgstr "目标已存在"
+#: builtin/pack-objects.c:3266
+msgid "reuse existing objects"
+msgstr "重用已存在的对象"
-#: builtin/mv.c:233
-#, c-format
-msgid "overwriting '%s'"
-msgstr "覆盖 '%s'"
+#: builtin/pack-objects.c:3268
+msgid "use OFS_DELTA objects"
+msgstr "使用 OFS_DELTA 对象"
-#: builtin/mv.c:236
-msgid "Cannot overwrite"
-msgstr "ä¸\8dè\83½è¦\86ç\9b\96"
+#: builtin/pack-objects.c:3270
+msgid "use threads when searching for best delta matches"
+msgstr "使ç\94¨çº¿ç¨\8bæ\9f¥è¯¢æ\9c\80ä½³ delta å\8c¹é\85\8d"
-#: builtin/mv.c:239
-msgid "multiple sources for the same target"
-msgstr "同一目标具有多个源"
+#: builtin/pack-objects.c:3272
+msgid "do not create an empty pack output"
+msgstr "不创建空的包输出"
-#: builtin/mv.c:241
-msgid "destination directory does not exist"
-msgstr "目标目录不存在"
+#: builtin/pack-objects.c:3274
+msgid "read revision arguments from standard input"
+msgstr "从标准输入读取版本号参数"
-#: builtin/mv.c:248
-#, c-format
-msgid "%s, source=%s, destination=%s"
-msgstr "%s，源=%s，目标=%s"
+#: builtin/pack-objects.c:3276
+msgid "limit the objects to those that are not yet packed"
+msgstr "限制那些尚未打包的对象"
-#: builtin/mv.c:269
-#, c-format
-msgid "Renaming %s to %s\n"
-msgstr "重命名 %s 至 %s\n"
+#: builtin/pack-objects.c:3279
+msgid "include objects reachable from any reference"
+msgstr "包括可以从任何引用访问到的对象"
-#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
-#, c-format
-msgid "renaming '%s' failed"
-msgstr "重命名 '%s' 失败"
+#: builtin/pack-objects.c:3282
+msgid "include objects referred by reflog entries"
+msgstr "包括被引用日志引用到的对象"
-#: builtin/name-rev.c:338
-msgid "git name-rev [<options>] <commit>..."
-msgstr "git name-rev [<选项>] <提交>..."
+#: builtin/pack-objects.c:3285
+msgid "include objects referred to by the index"
+msgstr "包括被索引引用到的对象"
-#: builtin/name-rev.c:339
-msgid "git name-rev [<options>] --all"
-msgstr "git name-rev [<选项>] --all"
+#: builtin/pack-objects.c:3288
+msgid "output pack to stdout"
+msgstr "输出包到标准输出"
-#: builtin/name-rev.c:340
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<选项>] --stdin"
+#: builtin/pack-objects.c:3290
+msgid "include tag objects that refer to objects to be packed"
+msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/name-rev.c:395
-msgid "print only names (no SHA-1)"
-msgstr "只打印名称（无 SHA-1）"
+#: builtin/pack-objects.c:3292
+msgid "keep unreachable objects"
+msgstr "维持不可达的对象"
-#: builtin/name-rev.c:396
-msgid "only use tags to name the commits"
-msgstr "只使用标签来命名提交"
+#: builtin/pack-objects.c:3294
+msgid "pack loose unreachable objects"
+msgstr "打包松散的不可达对象"
-#: builtin/name-rev.c:398
-msgid "only use refs matching <pattern>"
-msgstr "å\8fªä½¿ç\94¨å\92\8c <模å¼\8f> ç\9b¸å\8c¹é\85\8dç\9a\84å¼\95ç\94¨"
+#: builtin/pack-objects.c:3296
+msgid "unpack unreachable objects newer than <time>"
+msgstr "å°\86æ¯\94ç»\99å®\9a <æ\97¶é\97´> æ\96°ç\9a\84æ\97 æ³\95访é\97®ç\9a\84对象解å\8c\85"
-#: builtin/name-rev.c:400
-msgid "ignore refs matching <pattern>"
-msgstr "忽略和 <模式> 相匹配的引用"
+#: builtin/pack-objects.c:3299
+msgid "use the sparse reachability algorithm"
+msgstr "使用稀疏可达性算法"
-#: builtin/name-rev.c:402
-msgid "list all commits reachable from all refs"
-msgstr "å\88\97å\87ºå\8f¯ä»¥ä»\8eæ\89\80æ\9c\89å¼\95ç\94¨è®¿é\97®ç\9a\84æ\8f\90交"
+#: builtin/pack-objects.c:3301
+msgid "create thin packs"
+msgstr "å\88\9b建精ç®\80å\8c\85"
-#: builtin/name-rev.c:403
-msgid "read from stdin"
-msgstr "从标准输入读取"
+#: builtin/pack-objects.c:3303
+msgid "create packs suitable for shallow fetches"
+msgstr "创建适合浅克隆仓库获取的包"
-#: builtin/name-rev.c:404
-msgid "allow to print `undefined` names (default)"
-msgstr "å\85\81许æ\89\93å\8d° `æ\9cªå®\9aä¹\89` ç\9a\84å\90\8d称ï¼\88é»\98认ï¼\89"
+#: builtin/pack-objects.c:3305
+msgid "ignore packs that have companion .keep file"
+msgstr "忽ç\95¥é\85\8dæ\9c\89 .keep æ\96\87件ç\9a\84å\8c\85"
-#: builtin/name-rev.c:410
-msgid "dereference tags in the input (internal use)"
-msgstr "å\8f\8då\90\91解æ\9e\90è¾\93å\85¥ä¸ç\9a\84æ \87ç¾ï¼\88å\86\85é\83¨ä½¿ç\94¨ï¼\89"
+#: builtin/pack-objects.c:3307
+msgid "ignore this pack"
+msgstr "忽ç\95¥è¯¥ pack"
-#: builtin/notes.c:26
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
-msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
+#: builtin/pack-objects.c:3309
+msgid "pack compression level"
+msgstr "打包压缩级别"
-#: builtin/notes.c:27
-msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
-msgstr ""
-"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
-"| (-c | -C) <对象>] [<对象>]"
+#: builtin/pack-objects.c:3311
+msgid "do not hide commits by grafts"
+msgstr "显示被移植隐藏的提交"
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
+#: builtin/pack-objects.c:3313
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
-#: builtin/notes.c:29
-msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
-msgstr ""
-"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
-"(-c | -C) <对象>] [<对象>]"
+#: builtin/pack-objects.c:3315
+msgid "write a bitmap index together with the pack index"
+msgstr "在建立包索引的同时创建 bitmap 索引"
-#: builtin/notes.c:30
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
-msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
+#: builtin/pack-objects.c:3318
+msgid "handling for missing objects"
+msgstr "处理丢失的对象"
-#: builtin/notes.c:31
-msgid "git notes [--ref <notes-ref>] show [<object>]"
-msgstr "git notes [--ref <注解引用>] show [<对象>]"
+#: builtin/pack-objects.c:3321
+msgid "do not pack objects in promisor packfiles"
+msgstr "不要打包 promisor 包文件中的对象"
-#: builtin/notes.c:32
-msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
-msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
+#: builtin/pack-objects.c:3323
+msgid "respect islands during delta compression"
+msgstr "在增量压缩时参考数据岛"
-#: builtin/notes.c:33
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
+#: builtin/pack-objects.c:3348
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr "增量链深度 %d 太深了，强制为 %d"
-#: builtin/notes.c:34
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
+#: builtin/pack-objects.c:3353
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d"
-#: builtin/notes.c:35
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
-msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
+#: builtin/pack-objects.c:3407
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
-#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
-msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
+#: builtin/pack-objects.c:3409
+msgid "minimum pack size limit is 1 MiB"
+msgstr "最小的包文件大小是 1 MiB"
-#: builtin/notes.c:37
-msgid "git notes [--ref <notes-ref>] get-ref"
-msgstr "git notes [--ref <注解引用>] get-ref"
+#: builtin/pack-objects.c:3414
+msgid "--thin cannot be used to build an indexable pack"
+msgstr "--thin 不能用于创建一个可索引包"
-#: builtin/notes.c:42
-msgid "git notes [list [<object>]]"
-msgstr "git notes [list [<对象>]]"
+#: builtin/pack-objects.c:3417
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
-#: builtin/notes.c:47
-msgid "git notes add [<options>] [<object>]"
-msgstr "git notes add [<选项>] [<对象>]"
+#: builtin/pack-objects.c:3423
+msgid "cannot use --filter without --stdout"
+msgstr "不能在没有 --stdout 的情况下使用 --filter"
-#: builtin/notes.c:52
-msgid "git notes copy [<options>] <from-object> <to-object>"
-msgstr "git notes copy [<选项>] <源对象> <目标对象>"
+#: builtin/pack-objects.c:3484
+msgid "Enumerating objects"
+msgstr "枚举对象"
-#: builtin/notes.c:53
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
-msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
+#: builtin/pack-objects.c:3514
+#, c-format
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgstr "总共 %<PRIu32> （差异 %<PRIu32>），复用 %<PRIu32> （差异 %<PRIu32>）"
-#: builtin/notes.c:58
-msgid "git notes append [<options>] [<object>]"
-msgstr "git notes append [<选项>] [<对象>]"
+#: builtin/pack-refs.c:8
+msgid "git pack-refs [<options>]"
+msgstr "git pack-refs [<选项>]"
-#: builtin/notes.c:63
-msgid "git notes edit [<object>]"
-msgstr "git notes edit [<对象>]"
+#: builtin/pack-refs.c:16
+msgid "pack everything"
+msgstr "打包一切"
-#: builtin/notes.c:68
-msgid "git notes show [<object>]"
-msgstr "git notes show [<对象>]"
+#: builtin/pack-refs.c:17
+msgid "prune loose refs (default)"
+msgstr "清除松散的引用（默认）"
-#: builtin/notes.c:73
-msgid "git notes merge [<options>] <notes-ref>"
-msgstr "git notes merge [<选项>] <注解引用>"
+#: builtin/prune-packed.c:9
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/notes.c:74
-msgid "git notes merge --commit [<options>]"
-msgstr "git notes merge --commit [<选项>]"
+#: builtin/prune-packed.c:42
+msgid "Removing duplicate objects"
+msgstr "正在删除重复对象"
-#: builtin/notes.c:75
-msgid "git notes merge --abort [<options>]"
-msgstr "git notes merge --abort [<选项>]"
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
-#: builtin/notes.c:80
-msgid "git notes remove [<object>]"
-msgstr "git notes remove [<对象>]"
+#: builtin/prune.c:131
+msgid "report pruned objects"
+msgstr "报告清除的对象"
-#: builtin/notes.c:85
-msgid "git notes prune [<options>]"
-msgstr "git notes prune [<选项>]"
+#: builtin/prune.c:134
+msgid "expire objects older than <time>"
+msgstr "使早于给定时间的对象过期"
-#: builtin/notes.c:90
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
+#: builtin/prune.c:136
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "限制遍历 promisor 包以外的对象"
-#: builtin/notes.c:95
-msgid "Write/edit the notes for the following object:"
-msgstr "为ä¸\8bé\9d¢ç\9a\84对象å\86\99/ç¼\96è¾\91说æ\98\8eï¼\9a"
+#: builtin/prune.c:150
+msgid "cannot prune in a precious-objects repo"
+msgstr "ä¸\8dè\83½å\9c¨ç\8f\8då\93\81ä»\93åº\93ä¸æ\89§è¡\8cæ¸\85ç\90\86æ\93\8dä½\9c"
-#: builtin/notes.c:148
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
-msgid "unable to start 'show' for object '%s'"
-msgstr "不能为对象 '%s' 开始 'show'"
+msgid "Invalid value for %s: %s"
+msgstr "%s 的值无效：%s"
-#: builtin/notes.c:152
-msgid "could not read 'show' output"
-msgstr "不能读取 'show' 的输出"
+#: builtin/pull.c:88
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/notes.c:160
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
-msgstr "无法为对象 '%s' 完成 'show'"
+#: builtin/pull.c:140
+msgid "control for recursive fetching of submodules"
+msgstr "控制子模组的递归获取"
-#: builtin/notes.c:195
-msgid "please supply the note contents using either -m or -F option"
-msgstr "请é\80\9aè¿\87 -m æ\88\96 -F é\80\89项为注解æ\8f\90ä¾\9bå\86\85容"
+#: builtin/pull.c:144
+msgid "Options related to merging"
+msgstr "å\92\8cå\90\88并ç\9b¸å\85³ç\9a\84é\80\89项"
-#: builtin/notes.c:204
-msgid "unable to write note object"
-msgstr "ä¸\8dè\83½å\86\99注解对象"
+#: builtin/pull.c:147
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "使ç\94¨å\8f\98å\9fºæ\93\8dä½\9cå\8f\96代å\90\88并æ\93\8dä½\9c以å\90\88å\85¥ä¿®æ\94¹"
-#: builtin/notes.c:206
-#, c-format
-msgid "the note contents have been left in %s"
-msgstr "注解内容被留在 %s 中"
+#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+msgid "allow fast-forward"
+msgstr "允许快进式"
-#: builtin/notes.c:234 builtin/tag.c:500
-#, c-format
-msgid "cannot read '%s'"
-msgstr "不能读取 '%s'"
+#: builtin/pull.c:184
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "变基操作前后执行自动贮藏和弹出贮藏"
-#: builtin/notes.c:236 builtin/tag.c:503
-#, c-format
-msgid "could not open or read '%s'"
-msgstr "不能打开或读取 '%s'"
+#: builtin/pull.c:200
+msgid "Options related to fetching"
+msgstr "和获取相关的参数"
-#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
-#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
-#, c-format
-msgid "failed to resolve '%s' as a valid ref."
-msgstr "无法解析 '%s' 为一个有效引用。"
+#: builtin/pull.c:210
+msgid "force overwrite of local branch"
+msgstr "强制覆盖本地分支"
-#: builtin/notes.c:258
-#, c-format
-msgid "failed to read object '%s'."
-msgstr "无法读取对象 '%s'。"
+#: builtin/pull.c:218
+msgid "number of submodules pulled in parallel"
+msgstr "并发拉取的子模组的数量"
-#: builtin/notes.c:262
+#: builtin/pull.c:313
#, c-format
-msgid "cannot read note data from non-blob object '%s'."
-msgstr "不能从非数据对象 '%s' 中读取注解数据。"
+msgid "Invalid value for pull.ff: %s"
+msgstr "pull.ff 的取值无效：%s"
-#: builtin/notes.c:302
-#, c-format
-msgid "malformed input line: '%s'."
-msgstr "非法的输入行：'%s'。"
+#: builtin/pull.c:430
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
-#: builtin/notes.c:317
-#, c-format
-msgid "failed to copy notes from '%s' to '%s'"
-msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
+#: builtin/pull.c:432
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
-#. TRANSLATORS: the first %s will be replaced by a git
-#. notes command: 'add', 'merge', 'remove', etc.
-#.
-#: builtin/notes.c:349
+#: builtin/pull.c:433
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
+
+#: builtin/pull.c:436
#, c-format
-msgid "refusing to %s notes in %s (outside of refs/notes/)"
-msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解"
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr ""
+"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
+"分支默认的远程仓库，您必须在命令行中指定一个分支名。"
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
-#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
-#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
-msgid "too many parameters"
-msgstr "参数太多"
+#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr "您当前不在一个分支上。"
-#: builtin/notes.c:382 builtin/notes.c:668
-#, c-format
-msgid "no note found for object %s."
-msgstr "未发现对象 %s 的注解。"
+#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr "请指定您要变基到哪一个分支。"
-#: builtin/notes.c:403 builtin/notes.c:566
-msgid "note contents as a string"
-msgstr "注解内容作为一个字符串"
+#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr "请指定您要合并哪一个分支。"
-#: builtin/notes.c:406 builtin/notes.c:569
-msgid "note contents in a file"
-msgstr "注解内容到一个文件中"
+#: builtin/pull.c:446 builtin/pull.c:461
+msgid "See git-pull(1) for details."
+msgstr "详见 git-pull(1)。"
-#: builtin/notes.c:409 builtin/notes.c:572
-msgid "reuse and edit specified note object"
-msgstr "重用和编辑指定的注解对象"
+#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
+#: builtin/rebase.c:1327 git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<远程>"
-#: builtin/notes.c:412 builtin/notes.c:575
-msgid "reuse specified note object"
-msgstr "重用指定的注解对象"
+#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<分支>"
-#: builtin/notes.c:415 builtin/notes.c:578
-msgid "allow storing empty note"
-msgstr "å\85\81许ä¿\9då\98空ç\99½æ³¨é\87\8a"
+#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr "å½\93å\89\8då\88\86æ\94¯æ²¡æ\9c\89è·\9f踪信æ\81¯ã\80\82"
-#: builtin/notes.c:416 builtin/notes.c:487
-msgid "replace existing notes"
-msgstr "替换已存在的注解"
+#: builtin/pull.c:465 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
-#: builtin/notes.c:441
+#: builtin/pull.c:470
#, c-format
msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
-msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+"您的配置中指定要合并远程的引用 '%s'，\n"
+"但是没有获取到这个引用。"
-#: builtin/notes.c:456 builtin/notes.c:535
+#: builtin/pull.c:574
#, c-format
-msgid "Overwriting existing notes for object %s\n"
-msgstr "覆盖对象 %s 现存注解\n"
+msgid "unable to access commit %s"
+msgstr "无法访问提交 %s"
-#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
-#, c-format
-msgid "Removing note for object %s\n"
-msgstr "删除对象 %s 的注解\n"
+#: builtin/pull.c:854
+msgid "ignoring --verify-signatures for rebase"
+msgstr "为变基操作忽略 --verify-signatures"
-#: builtin/notes.c:488
-msgid "read objects from stdin"
-msgstr "从标准输入读取对象"
+#: builtin/pull.c:909
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
-#: builtin/notes.c:490
-msgid "load rewriting config for <command> (implies --stdin)"
-msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
+#: builtin/pull.c:917
+msgid "Updating an unborn branch with changes added to the index."
+msgstr "更新尚未诞生的分支，变更添加至索引。"
-#: builtin/notes.c:508
-msgid "too few parameters"
-msgstr "å\8f\82æ\95°å¤ªå°\91"
+#: builtin/pull.c:921
+msgid "pull with rebase"
+msgstr "å\8f\98å\9fºå¼\8fæ\8b\89å\8f\96"
-#: builtin/notes.c:529
-#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
-msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
+#: builtin/pull.c:922
+msgid "please commit or stash them."
+msgstr "请提交或贮藏它们。"
-#: builtin/notes.c:541
+#: builtin/pull.c:947
#, c-format
-msgid "missing notes on source object %s. Cannot copy."
-msgstr "源对象 %s 缺少注解。不能拷贝。"
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"fetch 更新了当前的分支。快进您的工作区\n"
+"至提交 %s。"
-#: builtin/notes.c:593
+#: builtin/pull.c:953
#, c-format
msgid ""
-"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
-"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
msgstr ""
-"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
-"请换用 'git notes add -f -m/-F/-c/-C'。\n"
+"您当前的工作区无法执行快进操作。\n"
+"首先执行如下命令：\n"
+"$ git diff %s\n"
+"以确认所有有用的数据均已保存。然后执行下面的命令\n"
+"$ git reset --hard\n"
+"恢复之前的状态。"
-#: builtin/notes.c:688
-msgid "failed to delete ref NOTES_MERGE_PARTIAL"
-msgstr "æ\97 æ³\95å\88 é\99¤å¼\95ç\94¨ NOTES_MERGE_PARTIAL"
+#: builtin/pull.c:968
+msgid "Cannot merge multiple branches into empty head."
+msgstr "æ\97 æ³\95å°\86å¤\9a个å\88\86æ\94¯å\90\88并å\88°ç©ºå\88\86æ\94¯ã\80\82"
-#: builtin/notes.c:690
-msgid "failed to delete ref NOTES_MERGE_REF"
-msgstr "æ\97 æ³\95å\88 é\99¤å¼\95ç\94¨ NOTES_MERGE_REF"
+#: builtin/pull.c:972
+msgid "Cannot rebase onto multiple branches."
+msgstr "æ\97 æ³\95å\8f\98å\9fºå\88°å¤\9a个å\88\86æ\94¯ã\80\82"
-#: builtin/notes.c:692
-msgid "failed to remove 'git notes merge' worktree"
-msgstr "æ\97 æ³\95å\88 é\99¤ 'git notes merge' å·¥ä½\9cå\8cº"
+#: builtin/pull.c:979
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr "æ\9c¬å\9c°å\90模ç»\84ä¸æ\9c\89ä¿®æ\94¹ï¼\8cæ\97 æ³\95å\8f\98å\9fº"
-#: builtin/notes.c:712
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
-msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/notes.c:714
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
-msgstr "æ\97 æ³\95ä»\8e NOTES_MERGE_PARTIAL ä¸æ\89¾å\88°æ\8f\90交ã\80\82"
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
+msgstr "æ \87ç¾å\90\8eé\9d¢æ\9cªæ\8f\90ä¾\9b <æ \87ç¾> å\8f\82æ\95°"
-#: builtin/notes.c:716
-msgid "could not parse commit from NOTES_MERGE_PARTIAL."
-msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
+#: builtin/push.c:121
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete 只接受简单的目标引用名"
-#: builtin/notes.c:729
-msgid "failed to resolve NOTES_MERGE_REF"
-msgstr "无法解析 NOTES_MERGE_REF"
+#: builtin/push.c:167
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+"\n"
+"为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
-#: builtin/notes.c:732
-msgid "failed to finalize notes merge"
-msgstr "无法完成注解合并"
+#: builtin/push.c:170
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch. To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+" git push %s HEAD\n"
+"%s"
+msgstr ""
+"您当前分支的上游分支和您当前分支名不匹配，为推送到远程的上游分支，\n"
+"使用\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"为推送至远程同名分支，使用\n"
+"\n"
+" git push %s HEAD\n"
+"%s"
-#: builtin/notes.c:758
+#: builtin/push.c:185
#, c-format
-msgid "unknown notes merge strategy %s"
-msgstr "未知的注解合并策略 %s"
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+" git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+"您当前不在一个分支上。\n"
+"现在为推送当前（分离头指针）的历史，使用\n"
+"\n"
+" git push %s HEAD:<远程分支名字>\n"
-#: builtin/notes.c:774
-msgid "General options"
-msgstr "通用选项"
+#: builtin/push.c:199
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+" git push --set-upstream %s %s\n"
+msgstr ""
+"当前分支 %s 没有对应的上游分支。\n"
+"为推送当前分支并建立与远程上游的跟踪，使用\n"
+"\n"
+" git push --set-upstream %s %s\n"
-#: builtin/notes.c:776
-msgid "Merge options"
-msgstr "合并选项"
+#: builtin/push.c:207
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
-#: builtin/notes.c:778
+#: builtin/push.c:210
+#, c-format
msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
-msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
+"You are pushing to remote '%s', which is not the upstream of\n"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr ""
+"您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
+"而没有告诉我要推送什么、更新哪个远程分支。"
-#: builtin/notes.c:780
-msgid "Committing unmerged notes"
-msgstr "提交未合并的注解"
+#: builtin/push.c:269
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。"
-#: builtin/notes.c:782
-msgid "finalize notes merge by committing unmerged notes"
-msgstr "通过提交未合并的注解来完成注解合并"
+#: builtin/push.c:276
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n"
+"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
+"'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/notes.c:784
-msgid "Aborting notes merge resolution"
-msgstr "中止注解合并的方案"
+#: builtin/push.c:282
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and integrate the remote changes\n"
+"(e.g. 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
+"检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"
+"'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/notes.c:786
-msgid "abort notes merge"
-msgstr "中止注解合并"
+#: builtin/push.c:288
+msgid ""
+"Updates were rejected because the remote contains work that you do\n"
+"not have locally. This is usually caused by another repository pushing\n"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"更新被拒绝，因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
+"一个仓库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n"
+"（如 'git pull ...'）。\n"
+"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/notes.c:797
-msgid "cannot mix --commit, --abort or -s/--strategy"
-msgstr "不能混用 --commit、--abort 或 -s/--strategy"
+#: builtin/push.c:295
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr "更新被拒绝，因为该标签在远程已经存在。"
-#: builtin/notes.c:802
-msgid "must specify a notes ref to merge"
-msgstr "必须指定一个注解引用来合并"
+#: builtin/push.c:298
+msgid ""
+"You cannot update a remote ref that points at a non-commit object,\n"
+"or update a remote ref to make it point at a non-commit object,\n"
+"without using the '--force' option.\n"
+msgstr ""
+"如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
+"也不能更新远程引用让其指向一个非提交对象。\n"
-#: builtin/notes.c:826
+#: builtin/push.c:359
#, c-format
-msgid "unknown -s/--strategy: %s"
-msgstr "æ\9cªç\9f¥ç\9a\84 -s/--strategyï¼\9a%s"
+msgid "Pushing to %s\n"
+msgstr "æ\8e¨é\80\81å\88° %s\n"
-#: builtin/notes.c:863
+#: builtin/push.c:364
#, c-format
-msgid "a notes merge into %s is already in-progress at %s"
-msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
+msgid "failed to push some refs to '%s'"
+msgstr "推送一些引用到 '%s' 失败"
-#: builtin/notes.c:866
+#: builtin/push.c:398
#, c-format
-msgid "failed to store link to current notes ref (%s)"
-msgstr "无法存储链接到当前的注解引用（%s）"
+msgid "bad repository '%s'"
+msgstr "坏的仓库 '%s'"
-#: builtin/notes.c:868
-#, c-format
+#: builtin/push.c:399
msgid ""
-"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
-"'git notes merge --commit', or abort the merge with 'git notes merge --"
-"abort'.\n"
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+" git push <name>\n"
msgstr ""
-"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
-"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
+"没有配置推送目标。\n"
+"或通过命令行指定 URL，或用下面命令配置一个远程仓库\n"
+"\n"
+" git remote add <名称> <地址>\n"
+"\n"
+"然后使用该远程仓库名执行推送\n"
+"\n"
+" git push <名称>\n"
-#: builtin/notes.c:890
-#, c-format
-msgid "Object %s has no note\n"
-msgstr "对象 %s 没有注解\n"
+#: builtin/push.c:554
+msgid "repository"
+msgstr "仓库"
+
+#: builtin/push.c:555 builtin/send-pack.c:164
+msgid "push all refs"
+msgstr "推送所有引用"
+
+#: builtin/push.c:556 builtin/send-pack.c:166
+msgid "mirror all refs"
+msgstr "镜像所有引用"
+
+#: builtin/push.c:558
+msgid "delete refs"
+msgstr "删除引用"
+
+#: builtin/push.c:559
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr "推送标签（不能使用 --all or --mirror）"
+
+#: builtin/push.c:562 builtin/send-pack.c:167
+msgid "force updates"
+msgstr "强制更新"
-#: builtin/notes.c:902
-msgid "attempt to remove non-existent note is not an error"
-msgstr "尝试删除不存在的注解不是一个错误"
+#: builtin/push.c:564 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
+msgstr "<引用名>:<期望值>"
-#: builtin/notes.c:905
-msgid "read object names from the standard input"
-msgstr "从标准输入读取对象名称"
+#: builtin/push.c:565 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
+msgstr "要求引用旧的取值为设定值"
-#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
-msgid "do not remove, show only"
-msgstr "不删除，只显示"
+#: builtin/push.c:568
+msgid "control recursive pushing of submodules"
+msgstr "控制子模组的递归推送"
-#: builtin/notes.c:944
-msgid "report pruned notes"
-msgstr "报告清除的注解"
+#: builtin/push.c:570 builtin/send-pack.c:175
+msgid "use thin pack"
+msgstr "使用精简打包"
-#: builtin/notes.c:986
-msgid "notes-ref"
-msgstr "注解引用"
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
+msgstr "接收包程序"
-#: builtin/notes.c:987
-msgid "use notes from <notes-ref>"
-msgstr "从 <注解引用> 使用注解"
+#: builtin/push.c:573
+msgid "set upstream for git pull/status"
+msgstr "设置 git pull/status 的上游"
-#: builtin/notes.c:1022
-#, c-format
-msgid "unknown subcommand: %s"
-msgstr "未知子命令：%s"
+#: builtin/push.c:576
+msgid "prune locally removed refs"
+msgstr "清除本地删除的引用"
-#: builtin/pack-objects.c:31
-msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
+#: builtin/push.c:578
+msgid "bypass pre-push hook"
+msgstr "绕过 pre-push 钩子"
-#: builtin/pack-objects.c:32
-msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
+#: builtin/push.c:579
+msgid "push missing but relevant tags"
+msgstr "推送缺失但有关的标签"
-#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
-#, c-format
-msgid "deflate error (%d)"
-msgstr "压缩错误 (%d)"
+#: builtin/push.c:582 builtin/send-pack.c:169
+msgid "GPG sign the push"
+msgstr "用 GPG 为推送签名"
-#: builtin/pack-objects.c:777
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
-msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
+#: builtin/push.c:584 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
+msgstr "需要远端支持原子事务"
-#: builtin/pack-objects.c:790
-msgid "Writing objects"
-msgstr "写入对象中"
+#: builtin/push.c:602
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
-#: builtin/pack-objects.c:1070
-msgid "disabling bitmap writing, as some objects are not being packed"
-msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
+#: builtin/push.c:604
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete 未接任何引用没有意义"
-#: builtin/pack-objects.c:2440
-msgid "Compressing objects"
-msgstr "压缩对象中"
+#: builtin/push.c:607
+msgid "--all and --tags are incompatible"
+msgstr "--all 和 --tags 不兼容"
-#: builtin/pack-objects.c:2849
-#, c-format
-msgid "unsupported index version %s"
-msgstr "不支持的索引版本 %s"
+#: builtin/push.c:609
+msgid "--all can't be combined with refspecs"
+msgstr "--all 不能和引用规格同时使用"
-#: builtin/pack-objects.c:2853
-#, c-format
-msgid "bad index version '%s'"
-msgstr "坏的索引版本 '%s'"
+#: builtin/push.c:613
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror 和 --tags 不兼容"
-#: builtin/pack-objects.c:2883
-msgid "do not show progress meter"
-msgstr "ä¸\8dæ\98¾ç¤ºè¿\9b度表"
+#: builtin/push.c:615
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror ä¸\8dè\83½å\92\8cå¼\95ç\94¨è§\84æ ¼å\90\8cæ\97¶ä½¿ç\94¨"
-#: builtin/pack-objects.c:2885
-msgid "show progress meter"
-msgstr "显示进度表"
+#: builtin/push.c:618
+msgid "--all and --mirror are incompatible"
+msgstr "--all 和 --mirror 不兼容"
-#: builtin/pack-objects.c:2887
-msgid "show progress meter during object writing phase"
-msgstr "在对象写入阶段显示进度表"
+#: builtin/push.c:637
+msgid "push options must not have new line characters"
+msgstr "推送选项不能有换行符"
-#: builtin/pack-objects.c:2890
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "当进度表显示时类似于 --all-progress"
+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
-#: builtin/pack-objects.c:2891
-msgid "version[,offset]"
-msgstr "版本[,偏移]"
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
-#: builtin/pack-objects.c:2892
-msgid "write the pack index file in the specified idx format version"
-msgstr "用指定的 idx 格式版本来写包索引文件"
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
-#: builtin/pack-objects.c:2895
-msgid "maximum size of each output pack file"
-msgstr "每个输出包的最大尺寸"
+#: builtin/range-diff.c:21
+msgid "Percentage by which creation is weighted"
+msgstr "创建权重的百分比"
-#: builtin/pack-objects.c:2897
-msgid "ignore borrowed objects from alternate object store"
-msgstr "忽略从备用对象存储里借用对象"
+#: builtin/range-diff.c:23
+msgid "use simple diff colors"
+msgstr "使用简单差异颜色"
-#: builtin/pack-objects.c:2899
-msgid "ignore packed objects"
-msgstr "忽略包对象"
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#, c-format
+msgid "no .. in range: '%s'"
+msgstr "没有在范围中使用 ..：'%s'"
-#: builtin/pack-objects.c:2901
-msgid "limit pack window by objects"
-msgstr "限制打包窗口的对象数"
+#: builtin/range-diff.c:60
+msgid "single arg format must be symmetric range"
+msgstr "单个参数格式必须是对称范围（即包含...）"
-#: builtin/pack-objects.c:2903
-msgid "limit pack window by memory in addition to object limit"
-msgstr "é\99¤å¯¹è±¡æ\95°é\87\8fé\99\90å\88¶å¤\96设置æ\89\93å\8c\85çª\97å\8f£ç\9a\84å\86\85å\98é\99\90å\88¶"
+#: builtin/range-diff.c:75
+msgid "need two commit ranges"
+msgstr "é\9c\80è¦\81两个æ\8f\90交è\8c\83å\9b´"
-#: builtin/pack-objects.c:2905
-msgid "maximum length of delta chain allowed in the resulting pack"
-msgstr "打包允许的 delta 链的最大长度"
+#: builtin/read-tree.c:41
+msgid ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
+"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
-#: builtin/pack-objects.c:2907
-msgid "reuse existing deltas"
-msgstr "重用已存在的 deltas"
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
+msgstr "将索引结果写入 <文件>"
-#: builtin/pack-objects.c:2909
-msgid "reuse existing objects"
-msgstr "重用已存在的对象"
+#: builtin/read-tree.c:127
+msgid "only empty the index"
+msgstr "只是清空索引"
-#: builtin/pack-objects.c:2911
-msgid "use OFS_DELTA objects"
-msgstr "使用 OFS_DELTA 对象"
+#: builtin/read-tree.c:129
+msgid "Merging"
+msgstr "合并"
-#: builtin/pack-objects.c:2913
-msgid "use threads when searching for best delta matches"
-msgstr "使用线程查询最佳 delta 匹配"
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
+msgstr "读取之余再执行一个合并"
-#: builtin/pack-objects.c:2915
-msgid "do not create an empty pack output"
-msgstr "不创建空的包输出"
+#: builtin/read-tree.c:133
+msgid "3-way merge if no file level merging required"
+msgstr "如果没有文件级合并需要，执行三方合并"
-#: builtin/pack-objects.c:2917
-msgid "read revision arguments from standard input"
-msgstr "从标准输入读取版本号参数"
+#: builtin/read-tree.c:135
+msgid "3-way merge in presence of adds and removes"
+msgstr "存在添加和删除时，也执行三方合并"
-#: builtin/pack-objects.c:2919
-msgid "limit the objects to those that are not yet packed"
-msgstr "限制那些尚未打包的对象"
+#: builtin/read-tree.c:137
+msgid "same as -m, but discard unmerged entries"
+msgstr "类似于 -m，但丢弃未合并的条目"
-#: builtin/pack-objects.c:2922
-msgid "include objects reachable from any reference"
-msgstr "包括可以从任何引用访问到的对象"
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
+msgstr "<子目录>/"
-#: builtin/pack-objects.c:2925
-msgid "include objects referred by reflog entries"
-msgstr "包括被引用日志引用到的对象"
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "读取树对象到索引的 <子目录>/ 下"
-#: builtin/pack-objects.c:2928
-msgid "include objects referred to by the index"
-msgstr "包括被索引引用到的对象"
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
+msgstr "用合并的结果更新工作区"
-#: builtin/pack-objects.c:2931
-msgid "output pack to stdout"
-msgstr "输出包到标准输出"
+#: builtin/read-tree.c:144
+msgid "gitignore"
+msgstr "gitignore"
-#: builtin/pack-objects.c:2933
-msgid "include tag objects that refer to objects to be packed"
-msgstr "å\8c\85æ\8b¬é\82£äº\9bå¼\95ç\94¨äº\86å¾\85æ\89\93å\8c\85对象ç\9a\84æ \87ç¾å¯¹è±¡"
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "å\85\81许忽ç\95¥æ\96\87件ä¸è®¾å®\9aç\9a\84æ\96\87件å\8f¯ä»¥è¢«è¦\86ç\9b\96"
-#: builtin/pack-objects.c:2935
-msgid "keep unreachable objects"
-msgstr "维持不可达的对象"
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
+msgstr "合并后不检查工作区"
-#: builtin/pack-objects.c:2937
-msgid "pack loose unreachable objects"
-msgstr "打包松散的不可达对象"
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
+msgstr "不更新索引区和工作区"
-#: builtin/pack-objects.c:2939
-msgid "unpack unreachable objects newer than <time>"
-msgstr "将比给定 <时间> 新的无法访问的对象解包"
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
+msgstr "跳过应用稀疏检出过滤器"
-#: builtin/pack-objects.c:2942
-msgid "create thin packs"
-msgstr "创建精简包"
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
+msgstr "调试 unpack-trees"
-#: builtin/pack-objects.c:2944
-msgid "create packs suitable for shallow fetches"
-msgstr "创建适合浅克隆仓库获取的包"
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "抑制反馈信息"
-#: builtin/pack-objects.c:2946
-msgid "ignore packs that have companion .keep file"
-msgstr "忽略配有 .keep 文件的包"
+#: builtin/rebase.c:32
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
+msgstr ""
+"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] [<上游>] [<分支>]"
-#: builtin/pack-objects.c:2948
-msgid "pack compression level"
-msgstr "打包压缩级别"
+#: builtin/rebase.c:34
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
-#: builtin/pack-objects.c:2950
-msgid "do not hide commits by grafts"
-msgstr "显示被嫁接隐藏的提交"
+#: builtin/rebase.c:36
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
+msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/pack-objects.c:2952
-msgid "use a bitmap index if available to speed up counting objects"
-msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "不可用的待办列表：'%s'"
-#: builtin/pack-objects.c:2954
-msgid "write a bitmap index together with the pack index"
-msgstr "在建立包索引的同时创建 bitmap 索引"
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr "不能写入 '%s'。"
-#: builtin/pack-objects.c:3081
-msgid "Counting objects"
-msgstr "对象计数中"
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr "没有 HEAD？"
-#: builtin/pack-refs.c:6
-msgid "git pack-refs [<options>]"
-msgstr "git pack-refs [<选项>]"
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr "无法创建临时的 %s"
-#: builtin/pack-refs.c:14
-msgid "pack everything"
-msgstr "æ\89\93å\8c\85ä¸\80å\88\87"
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr "æ\97 æ³\95æ \87记为交äº\92å¼\8f"
-#: builtin/pack-refs.c:15
-msgid "prune loose refs (default)"
-msgstr "æ¸\85é\99¤æ\9d¾æ\95£ç\9a\84å¼\95ç\94¨ï¼\88é»\98认ï¼\89"
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr "æ\97 æ³\95ç\94\9fæ\88\90å¾\85å\8a\9eå\88\97表"
-#: builtin/prune-packed.c:8
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
-#: builtin/prune-packed.c:41
-msgid "Removing duplicate objects"
-msgstr "正在删除重复对象"
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr "git rebase--interactive [<选项>]"
-#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr "保持空提交"
-#: builtin/prune.c:106
-msgid "report pruned objects"
-msgstr "报告清除的对象"
+#: builtin/rebase.c:451 builtin/revert.c:127
+msgid "allow commits with empty messages"
+msgstr "允许提交说明为空"
-#: builtin/prune.c:109
-msgid "expire objects older than <time>"
-msgstr "使早于给定时间的对象过期"
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr "对合并提交变基"
-#: builtin/prune.c:123
-msgid "cannot prune in a precious-objects repo"
-msgstr "ä¸\8dè\83½å\9c¨ç\8f\8då\93\81ä»\93åº\93ä¸æ\89§è¡\8cæ¸\85ç\90\86æ\93\8dä½\9c"
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr "ä¿\9dæ\8c\81å\85\84å¼\9fæ\8f\90交ç\9a\84å\8e\9få§\8bå\88\86æ\94¯ç\82¹"
-#: builtin/pull.c:54 builtin/pull.c:56
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "%s 的值无效：%s"
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr "移动以 squash!/fixup! 开头的提交"
-#: builtin/pull.c:76
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr "签名提交"
-#: builtin/pull.c:124
-msgid "control for recursive fetching of submodules"
-msgstr "æ\8e§å\88¶å\90模ç»\84ç\9a\84é\80\92å½\92è\8e·å\8f\96"
+#: builtin/rebase.c:459 builtin/rebase.c:1397
+msgid "display a diffstat of what changed upstream"
+msgstr "æ\98¾ç¤ºä¸\8a游å\8f\98å\8c\96ç\9a\84å·®å¼\82ç»\9f计"
-#: builtin/pull.c:128
-msgid "Options related to merging"
-msgstr "和合并相关的选项"
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr "继续变基"
-#: builtin/pull.c:131
-msgid "incorporate changes by rebasing rather than merging"
-msgstr "使用变基操作取代合并操作以合入修改"
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr "跳过提交"
-#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
-msgid "allow fast-forward"
-msgstr "å\85\81许快è¿\9bå¼\8f"
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr "å\8f\98å\9fºå¾\85å\8a\9eå\88\97表"
-#: builtin/pull.c:164
-msgid "automatically stash/stash pop before and after rebase"
-msgstr "变基操作前后执行自动贮藏和弹出贮藏"
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr "显示当前补丁"
-#: builtin/pull.c:180
-msgid "Options related to fetching"
-msgstr "和获取相关的参数"
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr "缩短待办列表中的提交号"
-#: builtin/pull.c:198
-msgid "number of submodules pulled in parallel"
-msgstr "并发拉取的子模组的数量"
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr "扩展待办列表中的提交号"
-#: builtin/pull.c:287
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "pull.ff 的取值无效：%s"
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr "检查待办列表"
-#: builtin/pull.c:403
-msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
-msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr "重新排列 fixup/squash 行"
+
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr "在待办列表中插入 exec 执行命令"
-#: builtin/pull.c:405
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
-msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr "onto"
-#: builtin/pull.c:406
-msgid ""
-"Generally this means that you provided a wildcard refspec which had no\n"
-"matches on the remote end."
-msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
+#: builtin/rebase.c:481
+msgid "restrict-revision"
+msgstr "restrict-revision"
-#: builtin/pull.c:409
-#, c-format
-msgid ""
-"You asked to pull from the remote '%s', but did not specify\n"
-"a branch. Because this is not the default configured remote\n"
-"for your current branch, you must specify a branch on the command line."
-msgstr ""
-"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
-"分支默认的远程仓库，您必须在命令行中指定一个分支名。"
+#: builtin/rebase.c:481
+msgid "restrict revision"
+msgstr "限制版本"
-#: builtin/pull.c:414 git-parse-remote.sh:73
-msgid "You are not currently on a branch."
-msgstr "您当前不在一个分支上。"
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr "squash-onto"
-#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
-msgid "Please specify which branch you want to rebase against."
-msgstr "请指定您要变基到哪一个分支。"
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr "squash onto"
-#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
-msgid "Please specify which branch you want to merge with."
-msgstr "请指定您要合并哪一个分支。"
+#: builtin/rebase.c:486
+msgid "the upstream commit"
+msgstr "上游提交"
-#: builtin/pull.c:419 builtin/pull.c:434
-msgid "See git-pull(1) for details."
-msgstr "详见 git-pull(1)。"
+#: builtin/rebase.c:488
+msgid "head-name"
+msgstr "head-name"
-#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
-#: git-parse-remote.sh:64
-msgid "<remote>"
-msgstr "<远程>"
+#: builtin/rebase.c:488
+msgid "head name"
+msgstr "head 名称"
-#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
-#: git-parse-remote.sh:65
-msgid "<branch>"
-msgstr "<分支>"
+#: builtin/rebase.c:493
+msgid "rebase strategy"
+msgstr "变基策略"
-#: builtin/pull.c:429 git-parse-remote.sh:75
-msgid "There is no tracking information for the current branch."
-msgstr "当前分支没有跟踪信息。"
+#: builtin/rebase.c:494
+msgid "strategy-opts"
+msgstr "strategy-opts"
-#: builtin/pull.c:438 git-parse-remote.sh:95
-msgid ""
-"If you wish to set tracking information for this branch you can do so with:"
-msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
+#: builtin/rebase.c:495
+msgid "strategy options"
+msgstr "策略选项"
-#: builtin/pull.c:443
-#, c-format
-msgid ""
-"Your configuration specifies to merge with the ref '%s'\n"
-"from the remote, but no such ref was fetched."
-msgstr ""
-"您的配置中指定要合并远程的引用 '%s'，\n"
-"但是没有获取到这个引用。"
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr "切换到"
-#: builtin/pull.c:796
-msgid "ignoring --verify-signatures for rebase"
-msgstr "为变基操作忽略 --verify-signatures"
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr "要检出的分支或提交"
-#: builtin/pull.c:844
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
+#: builtin/rebase.c:498
+msgid "onto-name"
+msgstr "onto-name"
-#: builtin/pull.c:852
-msgid "Updating an unborn branch with changes added to the index."
-msgstr "更新尚未诞生的分支，变更添加至索引。"
+#: builtin/rebase.c:498
+msgid "onto name"
+msgstr "onto name"
-#: builtin/pull.c:855
-msgid "pull with rebase"
-msgstr "变基式拉取"
+#: builtin/rebase.c:499
+msgid "cmd"
+msgstr "cmd"
-#: builtin/pull.c:856
-msgid "please commit or stash them."
-msgstr "请æ\8f\90交æ\88\96è´®è\97\8få®\83们ã\80\82"
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr "è¦\81æ\89§è¡\8cç\9a\84å\91½ä»¤"
-#: builtin/pull.c:881
-#, c-format
-msgid ""
-"fetch updated the current branch head.\n"
-"fast-forwarding your working tree from\n"
-"commit %s."
-msgstr ""
-"fetch 更新了当前的分支。快进您的工作区\n"
-"至提交 %s。"
+#: builtin/rebase.c:502 builtin/rebase.c:1480
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "自动重新安排任何失败的 `exec`"
-#: builtin/pull.c:886
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果"
+
+#: builtin/rebase.c:534 builtin/rebase.c:1787
#, c-format
-msgid ""
-"Cannot fast-forward your working tree.\n"
-"After making sure that you saved anything precious from\n"
-"$ git diff %s\n"
-"output, run\n"
-"$ git reset --hard\n"
-"to recover."
-msgstr ""
-"您当前的工作区无法执行快进操作。\n"
-"首先执行如下命令：\n"
-"$ git diff %s\n"
-"以确认所有有用的数据均已保存。然后执行下面的命令\n"
-"$ git reset --hard\n"
-"恢复之前的状态。"
+msgid "%s requires an interactive rebase"
+msgstr "%s 需要交互式变基"
-#: builtin/pull.c:901
-msgid "Cannot merge multiple branches into empty head."
-msgstr "无法将多个分支合并到空分支。"
+#: builtin/rebase.c:586
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr "无法获取 'onto'：'%s'"
-#: builtin/pull.c:905
-msgid "Cannot rebase onto multiple branches."
-msgstr "无法变基到多个分支。"
+#: builtin/rebase.c:601
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr "无效的原始 head：'%s'"
-#: builtin/pull.c:912
-msgid "cannot rebase with locally recorded submodule modifications"
-msgstr "本地子模组中有修改，无法变基"
+#: builtin/rebase.c:626
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr "忽略无效的 allow_rerere_autoupdate：'%s'"
-#: builtin/push.c:17
-msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
+#: builtin/rebase.c:702
+#, c-format
+msgid "Could not read '%s'"
+msgstr "不能读取 '%s'"
-#: builtin/push.c:90
-msgid "tag shorthand without <tag>"
-msgstr "标签后面未提供 <标签> 参数"
+#: builtin/rebase.c:720
+#, c-format
+msgid "Cannot store %s"
+msgstr "不能存储 %s"
-#: builtin/push.c:100
-msgid "--delete only accepts plain target ref names"
-msgstr "--delete 只接受简单的目标引用名"
+#: builtin/rebase.c:817
+msgid "could not determine HEAD revision"
+msgstr "不能确定 HEAD 版本"
-#: builtin/push.c:144
+#: builtin/rebase.c:940
msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
msgstr ""
-"\n"
-"为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
+"手工解决所有冲突，执行 \"git add/rm <冲突的文件>\" 标记\n"
+"冲突已解决，然后执行 \"git rebase --continue\"。您也可以执行\n"
+"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
+"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
-#: builtin/push.c:147
+#: builtin/rebase.c:1021
#, c-format
msgid ""
-"The upstream branch of your current branch does not match\n"
-"the name of your current branch. To push to the upstream branch\n"
-"on the remote, use\n"
"\n"
-" git push %s HEAD:%s\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
"\n"
-"To push to the branch of the same name on the remote, use\n"
+" %s\n"
"\n"
-" git push %s %s\n"
-"%s"
+"As a result, git cannot rebase them."
msgstr ""
-"如果您当前分支的上游分支和您当前分支名不匹配，为推送到远程的\n"
-"上游分支，使用\n"
"\n"
-" git push %s HEAD:%s\n"
+"在为重放这些版本而准备补丁时，git 遇到了一个错误：\n"
"\n"
-"为推送至远程同名分支，使用\n"
+" %s\n"
"\n"
-" git push %s %s\n"
-"%s"
+"因此 git 无法对其变基。"
-#: builtin/push.c:162
+#: builtin/rebase.c:1313
#, c-format
msgid ""
-"You are not currently on a branch.\n"
-"To push the history leading to the current (detached HEAD)\n"
-"state now, use\n"
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+" git rebase '<branch>'\n"
"\n"
-" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
-"您当前不在一个分支上。\n"
-"现在为推送当前（分离头指针）的历史，使用\n"
+"%s\n"
+"请指定您要变基到哪个分支。\n"
+"详见 git-rebase(1)。\n"
+"\n"
+" git rebase '<branch>'\n"
"\n"
-" git push %s HEAD:<远程分支名字>\n"
-#: builtin/push.c:176
+#: builtin/rebase.c:1329
#, c-format
msgid ""
-"The current branch %s has no upstream branch.\n"
-"To push the current branch and set the remote as upstream, use\n"
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-" git push --set-upstream %s %s\n"
msgstr ""
-"当前分支 %s 没有对应的上游分支。\n"
-"为推送当前分支并建立与远程上游的跟踪，使用\n"
+"如果您想要为此分支创建跟踪信息，您可以执行：\n"
+"\n"
+" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-" git push --set-upstream %s %s\n"
-#: builtin/push.c:184
-#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
-msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
+#: builtin/rebase.c:1359
+msgid "exec commands cannot contain newlines"
+msgstr "exec 命令不能包含换行符"
-#: builtin/push.c:187
-#, c-format
-msgid ""
-"You are pushing to remote '%s', which is not the upstream of\n"
-"your current branch '%s', without telling me what to push\n"
-"to update which remote branch."
-msgstr ""
-"您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
-"而没有告诉我要推送什么、更新哪个远程分支。"
+#: builtin/rebase.c:1363
+msgid "empty exec command"
+msgstr "空的 exec 命令"
-#: builtin/push.c:246
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。"
+#: builtin/rebase.c:1390
+msgid "rebase onto given branch instead of upstream"
+msgstr "变基到给定的分支而非上游"
-#: builtin/push.c:253
-msgid ""
-"Updates were rejected because the tip of your current branch is behind\n"
-"its remote counterpart. Integrate the remote changes (e.g.\n"
-"'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr ""
-"更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n"
-"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
-"'git push --help' 中的 'Note about fast-forwards' 小节。"
+#: builtin/rebase.c:1392
+msgid "allow pre-rebase hook to run"
+msgstr "允许执行 pre-rebase 钩子"
-#: builtin/push.c:259
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. Check out this branch and integrate the remote changes\n"
-"(e.g. 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr ""
-"更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
-"检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"
-"'git push --help' 中的 'Note about fast-forwards' 小节。"
+#: builtin/rebase.c:1394
+msgid "be quiet. implies --no-stat"
+msgstr "安静。暗示 --no-stat"
-#: builtin/push.c:265
-msgid ""
-"Updates were rejected because the remote contains work that you do\n"
-"not have locally. This is usually caused by another repository pushing\n"
-"to the same ref. You may want to first integrate the remote changes\n"
-"(e.g., 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr ""
-"更新被拒绝，因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
-"一个仓库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n"
-"（如 'git pull ...'）。\n"
-"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
+#: builtin/rebase.c:1400
+msgid "do not show diffstat of what changed upstream"
+msgstr "不显示上游变化的差异统计"
-#: builtin/push.c:272
-msgid "Updates were rejected because the tag already exists in the remote."
-msgstr "更新被拒绝，因为该标签在远程已经存在。"
+#: builtin/rebase.c:1403
+msgid "add a Signed-off-by: line to each commit"
+msgstr "为每一个提交添加一个 Signed-off-by: 签名"
-#: builtin/push.c:275
-msgid ""
-"You cannot update a remote ref that points at a non-commit object,\n"
-"or update a remote ref to make it point at a non-commit object,\n"
-"without using the '--force' option.\n"
-msgstr ""
-"如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
-"也不能更新远程引用让其指向一个非提交对象。\n"
+#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+msgid "passed to 'git am'"
+msgstr "传递给 'git am'"
-#: builtin/push.c:335
-#, c-format
-msgid "Pushing to %s\n"
-msgstr "推送到 %s\n"
+#: builtin/rebase.c:1413 builtin/rebase.c:1415
+msgid "passed to 'git apply'"
+msgstr "传递给 'git apply'"
-#: builtin/push.c:339
-#, c-format
-msgid "failed to push some refs to '%s'"
-msgstr "无法推送一些引用到 '%s'"
+#: builtin/rebase.c:1417 builtin/rebase.c:1420
+msgid "cherry-pick all commits, even if unchanged"
+msgstr "拣选所有提交，即使未修改"
-#: builtin/push.c:370
-#, c-format
-msgid "bad repository '%s'"
-msgstr "坏的仓库 '%s'"
+#: builtin/rebase.c:1422
+msgid "continue"
+msgstr "继续"
-#: builtin/push.c:371
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-" git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-" git push <name>\n"
-msgstr ""
-"没有配置推送目标。\n"
-"或通过命令行指定 URL，或用下面命令配置一个远程仓库\n"
-"\n"
-" git remote add <名称> <地址>\n"
-"\n"
-"然后使用该远程仓库名执行推送\n"
-"\n"
-" git push <名称>\n"
+#: builtin/rebase.c:1425
+msgid "skip current patch and continue"
+msgstr "跳过当前补丁并继续"
-#: builtin/push.c:389
-msgid "--all and --tags are incompatible"
-msgstr "--all 和 --tags 不兼容"
+# 译者：注意保持前导空格
+#: builtin/rebase.c:1427
+msgid "abort and check out the original branch"
+msgstr "终止并检出原有分支"
-#: builtin/push.c:390
-msgid "--all can't be combined with refspecs"
-msgstr "--all 不能和引用规格同时使用"
+#: builtin/rebase.c:1430
+msgid "abort but keep HEAD where it is"
+msgstr "终止但保持 HEAD 不变"
-#: builtin/push.c:395
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror 和 --tags 不兼容"
+#: builtin/rebase.c:1431
+msgid "edit the todo list during an interactive rebase"
+msgstr "在交互式变基中编辑待办列表"
-#: builtin/push.c:396
-msgid "--mirror can't be combined with refspecs"
-msgstr "--mirror 不能和引用规格同时使用"
+#: builtin/rebase.c:1434
+msgid "show the patch file being applied or merged"
+msgstr "显示正在应用或合并的补丁文件"
-#: builtin/push.c:401
-msgid "--all and --mirror are incompatible"
-msgstr "--all 和 --mirror 不兼容"
+#: builtin/rebase.c:1437
+msgid "use merging strategies to rebase"
+msgstr "使用合并策略进行变基"
-#: builtin/push.c:523
-msgid "repository"
-msgstr "仓库"
+#: builtin/rebase.c:1441
+msgid "let the user edit the list of commits to rebase"
+msgstr "让用户编辑要变基的提交列表"
-#: builtin/push.c:524 builtin/send-pack.c:163
-msgid "push all refs"
-msgstr "推送所有引用"
+#: builtin/rebase.c:1445
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr "（已弃用）尝试重建合并提交而非忽略它们"
-#: builtin/push.c:525 builtin/send-pack.c:165
-msgid "mirror all refs"
-msgstr "镜像所有引用"
+#: builtin/rebase.c:1449
+msgid "preserve empty commits during rebase"
+msgstr "变基时保留空提交"
-#: builtin/push.c:527
-msgid "delete refs"
-msgstr "å\88 é\99¤å¼\95ç\94¨"
+#: builtin/rebase.c:1451
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr "å\9c¨ -i 交äº\92模å¼\8fä¸\8bï¼\8c移å\8a¨ä»¥ squash!/fixup! å¼\80头ç\9a\84æ\8f\90交"
-#: builtin/push.c:528
-msgid "push tags (can't be used with --all or --mirror)"
-msgstr "推送标签（不能使用 --all or --mirror）"
+#: builtin/rebase.c:1457
+msgid "automatically stash/stash pop before and after"
+msgstr "在操作前后执行自动贮藏和弹出贮藏"
-#: builtin/push.c:531 builtin/send-pack.c:166
-msgid "force updates"
-msgstr "强å\88¶æ\9b´æ\96°"
+#: builtin/rebase.c:1459
+msgid "add exec lines after each commit of the editable list"
+msgstr "å\8f¯ç¼\96è¾\91å\88\97表ç\9a\84æ¯\8fä¸\80个æ\8f\90交ä¸\8bé\9d¢å¢\9eå\8a ä¸\80è¡\8c exec"
-#: builtin/push.c:533 builtin/send-pack.c:180
-msgid "refname>:<expect"
-msgstr "å¼\95ç\94¨å\90\8d>:<æ\9c\9fæ\9c\9bå\80¼"
+#: builtin/rebase.c:1463
+msgid "allow rebasing commits with empty messages"
+msgstr "å\85\81许é\92\88对空æ\8f\90交说æ\98\8eç\9a\84æ\8f\90交å\8f\98å\9fº"
-#: builtin/push.c:534 builtin/send-pack.c:181
-msgid "require old value of ref to be at this value"
-msgstr "要求引用旧的取值为设定值"
+#: builtin/rebase.c:1466
+msgid "try to rebase merges instead of skipping them"
+msgstr "尝试对合并提交变基而不是忽略它们"
-#: builtin/push.c:537
-msgid "control recursive pushing of submodules"
-msgstr "控制子模组的递归推送"
+#: builtin/rebase.c:1469
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr "使用 'merge-base --fork-point' 来优化上游"
-#: builtin/push.c:539 builtin/send-pack.c:174
-msgid "use thin pack"
-msgstr "使ç\94¨ç²¾ç®\80æ\89\93å\8c\85"
+#: builtin/rebase.c:1471
+msgid "use the given merge strategy"
+msgstr "使ç\94¨ç»\99å®\9aç\9a\84å\90\88并ç\96ç\95¥"
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
-#: builtin/send-pack.c:161
-msgid "receive pack program"
-msgstr "接收包程序"
+#: builtin/rebase.c:1473 builtin/revert.c:114
+msgid "option"
+msgstr "选项"
+
+#: builtin/rebase.c:1474
+msgid "pass the argument through to the merge strategy"
+msgstr "将参数传递给合并策略"
+
+#: builtin/rebase.c:1477
+msgid "rebase all reachable commits up to the root(s)"
+msgstr "将所有可达的提交变基到根提交"
+
+#: builtin/rebase.c:1498
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"对 rebase.useBuiltin 的支持已被删除！\n"
+"详见 'git help config' 中的条目。"
+
+#: builtin/rebase.c:1504
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "看起来 'git-am' 正在执行中。无法变基。"
+
+#: builtin/rebase.c:1545
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
+
+#: builtin/rebase.c:1549
+msgid "No rebase in progress?"
+msgstr "没有正在进行的变基？"
+
+#: builtin/rebase.c:1553
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: builtin/push.c:542
-msgid "set upstream for git pull/status"
-msgstr "设置 git pull/status 的上游"
+#: builtin/rebase.c:1576
+msgid "Cannot read HEAD"
+msgstr "不能读取 HEAD"
-#: builtin/push.c:545
-msgid "prune locally removed refs"
-msgstr "清除本地删除的引用"
+#: builtin/rebase.c:1588
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"您必须编辑所有的合并冲突，然后通过 git add\n"
+"命令将它们标记为已解决"
-#: builtin/push.c:547
-msgid "bypass pre-push hook"
-msgstr "绕过 pre-push 钩子"
+#: builtin/rebase.c:1607
+msgid "could not discard worktree changes"
+msgstr "无法丢弃工作区变更"
-#: builtin/push.c:548
-msgid "push missing but relevant tags"
-msgstr "推送缺失但有关的标签"
+#: builtin/rebase.c:1626
+#, c-format
+msgid "could not move back to %s"
+msgstr "无法移回 %s"
-#: builtin/push.c:551 builtin/send-pack.c:168
-msgid "GPG sign the push"
-msgstr "用 GPG 为推送签名"
+#: builtin/rebase.c:1637 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "无法删除 '%s'"
-#: builtin/push.c:553 builtin/send-pack.c:175
-msgid "request atomic transaction on remote side"
-msgstr "需要远端支持原子事务"
+#: builtin/rebase.c:1663
+#, c-format
+msgid ""
+"It seems that there is already a %s directory, and\n"
+"I wonder if you are in the middle of another rebase. If that is the\n"
+"case, please try\n"
+"\t%s\n"
+"If that is not the case, please\n"
+"\t%s\n"
+"and run me again. I am stopping in case you still have something\n"
+"valuable there.\n"
+msgstr ""
+"似乎已有一个 %s 目录，我怀疑您正处于另外一个变基操作过程中。\n"
+"如果是这样，请执行\n"
+"\t%s\n"
+"如果不是这样，请执行\n"
+"\t%s\n"
+"然后再重新执行。 为避免丢失重要数据，我已经停止当前操作。\n"
-#: builtin/push.c:554 builtin/send-pack.c:171
-msgid "server-specific"
-msgstr "server-specific"
+#: builtin/rebase.c:1684
+msgid "switch `C' expects a numerical value"
+msgstr "开关 `C' 期望一个数字值"
-#: builtin/push.c:554 builtin/send-pack.c:172
-msgid "option to transmit"
-msgstr "传输选项"
+#: builtin/rebase.c:1725
+#, c-format
+msgid "Unknown mode: %s"
+msgstr "未知模式：%s"
-#: builtin/push.c:568
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
+#: builtin/rebase.c:1747
+msgid "--strategy requires --merge or --interactive"
+msgstr "--strategy 需要 --merge 或 --interactive"
-#: builtin/push.c:570
-msgid "--delete doesn't make sense without any refs"
-msgstr "--delete 未接任何引用没有意义"
+#: builtin/rebase.c:1796
+msgid "cannot combine am options with either interactive or merge options"
+msgstr "不能将 am 选项与交互或合并选项同时使用"
-#: builtin/push.c:589
-msgid "push options must not have new line characters"
-msgstr "推送选项不能有换行符"
+#: builtin/rebase.c:1815
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
-#: builtin/read-tree.c:40
+#: builtin/rebase.c:1819
msgid ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
-"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
+"错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
-#: builtin/read-tree.c:121
-msgid "write resulting index to <file>"
-msgstr "将索引结果写入 <文件>"
+#: builtin/rebase.c:1825
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr "不能将 '--rebase-merges' 和 '--strategy-option' 同时使用"
-#: builtin/read-tree.c:124
-msgid "only empty the index"
-msgstr "只是清空索引"
+#: builtin/rebase.c:1828
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr "不能将 '--rebase-merges' 和 '--strategy' 同时使用"
-#: builtin/read-tree.c:126
-msgid "Merging"
-msgstr "合并"
+#: builtin/rebase.c:1852
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr "无效的上游 '%s'"
-#: builtin/read-tree.c:128
-msgid "perform a merge in addition to a read"
-msgstr "读取之余再执行一个合并"
+#: builtin/rebase.c:1858
+msgid "Could not create new root commit"
+msgstr "不能创建新的根提交"
-#: builtin/read-tree.c:130
-msgid "3-way merge if no file level merging required"
-msgstr "如果没有文件级合并需要，执行三方合并"
+#: builtin/rebase.c:1876
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr "'%s'：只需要一个合并基线"
-#: builtin/read-tree.c:132
-msgid "3-way merge in presence of adds and removes"
-msgstr "存在添加和删除时，也执行三方合并"
+#: builtin/rebase.c:1883
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr "没有指向一个有效的提交 '%s'"
-#: builtin/read-tree.c:134
-msgid "same as -m, but discard unmerged entries"
-msgstr "类似于 -m，但丢弃未合并的条目"
+#: builtin/rebase.c:1908
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr "致命错误：无此分支/提交 '%s'"
-#: builtin/read-tree.c:135
-msgid "<subdirectory>/"
-msgstr "<子目录>/"
+#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1933
+#, c-format
+msgid "No such ref: %s"
+msgstr "没有这样的引用：%s"
-#: builtin/read-tree.c:136
-msgid "read the tree into the index under <subdirectory>/"
-msgstr "读取树对象到索引的 <子目录>/ 下"
+#: builtin/rebase.c:1927
+msgid "Could not resolve HEAD to a revision"
+msgstr "无法将 HEAD 解析为一个版本"
-#: builtin/read-tree.c:139
-msgid "update working tree with merge result"
-msgstr "用合并的结果更新工作区"
+#: builtin/rebase.c:1968
+msgid "Cannot autostash"
+msgstr "无法 autostash"
-#: builtin/read-tree.c:141
-msgid "gitignore"
-msgstr "gitignore"
+#: builtin/rebase.c:1971
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "意外的 stash 响应：'%s'"
-#: builtin/read-tree.c:142
-msgid "allow explicitly ignored files to be overwritten"
-msgstr "允许忽略文件中设定的文件可以被覆盖"
+#: builtin/rebase.c:1977
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "不能为 '%s' 创建目录"
-#: builtin/read-tree.c:145
-msgid "don't check the working tree after merging"
-msgstr "合并后不检查工作区"
+#: builtin/rebase.c:1980
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "创建了 autostash：%s\n"
-#: builtin/read-tree.c:146
-msgid "don't update the index or the work tree"
-msgstr "不更新索引区和工作区"
+#: builtin/rebase.c:1983
+msgid "could not reset --hard"
+msgstr "无法 reset --hard"
-#: builtin/read-tree.c:148
-msgid "skip applying sparse checkout filter"
-msgstr "跳过应用稀疏检出过滤器"
+#: builtin/rebase.c:1984 builtin/reset.c:114
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD 现在位于 %s"
-#: builtin/read-tree.c:150
-msgid "debug unpack-trees"
-msgstr "调试 unpack-trees"
+#: builtin/rebase.c:2000
+msgid "Please commit or stash them."
+msgstr "请提交或贮藏修改。"
+
+#: builtin/rebase.c:2027
+#, c-format
+msgid "could not parse '%s'"
+msgstr "无法解析 '%s'"
-#: builtin/rebase--helper.c:8
-msgid "git rebase--helper [<options>]"
-msgstr "git rebase--helper [<选项>]"
+#: builtin/rebase.c:2040
+#, c-format
+msgid "could not switch to %s"
+msgstr "无法切换到 %s"
-#: builtin/rebase--helper.c:22
-msgid "keep empty commits"
-msgstr "保持空提交"
+#: builtin/rebase.c:2051
+msgid "HEAD is up to date."
+msgstr "HEAD 是最新的。"
-#: builtin/rebase--helper.c:23
-msgid "continue rebase"
-msgstr "继续变基"
+#: builtin/rebase.c:2053
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr "当前分支 %s 是最新的。\n"
-#: builtin/rebase--helper.c:25
-msgid "abort rebase"
-msgstr "中止变基"
+#: builtin/rebase.c:2061
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD 是最新的，强制变基。"
-#: builtin/rebase--helper.c:28
-msgid "make rebase script"
-msgstr "制作变基脚本"
+#: builtin/rebase.c:2063
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr "当前分支 %s 是最新的，强制变基。\n"
-#: builtin/rebase--helper.c:30
-msgid "shorten SHA-1s in the todo list"
-msgstr "缩短待办列表中的哈希值"
+#: builtin/rebase.c:2071
+msgid "The pre-rebase hook refused to rebase."
+msgstr "pre-rebase 钩子拒绝了变基操作。"
-#: builtin/rebase--helper.c:32
-msgid "expand SHA-1s in the todo list"
-msgstr "扩展待办列表中的哈希值"
+#: builtin/rebase.c:2078
+#, c-format
+msgid "Changes to %s:\n"
+msgstr "到 %s 的变更：\n"
-#: builtin/rebase--helper.c:34
-msgid "check the todo list"
-msgstr "检查待办列表"
+#: builtin/rebase.c:2081
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr "从 %s 到 %s 的变更：\n"
-#: builtin/rebase--helper.c:36
-msgid "skip unnecessary picks"
-msgstr "跳过不必要的拣选"
+#: builtin/rebase.c:2106
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr "首先，回退头指针以便在其上重放您的工作...\n"
-#: builtin/rebase--helper.c:38
-msgid "rearrange fixup/squash lines"
-msgstr "重新排列 fixup/squash 行"
+#: builtin/rebase.c:2115
+msgid "Could not detach HEAD"
+msgstr "无法分离头指针"
-#: builtin/receive-pack.c:29
+#: builtin/rebase.c:2124
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr "快进 %s 到 %s。\n"
+
+#: builtin/receive-pack.c:33
msgid "git receive-pack <git-dir>"
-msgstr "git receive-pack <git-dir>"
+msgstr "git receive-pack <仓库目录>"
-#: builtin/receive-pack.c:839
+#: builtin/receive-pack.c:833
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
-#: builtin/receive-pack.c:859
+#: builtin/receive-pack.c:853
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"若要屏蔽此信息，您可以设置它为 'refuse'。"
-#: builtin/receive-pack.c:1932
+#: builtin/receive-pack.c:1940
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:1946
+#: builtin/receive-pack.c:1954
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
-#: builtin/reflog.c:424
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
+"用>..."
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
+"用>..."
-#: builtin/reflog.c:541 builtin/reflog.c:546
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <引用>"
+
+#: builtin/reflog.c:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' 不是一个有效的时间戳"
-#: builtin/remote.c:13
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "正在标记可达对象..."
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s 指向不存在！"
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr "未指定要删除的引用日志"
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr "不是一个引用日志：%s"
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "没有 '%s' 的引用日志"
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "无效的引用格式：%s"
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+
+#: builtin/remote.c:16
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
-#: builtin/remote.c:14
+#: builtin/remote.c:17
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <名称> <地址>"
-#: builtin/remote.c:15 builtin/remote.c:35
+#: builtin/remote.c:18 builtin/remote.c:38
msgid "git remote rename <old> <new>"
msgstr "git remote rename <旧名称> <新名称>"
-#: builtin/remote.c:16 builtin/remote.c:40
+#: builtin/remote.c:19 builtin/remote.c:43
msgid "git remote remove <name>"
msgstr "git remote remove <名称>"
-#: builtin/remote.c:17 builtin/remote.c:45
+#: builtin/remote.c:20 builtin/remote.c:48
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
-#: builtin/remote.c:18
+#: builtin/remote.c:21
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <名称>"
-#: builtin/remote.c:19
+#: builtin/remote.c:22
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <名称>"
-#: builtin/remote.c:20
+#: builtin/remote.c:23
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
-#: builtin/remote.c:21
+#: builtin/remote.c:24
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <名称> <分支>..."
-#: builtin/remote.c:22 builtin/remote.c:71
+#: builtin/remote.c:25 builtin/remote.c:74
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <名称>"
-#: builtin/remote.c:23 builtin/remote.c:76
+#: builtin/remote.c:26 builtin/remote.c:79
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
-#: builtin/remote.c:24 builtin/remote.c:77
+#: builtin/remote.c:27 builtin/remote.c:80
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <名称> <新的地址>"
-#: builtin/remote.c:25 builtin/remote.c:78
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <名称> <地址>"
-#: builtin/remote.c:30
+#: builtin/remote.c:33
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<选项>] <名称> <地址>"
-#: builtin/remote.c:50
+#: builtin/remote.c:53
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <名称> <分支>..."
-#: builtin/remote.c:51
+#: builtin/remote.c:54
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <名称> <分支>..."
-#: builtin/remote.c:56
+#: builtin/remote.c:59
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<选项>] <名称>"
-#: builtin/remote.c:61
+#: builtin/remote.c:64
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<选项>] <名称>"
-#: builtin/remote.c:66
+#: builtin/remote.c:69
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<选项>] [<组> | <远程>]..."
-#: builtin/remote.c:95
+#: builtin/remote.c:98
#, c-format
msgid "Updating %s"
msgstr "更新 %s 中"
-#: builtin/remote.c:127
+#: builtin/remote.c:130
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
"--mirror 选项危险且过时，请使用 --mirror=fetch\n"
"\t 或 --mirror=push"
-#: builtin/remote.c:144
+#: builtin/remote.c:147
#, c-format
msgid "unknown mirror argument: %s"
msgstr "未知的镜像参数：%s"
-#: builtin/remote.c:160
+#: builtin/remote.c:163
msgid "fetch the remote branches"
msgstr "抓取远程的分支"
-#: builtin/remote.c:162
+#: builtin/remote.c:165
msgid "import all tags and associated objects when fetching"
msgstr "抓取时导入所有的标签和关联对象"
-#: builtin/remote.c:165
+#: builtin/remote.c:168
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "或不抓取任何标签（--no-tags）"
-#: builtin/remote.c:167
+#: builtin/remote.c:170
msgid "branch(es) to track"
msgstr "跟踪的分支"
-#: builtin/remote.c:168
+#: builtin/remote.c:171
msgid "master branch"
msgstr "主线分支"
-#: builtin/remote.c:169
-msgid "push|fetch"
-msgstr "push|fetch"
-
-#: builtin/remote.c:170
+#: builtin/remote.c:173
msgid "set up remote as a mirror to push to or fetch from"
msgstr "把远程设置为用以推送或抓取的镜像"
-#: builtin/remote.c:182
+#: builtin/remote.c:185
msgid "specifying a master branch makes no sense with --mirror"
msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
-#: builtin/remote.c:184
+#: builtin/remote.c:187
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
-#: builtin/remote.c:191 builtin/remote.c:631
+#: builtin/remote.c:194 builtin/remote.c:636
#, c-format
msgid "remote %s already exists."
msgstr "远程 %s 已经存在。"
-#: builtin/remote.c:195 builtin/remote.c:635
+#: builtin/remote.c:198 builtin/remote.c:640
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' 不是一个有效的远程名称"
-#: builtin/remote.c:235
+#: builtin/remote.c:238
#, c-format
msgid "Could not setup master '%s'"
msgstr "无法设置 master '%s'"
-#: builtin/remote.c:337
+#: builtin/remote.c:344
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "无法得到引用规格 %s 的获取列表"
-#: builtin/remote.c:438 builtin/remote.c:446
+#: builtin/remote.c:443 builtin/remote.c:451
msgid "(matching)"
msgstr "（匹配）"
-#: builtin/remote.c:450
+#: builtin/remote.c:455
msgid "(delete)"
msgstr "（删除）"
-#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
+#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
#, c-format
-msgid "No such remote: %s"
-msgstr "没有这样的远程：%s"
+msgid "No such remote: '%s'"
+msgstr "没有此远程仓库：'%s'"
-#: builtin/remote.c:641
+#: builtin/remote.c:646
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "不能重命名配置小节 '%s' 到 '%s'"
-#: builtin/remote.c:661
+#: builtin/remote.c:666
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\t如果必要请手动更新配置。"
-#: builtin/remote.c:697
+#: builtin/remote.c:702
#, c-format
msgid "deleting '%s' failed"
msgstr "删除 '%s' 失败"
-#: builtin/remote.c:731
+#: builtin/remote.c:736
#, c-format
msgid "creating '%s' failed"
msgstr "创建 '%s' 失败"
-#: builtin/remote.c:796
+#: builtin/remote.c:802
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
-#: builtin/remote.c:810
+#: builtin/remote.c:816
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除配置小节 '%s'"
-#: builtin/remote.c:911
+#: builtin/remote.c:917
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的（下一次获取将存储于 remotes/%s）"
-#: builtin/remote.c:914
+#: builtin/remote.c:920
msgid " tracked"
msgstr " 已跟踪"
-#: builtin/remote.c:916
+#: builtin/remote.c:922
msgid " stale (use 'git remote prune' to remove)"
msgstr " 过时（使用 'git remote prune' 来移除）"
-#: builtin/remote.c:918
+#: builtin/remote.c:924
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:959
+#: builtin/remote.c:965
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
-#: builtin/remote.c:967
+#: builtin/remote.c:974
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "交互式变基到远程 %s"
-#: builtin/remote.c:968
+#: builtin/remote.c:976
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr "交互式变基（含合并提交）到远程 %s"
+
+#: builtin/remote.c:979
#, c-format
msgid "rebases onto remote %s"
msgstr "变基到远程 %s"
-#: builtin/remote.c:971
+#: builtin/remote.c:983
#, c-format
msgid " merges with remote %s"
msgstr " 与远程 %s 合并"
-#: builtin/remote.c:974
+#: builtin/remote.c:986
#, c-format
msgid "merges with remote %s"
msgstr "与远程 %s 合并"
-#: builtin/remote.c:977
+#: builtin/remote.c:989
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和远程 %s\n"
-#: builtin/remote.c:1020
+#: builtin/remote.c:1032
msgid "create"
msgstr "创建"
-#: builtin/remote.c:1023
+#: builtin/remote.c:1035
msgid "delete"
msgstr "删除"
-#: builtin/remote.c:1027
+#: builtin/remote.c:1039
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1030
+#: builtin/remote.c:1042
msgid "fast-forwardable"
msgstr "可快进"
-#: builtin/remote.c:1033
+#: builtin/remote.c:1045
msgid "local out of date"
msgstr "本地已过时"
-#: builtin/remote.c:1040
+#: builtin/remote.c:1052
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 强制推送至 %-*s (%s)"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1055
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 强制推送至 %s"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1062
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1118
+#: builtin/remote.c:1130
msgid "do not query remotes"
msgstr "不查询远程"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1157
#, c-format
msgid "* remote %s"
msgstr "* 远程 %s"
-#: builtin/remote.c:1146
+#: builtin/remote.c:1158
#, c-format
msgid " Fetch URL: %s"
msgstr " 获取地址：%s"
-#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
+#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(无 URL)"
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1161 builtin/remote.c:1163
+#: builtin/remote.c:1173 builtin/remote.c:1175
#, c-format
msgid " Push URL: %s"
msgstr " 推送地址：%s"
-#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
+#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1165
+#: builtin/remote.c:1177
msgid "(not queried)"
msgstr "（未查询）"
-#: builtin/remote.c:1167
+#: builtin/remote.c:1179
msgid "(unknown)"
msgstr "（未知）"
-#: builtin/remote.c:1171
+#: builtin/remote.c:1183
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
-#: builtin/remote.c:1183
+#: builtin/remote.c:1195
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[1] " 远程分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1186 builtin/remote.c:1212
+#: builtin/remote.c:1198 builtin/remote.c:1224
msgid " (status not queried)"
msgstr "（状态未查询）"
-#: builtin/remote.c:1195
+#: builtin/remote.c:1207
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:1203
+#: builtin/remote.c:1215
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜像"
-#: builtin/remote.c:1209
+#: builtin/remote.c:1221
#, 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:1230
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1232
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1247
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1249
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
-#: builtin/remote.c:1259
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1267
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一个有效引用：%s"
-#: builtin/remote.c:1269
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "不能设置 %s"
# 译者：注意保持前导空格
-#: builtin/remote.c:1287
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
-msgstr " %s å°\86æ\88\90为æ\91\87æ\91\86状态！"
+msgstr " %s å°\86æ\88\90为æ\82¬ç©º状态！"
# 译者：注意保持前导空格
-#: builtin/remote.c:1288
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
-msgstr " %s å·²æ\88\90为æ\91\87æ\91\86状态！"
+msgstr " %s å·²æ\88\90为æ\82¬ç©º状态！"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1299
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL：%s"
-#: builtin/remote.c:1315
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1318
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "抓取后清除远程"
-#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
+#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1442
+#: builtin/remote.c:1454
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1449
+#: builtin/remote.c:1461
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1466
+#: builtin/remote.c:1478
msgid "query push URLs rather than fetch URLs"
msgstr "查询推送 URL 地址，而非获取 URL 地址"
-#: builtin/remote.c:1468
+#: builtin/remote.c:1480
msgid "return all URLs"
msgstr "返回所有 URL 地址"
-#: builtin/remote.c:1496
+#: builtin/remote.c:1508
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "没有给远程仓库 '%s' 设定 URL"
-#: builtin/remote.c:1522
+#: builtin/remote.c:1534
msgid "manipulate push URLs"
msgstr "操作推送 URLS"
-#: builtin/remote.c:1524
+#: builtin/remote.c:1536
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1526
+#: builtin/remote.c:1538
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1533
+#: builtin/remote.c:1545
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 无意义"
-#: builtin/remote.c:1572
+#: builtin/remote.c:1584
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹配模版：%s"
-#: builtin/remote.c:1580
+#: builtin/remote.c:1592
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL：%s"
-#: builtin/remote.c:1582
+#: builtin/remote.c:1594
msgid "Will not delete all non-push URLs"
msgstr "将不会删除所有非推送 URL 地址"
-#: builtin/remote.c:1598
+#: builtin/remote.c:1610
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出；必须置于子命令之前"
-#: builtin/remote.c:1629
+#: builtin/remote.c:1641
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子命令：%s"
-#: builtin/repack.c:18
+#: builtin/repack.c:22
msgid "git repack [<options>]"
msgstr "git repack [<选项>]"
-#: builtin/repack.c:23
+#: builtin/repack.c:27
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
"或禁用 pack.writebitmaps 配置。"
-#: builtin/repack.c:168
+#: builtin/repack.c:200
+msgid "could not start pack-objects to repack promisor objects"
+msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
+
+#: builtin/repack.c:239 builtin/repack.c:414
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。"
+
+#: builtin/repack.c:256
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
+
+#: builtin/repack.c:294
msgid "pack everything in a single pack"
msgstr "所有内容打包到一个包文件中"
-#: builtin/repack.c:170
+#: builtin/repack.c:296
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同，并将不可达的对象设为松散对象"
-#: builtin/repack.c:173
+#: builtin/repack.c:299
msgid "remove redundant packs, and run git-prune-packed"
msgstr "删除多余的包，运行 git-prune-packed"
-#: builtin/repack.c:175
+#: builtin/repack.c:301
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
-#: builtin/repack.c:177
+#: builtin/repack.c:303
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
-#: builtin/repack.c:179
+#: builtin/repack.c:305
msgid "do not run git-update-server-info"
msgstr "不运行 git-update-server-info"
-#: builtin/repack.c:182
+#: builtin/repack.c:308
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --local"
-#: builtin/repack.c:184
+#: builtin/repack.c:310
msgid "write bitmap index"
msgstr "写 bitmap 索引"
-#: builtin/repack.c:185
+#: builtin/repack.c:312
+msgid "pass --delta-islands to git-pack-objects"
+msgstr "向 git-pack-objects 传递参数 --delta-islands"
+
+#: builtin/repack.c:313
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:186
+#: builtin/repack.c:314
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A，不要将早于给定时间的对象过期"
-#: builtin/repack.c:188
+#: builtin/repack.c:316
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ，重新对不可达对象打包"
-#: builtin/repack.c:190
+#: builtin/repack.c:318
msgid "size of the window used for delta compression"
msgstr "用于增量压缩的窗口值"
-#: builtin/repack.c:191 builtin/repack.c:197
+#: builtin/repack.c:319 builtin/repack.c:325
msgid "bytes"
msgstr "字节"
-#: builtin/repack.c:192
+#: builtin/repack.c:320
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似，但限制内存大小而非条目数"
-#: builtin/repack.c:194
+#: builtin/repack.c:322
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
-#: builtin/repack.c:196
+#: builtin/repack.c:324
msgid "limits the maximum number of threads"
msgstr "限制最大线程数"
-#: builtin/repack.c:198
+#: builtin/repack.c:326
msgid "maximum size of each packfile"
msgstr "每个包文件的最大尺寸"
-#: builtin/repack.c:200
+#: builtin/repack.c:328
msgid "repack objects in packs marked with .keep"
msgstr "对标记为 .keep 的包中的对象重新打包"
-#: builtin/repack.c:210
+#: builtin/repack.c:330
+msgid "do not repack this pack"
+msgstr "不要对该包文件重新打包"
+
+#: builtin/repack.c:340
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能删除珍品仓库中的打包文件"
-#: builtin/repack.c:214
+#: builtin/repack.c:344
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 和 -A 不兼容"
-#: builtin/repack.c:406 builtin/worktree.c:134
+#: builtin/repack.c:423
+msgid "Nothing new to pack."
+msgstr "没有新的要打包。"
+
+#: builtin/repack.c:484
+#, c-format
+msgid ""
+"WARNING: Some packs in use have been renamed by\n"
+"WARNING: prefixing old- to their name, in order to\n"
+"WARNING: replace them with the new version of the\n"
+"WARNING: file. But the operation failed, and the\n"
+"WARNING: attempt to rename them back to their\n"
+"WARNING: original names also failed.\n"
+"WARNING: Please rename them in %s manually:\n"
+msgstr ""
+"警告：为了将包文件替换为新版本，一些使用中的包已经\n"
+"警告：通过添加 old- 前缀的方式重命名。但是操作失败，\n"
+"警告：并且尝试重命名改回原有文件名的操作也失败。\n"
+"警告：请手动将 %s 下的这些文件重命名：\n"
+
+#: builtin/repack.c:532
#, c-format
msgid "failed to remove '%s'"
-msgstr "无法删除 '%s'"
+msgstr "删除 '%s' 失败"
-#: builtin/replace.c:20
+#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
msgstr "git replace [-f] <对象> <替换物>"
-#: builtin/replace.c:21
+#: builtin/replace.c:23
msgid "git replace [-f] --edit <object>"
msgstr "git replace [-f] --edit <对象>"
-#: builtin/replace.c:22
+#: builtin/replace.c:24
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <提交> [<父提交>...]"
-#: builtin/replace.c:23
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr "git replace [-f] --convert-graft-file"
+
+#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr "git replace -d <对象>..."
-#: builtin/replace.c:24
+#: builtin/replace.c:27
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<格式>] [-l [<模式>]]"
-#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
+#: builtin/replace.c:90
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+"无效的替换格式 '%s'\n"
+"有效的格式有 'short'、'medium' 和 'long'"
+
+#: builtin/replace.c:125
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr "未发现替换引用 '%s'"
+
+#: builtin/replace.c:141
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr "已删除替换引用 '%s'"
+
+#: builtin/replace.c:153
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr "'%s' 不是一个有效的引用名"
+
+#: builtin/replace.c:158
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr "替换引用 '%s' 已经存在"
+
+#: builtin/replace.c:178
+#, c-format
+msgid ""
+"Objects must be of the same type.\n"
+"'%s' points to a replaced object of type '%s'\n"
+"while '%s' points to a replacement object of type '%s'."
+msgstr ""
+"对象必须属于同一类型。\n"
+"'%s' 指向 '%s' 类型的替换对象\n"
+"而 '%s' 指向 '%s' 类型的替换对象。"
+
+#: builtin/replace.c:229
+#, c-format
+msgid "unable to open %s for writing"
+msgstr "无法为写入打开 %s"
+
+#: builtin/replace.c:242
+msgid "cat-file reported failure"
+msgstr "cat-file 报告失败"
+
+#: builtin/replace.c:258
+#, c-format
+msgid "unable to open %s for reading"
+msgstr "无法为读取打开 %s"
+
+#: builtin/replace.c:272
+msgid "unable to spawn mktree"
+msgstr "无法启动 mktree"
+
+#: builtin/replace.c:276
+msgid "unable to read from mktree"
+msgstr "无法从 mktree 读取"
+
+#: builtin/replace.c:285
+msgid "mktree reported failure"
+msgstr "mktree 报告失败"
+
+#: builtin/replace.c:289
+msgid "mktree did not return an object name"
+msgstr "mktree 没有返回一个对象名"
+
+#: builtin/replace.c:298
+#, c-format
+msgid "unable to fstat %s"
+msgstr "无法对 %s 执行 fstat"
+
+#: builtin/replace.c:303
+msgid "unable to write object to database"
+msgstr "无法向数据库写入对象"
+
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
#, c-format
-msgid "Not a valid object name: '%s'"
+msgid "not a valid object name: '%s'"
msgstr "不是一个有效的对象名：'%s'"
-#: builtin/replace.c:361
+#: builtin/replace.c:326
+#, c-format
+msgid "unable to get object type for %s"
+msgstr "无法得到 %s 的对象类型"
+
+#: builtin/replace.c:342
+msgid "editing object file failed"
+msgstr "编辑对象文件失败"
+
+#: builtin/replace.c:351
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr "新对象和旧对象相同：'%s'"
+
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "无法将 %s 解析为一个提交"
+
+#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "提交 '%s' 中含有损坏的合并标签"
-#: builtin/replace.c:363
+#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
-msgstr "提交 '%s' 中含有非法的合并标签"
+msgstr "提交 '%s' 中含有格式错误的合并标签"
-#: builtin/replace.c:374
+#: builtin/replace.c:428
#, 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:407
+#: builtin/replace.c:467
#, c-format
-msgid "the original commit '%s' has a gpg signature."
-msgstr "原始提交 '%s' 中包含一个 GPG 签名"
+msgid "the original commit '%s' has a gpg signature"
+msgstr "原始提交 '%s' 中有一个 gpg 签名"
-#: builtin/replace.c:408
+#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr "在替换的提交中签名将被移除！"
-#: builtin/replace.c:414
+#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "不能为 '%s' 写替换提交"
-#: builtin/replace.c:438
+#: builtin/replace.c:486
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr "对 '%s' 移植没有必要"
+
+#: builtin/replace.c:490
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr "新提交和旧的一样：'%s'"
+
+#: builtin/replace.c:525
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+"不能转换下列移植：\n"
+"%s"
+
+#: builtin/replace.c:546
msgid "list replace refs"
msgstr "列出替换的引用"
-#: builtin/replace.c:439
+#: builtin/replace.c:547
msgid "delete replace refs"
msgstr "删除替换的引用"
-#: builtin/replace.c:440
+#: builtin/replace.c:548
msgid "edit existing object"
msgstr "编辑现存的对象"
-#: builtin/replace.c:441
+#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr "修改一个提交的父提交"
-#: builtin/replace.c:442
-msgid "replace the ref if it exists"
-msgstr "如果存在则替换引用"
+#: builtin/replace.c:550
+msgid "convert existing graft file"
+msgstr "转换现存的移植文件"
+
+#: builtin/replace.c:551
+msgid "replace the ref if it exists"
+msgstr "如果存在则替换引用"
+
+#: builtin/replace.c:553
+msgid "do not pretty-print contents for --edit"
+msgstr "不要为 --edit 操作美观显示内容"
+
+#: builtin/replace.c:554
+msgid "use this format"
+msgstr "使用此格式"
+
+#: builtin/replace.c:567
+msgid "--format cannot be used when not listing"
+msgstr "不列出时不能使用 --format"
+
+#: builtin/replace.c:575
+msgid "-f only makes sense when writing a replacement"
+msgstr "只有写一个替换时 -f 才有意义"
+
+#: builtin/replace.c:579
+msgid "--raw only makes sense with --edit"
+msgstr "--raw 只有和 --edit 共用才有意义"
+
+#: builtin/replace.c:585
+msgid "-d needs at least one argument"
+msgstr "-d 需要至少一个参数"
+
+#: builtin/replace.c:591
+msgid "bad number of arguments"
+msgstr "错误的参数个数"
+
+#: builtin/replace.c:597
+msgid "-e needs exactly one argument"
+msgstr "-e 需要且仅需要一个参数"
+
+#: builtin/replace.c:603
+msgid "-g needs at least one argument"
+msgstr "-g 需要至少一个参数"
-#: builtin/replace.c:443
-msgid "do not pretty-print contents for --edit"
-msgstr "不要为 --edit 操作美观显示内容"
+#: builtin/replace.c:609
+msgid "--convert-graft-file takes no argument"
+msgstr "--convert-graft-file 不带参数"
-#: builtin/replace.c:444
-msgid "use this format"
-msgstr "使用此格式"
+#: builtin/replace.c:615
+msgid "only one pattern can be given with -l"
+msgstr "只能为 -l 提供一个模式"
#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:59
+#: builtin/rerere.c:60
msgid "register clean resolutions in index"
msgstr "在索引中注册干净的解决方案"
-#: builtin/reset.c:29
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
+msgstr "没有路径的 'git rerere forget' 已经过时"
+
+#: builtin/rerere.c:113
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr "无法为 '%s' 生成差异"
+
+#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
-#: builtin/reset.c:30
+#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
-#: builtin/reset.c:31
+#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "mixed"
msgstr "混杂"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "soft"
msgstr "软性"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "hard"
msgstr "硬性"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "merge"
msgstr "合并"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "keep"
msgstr "保持"
-#: builtin/reset.c:78
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr "您没有一个有效的 HEAD。"
-#: builtin/reset.c:80
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr "无法找到 HEAD 指向的树。"
-#: builtin/reset.c:86
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr "无法找到 %s 指向的树。"
-#: builtin/reset.c:113
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD 现在位于 %s"
-
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:197
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
-#: builtin/reset.c:297
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
msgid "be quiet, only report errors"
msgstr "安静模式，只报告错误"
-#: builtin/reset.c:299
+#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr "重置 HEAD 和索引"
-#: builtin/reset.c:300
+#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr "只重置 HEAD"
-#: builtin/reset.c:302 builtin/reset.c:304
+#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr "重置 HEAD、索引和工作区"
-#: builtin/reset.c:306
+#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr "重置 HEAD 但保存本地变更"
-#: builtin/reset.c:312
+#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr "将删除的路径标记为稍后添加"
-#: builtin/reset.c:329
+#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "无法将 '%s' 解析为一个有效的版本。"
-#: builtin/reset.c:337
+#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "无法将 '%s' 解析为一个有效的树对象。"
-#: builtin/reset.c:346
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
-#: builtin/reset.c:355
+#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:357
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能带路径进行%s重置。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:367
+#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能对纯仓库进行%s重置"
-#: builtin/reset.c:371
+#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr "-N 只能和 --mixed 同时使用"
-#: builtin/reset.c:388
+#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr "重置后取消暂存的变更："
-#: builtin/reset.c:394
+#: builtin/reset.c:398
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+"to make this the default.\n"
+msgstr ""
+"\n"
+"重置后，枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
+"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
+
+#: builtin/reset.c:408
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重置索引文件至版本 '%s'。"
-#: builtin/reset.c:398
+#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"
-#: builtin/rev-list.c:361
+#: builtin/rev-list.c:405
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
+
+#: builtin/rev-list.c:466
+msgid "object filtering requires --objects"
+msgstr "对象过滤需要 --objects"
+
+#: builtin/rev-list.c:469
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr "无效的稀疏值 '%s'"
+
+#: builtin/rev-list.c:510
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支持显示注解"
-#: builtin/rev-parse.c:402
+#: builtin/rev-list.c:513
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr "不能将 --use-bitmap-index 和对象过滤组合使用"
+
+#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
-#: builtin/rev-parse.c:407
+#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr "保持 `--` 作为一个参数传递"
-#: builtin/rev-parse.c:409
+#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr "遇到第一个非选项参数后停止解析"
-#: builtin/rev-parse.c:412
+#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr "以固定长格式输出"
-#: builtin/rev-parse.c:545
+#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
"\n"
"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
-#: builtin/revert.c:23
+#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
msgstr "git revert [<选项>] <提交号>..."
-#: builtin/revert.c:24
+#: builtin/revert.c:25
msgid "git revert <subcommand>"
msgstr "git revert <子命令>"
-#: builtin/revert.c:29
+#: builtin/revert.c:30
msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr "git cherry-pick [<选项>] <提交号>..."
-#: builtin/revert.c:30
+#: builtin/revert.c:31
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <子命令>"
-#: builtin/revert.c:90
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "选项 `%s' 期望一个大于零的数字"
+
+#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s：%s 不能和 %s 同时使用"
-#: builtin/revert.c:99
+#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "终止反转或拣选操作"
-#: builtin/revert.c:100
+#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "继续反转或拣选操作"
-#: builtin/revert.c:101
+#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "取消反转或拣选操作"
-#: builtin/revert.c:102
+#: builtin/revert.c:106
msgid "don't automatically commit"
msgstr "不要自动提交"
-#: builtin/revert.c:103
+#: builtin/revert.c:107
msgid "edit the commit message"
msgstr "编辑提交说明"
-#: builtin/revert.c:106
+#: builtin/revert.c:110
msgid "parent-number"
msgstr "父编号"
-#: builtin/revert.c:107
+#: builtin/revert.c:111
msgid "select mainline parent"
msgstr "选择主干父提交编号"
-#: builtin/revert.c:109
+#: builtin/revert.c:113
msgid "merge strategy"
msgstr "合并策略"
-#: builtin/revert.c:110
-msgid "option"
-msgstr "选项"
-
-#: builtin/revert.c:111
+#: builtin/revert.c:115
msgid "option for merge strategy"
msgstr "合并策略的选项"
-#: builtin/revert.c:120
+#: builtin/revert.c:124
msgid "append commit name"
msgstr "追加提交名称"
-#: builtin/revert.c:122
+#: builtin/revert.c:126
msgid "preserve initially empty commits"
msgstr "保留初始化的空提交"
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
-msgstr "允许提交说明为空"
-
-#: builtin/revert.c:124
+#: builtin/revert.c:128
msgid "keep redundant, empty commits"
msgstr "保持多余的、空的提交"
-#: builtin/revert.c:214
+#: builtin/revert.c:227
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:227
+#: builtin/revert.c:240
msgid "cherry-pick failed"
msgstr "拣选失败"
-#: builtin/rm.c:18
+#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<选项>] [--] <文件>..."
-#: builtin/rm.c:206
+#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
-#: builtin/rm.c:211
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
"\n"
"（使用 -f 强制删除）"
-#: builtin/rm.c:215
+#: builtin/rm.c:216
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] "下列文件索引中有变更"
msgstr[1] "下列文件索引中有变更"
-#: builtin/rm.c:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
"\n"
"（使用 --cached 保留本地文件，或用 -f 强制删除）"
-#: builtin/rm.c:225
+#: builtin/rm.c:226
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "如下文件有本地修改："
msgstr[1] "如下文件有本地修改："
-#: builtin/rm.c:243
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr "不列出删除的文件"
-#: builtin/rm.c:244
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr "只从索引区删除"
-#: builtin/rm.c:245
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr "忽略文件更新状态检查"
-#: builtin/rm.c:246
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr "允许递归删除"
-#: builtin/rm.c:248
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr "即使没有匹配，也以零状态退出"
+#: builtin/rm.c:289
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
+
#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgid "git rm: unable to remove %s"
msgstr "git rm：不能删除 %s"
-#: builtin/rm.c:369
-#, c-format
-msgid "could not remove '%s'"
-msgstr "无法删除 '%s'"
-
-#: builtin/send-pack.c:19
+#: builtin/send-pack.c:20
msgid ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
" --all 和明确的 <引用> 互斥。"
-#: builtin/send-pack.c:162
+#: builtin/send-pack.c:163
msgid "remote name"
msgstr "远程名称"
-#: builtin/send-pack.c:176
+#: builtin/send-pack.c:177
msgid "use stateless RPC protocol"
msgstr "使用无状态的 RPC 协议"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:178
msgid "read refs from stdin"
msgstr "从标准输入读取引用"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:179
msgid "print status from remote helper"
msgstr "打印来自远程 helper 的状态"
#: builtin/shortlog.c:14
-msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
-msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
+
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git log --pretty=short | git shortlog [<选项>]"
-#: builtin/shortlog.c:263
+#: builtin/shortlog.c:264
msgid "Group by committer rather than author"
msgstr "按照提交者分组而不是作者"
-#: builtin/shortlog.c:265
+#: builtin/shortlog.c:266
msgid "sort output according to the number of commits per author"
msgstr "根据每个作者的提交数量排序"
-#: builtin/shortlog.c:267
+#: builtin/shortlog.c:268
msgid "Suppress commit descriptions, only provides commit count"
msgstr "隐藏提交说明，只提供提交数量"
-#: builtin/shortlog.c:269
+#: builtin/shortlog.c:270
msgid "Show the email address of each author"
msgstr "显示每个作者的电子邮件地址"
-#: builtin/shortlog.c:270
-msgid "w[,i1[,i2]]"
-msgstr "w[,i1[,i2]]"
-
#: builtin/shortlog.c:271
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr "<w>[,<i1>[,<i2>]]"
+
+#: builtin/shortlog.c:272
msgid "Linewrap output"
msgstr "折行输出"
-#: builtin/show-branch.c:12
+#: builtin/shortlog.c:301
+msgid "too many arguments given outside repository"
+msgstr "仓库外执行提供了太多的参数"
+
+#: builtin/show-branch.c:13
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
-#: builtin/show-branch.c:16
+#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
-msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
-#: builtin/show-branch.c:376
+#: builtin/show-branch.c:395
#, 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:530
+#: builtin/show-branch.c:549
#, c-format
msgid "no matching refs with %s"
msgstr "没有和 %s 匹配的引用"
-#: builtin/show-branch.c:626
+#: builtin/show-branch.c:646
msgid "show remote-tracking and local branches"
msgstr "显示远程跟踪的和本地的分支"
-#: builtin/show-branch.c:628
+#: builtin/show-branch.c:648
msgid "show remote-tracking branches"
msgstr "显示远程跟踪的分支"
-#: builtin/show-branch.c:630
+#: builtin/show-branch.c:650
msgid "color '*!+-' corresponding to the branch"
msgstr "着色 '*!+-' 到相应的分支"
-#: builtin/show-branch.c:632
+#: builtin/show-branch.c:652
msgid "show <n> more commits after the common ancestor"
msgstr "显示共同祖先后的 <n> 个提交"
-#: builtin/show-branch.c:634
+#: builtin/show-branch.c:654
msgid "synonym to more=-1"
msgstr "和 more=-1 同义"
-#: builtin/show-branch.c:635
+#: builtin/show-branch.c:655
msgid "suppress naming strings"
msgstr "不显示字符串命名"
-#: builtin/show-branch.c:637
+#: builtin/show-branch.c:657
msgid "include the current branch"
msgstr "包括当前分支"
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:659
msgid "name commits with their object names"
msgstr "以对象名字命名提交"
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:661
msgid "show possible merge bases"
msgstr "显示可能合并的基线"
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:663
msgid "show refs unreachable from any other ref"
msgstr "显示没有任何引用的的引用"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:665
msgid "show commits in topological order"
msgstr "以拓扑顺序显示提交"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:668
msgid "show only commits not on the first branch"
msgstr "只显示不在第一个分支上的提交"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:670
msgid "show merges reachable from only one tip"
msgstr "显示仅一个分支可访问的合并提交"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:672
msgid "topologically sort, maintaining date order where possible"
msgstr "拓扑方式排序，并尽可能地保持日期顺序"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:675
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:676
msgid "show <n> most recent ref-log entries starting at base"
-msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
+msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
-#: builtin/show-branch.c:690
+#: builtin/show-branch.c:712
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
-#: builtin/show-branch.c:714
+#: builtin/show-branch.c:736
msgid "no branches given, and HEAD is not valid"
msgstr "未提供分支，且 HEAD 无效"
-#: builtin/show-branch.c:717
+#: builtin/show-branch.c:739
msgid "--reflog option needs one branch name"
msgstr "选项 --reflog 需要一个分支名"
-#: builtin/show-branch.c:720
+#: builtin/show-branch.c:742
#, 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:724
+#: builtin/show-branch.c:746
#, c-format
msgid "no such ref %s"
msgstr "无此引用 %s"
-#: builtin/show-branch.c:808
+#: builtin/show-branch.c:832
#, 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:812
+#: builtin/show-branch.c:836
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' 不是一个有效的引用。"
-#: builtin/show-branch.c:815
+#: builtin/show-branch.c:839
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "不能找到提交 %s（%s）"
-#: builtin/show-ref.c:10
+#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<模式>]"
-#: builtin/show-ref.c:159
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "只显示标签（可以和头共用）"
-#: builtin/show-ref.c:160
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "只显示头（可以和标签共用）"
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr "更严格的引用检测，需要精确的引用路径"
-#: builtin/show-ref.c:164 builtin/show-ref.c:166
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "显示 HEAD 引用，即使被过滤掉"
-#: builtin/show-ref.c:168
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "转换标签到对象 ID"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
-#: builtin/show-ref.c:174
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr "不打印结果到标准输出（例如与 --verify 参数共用）"
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr "显示从标准输入中读入的不在本地仓库中的引用"
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
+msgstr "git stash list [<选项>]"
+
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<选项>] [<stash>]"
+
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:26 builtin/stash.c:62
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <分支名> [<stash>]"
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr "git stash clear"
+
+#: builtin/stash.c:28 builtin/stash.c:77
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
+" [--] [<路径规格>...]]"
+
+#: builtin/stash.c:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<消息>]"
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
+
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'%s' 不像是一个贮藏提交"
+
+#: builtin/stash.c:147
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "指定了太多的版本：%s"
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr "未发现贮藏条目。"
+
+#: builtin/stash.c:175
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s 不是一个有效的引用名"
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash clear 不支持参数"
+
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "无法在合并过程应用贮藏"
+
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "无法生成差异 %s^!."
+
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
+msgstr "索引中有冲突。尝试不用 --index。"
+
+#: builtin/stash.c:427
+msgid "could not save index tree"
+msgstr "不能保存索引树"
+
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
+msgstr "无法从贮藏条目中恢复未跟踪文件"
+
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
+msgstr "正在合并 %s 和 %s"
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr "索引未从贮藏中恢复。"
+
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
+msgstr "尝试重建索引"
+
+#: builtin/stash.c:549
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "丢弃了 %s（%s）"
+
+#: builtin/stash.c:552
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s：无法丢弃贮藏条目"
+
+#: builtin/stash.c:577
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'%s' 不是一个贮藏引用"
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr "贮藏条目被保留以备您再次需要。"
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr "未指定分支名"
+
+#: builtin/stash.c:789 builtin/stash.c:826
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "无法用 %2$s 更新 %1$s"
+
+#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+msgid "stash message"
+msgstr "贮藏说明"
+
+#: builtin/stash.c:817
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" 需要一个 <提交> 参数"
+
+#: builtin/stash.c:1039 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr "没有选择变更"
+
+#: builtin/stash.c:1135 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "您尚未建立初始提交"
+
+#: builtin/stash.c:1162 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "无法保存当前索引状态"
+
+#: builtin/stash.c:1171 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "无法保存未跟踪文件"
+
+#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr "无法保存当前工作区状态"
+
+#: builtin/stash.c:1219 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr "不能记录工作区状态"
+
+#: builtin/stash.c:1268 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
+
+#: builtin/stash.c:1284
+msgid "Did you forget to 'git add'?"
+msgstr "您是否忘了执行 'git add'？"
+
+#: builtin/stash.c:1299 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr "没有要保存的本地修改"
+
+#: builtin/stash.c:1306 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr "无法初始化贮藏"
+
+#: builtin/stash.c:1321 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr "无法保存当前状态"
+
+#: builtin/stash.c:1326
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "保存工作目录和索引状态 %s"
+
+#: builtin/stash.c:1430 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr "无法删除工作区变更"
+
+#: builtin/stash.c:1465 builtin/stash.c:1501
+msgid "keep index"
+msgstr "保持索引"
+
+#: builtin/stash.c:1467 builtin/stash.c:1503
+msgid "stash in patch mode"
+msgstr "以补丁模式贮藏"
+
+#: builtin/stash.c:1468 builtin/stash.c:1504
+msgid "quiet mode"
+msgstr "静默模式"
+
+#: builtin/stash.c:1470 builtin/stash.c:1506
+msgid "include untracked files in stash"
+msgstr "贮藏中包含未跟踪文件"
+
+#: builtin/stash.c:1472 builtin/stash.c:1508
+msgid "include ignore files"
+msgstr "包含忽略的文件"
+
+#: builtin/stash.c:1568
+#, c-format
+msgid "could not exec %s"
+msgstr "不能执行 %s"
+
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr "跳过和移除所有的注释行"
-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr "为每一行的行首添加注释符和空格"
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
-#, c-format
-msgid "No such ref: %s"
-msgstr "没有这样的引用：%s"
-
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用名称，却得到 %s"
-#: builtin/submodule--helper.c:71
+#: builtin/submodule--helper.c:62
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "submodule--helper print-default-remote 不带参数"
+
+#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "无法从 url '%s' 剥离一个组件"
-#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记（anchor）"
-#: builtin/submodule--helper.c:307
+#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
+#: builtin/submodule--helper.c:650
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
-#: builtin/submodule--helper.c:389
+#: builtin/submodule--helper.c:522
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "进入 '%s'\n"
+
+#: builtin/submodule--helper.c:525
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"对 %s 执行 run_command 返回非零值。\n"
+"."
+
+#: builtin/submodule--helper.c:546
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"在递归 %s 的子模组执行 run_command 时返回非零值。\n"
+"."
+
+#: builtin/submodule--helper.c:562
+msgid "Suppress output of entering each submodule command"
+msgstr "阻止进入每一个子模组命令的输出"
+
+#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+msgid "Recurse into nested submodules"
+msgstr "递归进入嵌套子模组中"
+
+#: builtin/submodule--helper.c:569
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
+
+#: builtin/submodule--helper.c:596
#, c-format
msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own "
+"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
-#: builtin/submodule--helper.c:400
+#: builtin/submodule--helper.c:664
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册 url"
-#: builtin/submodule--helper.c:404
+#: builtin/submodule--helper.c:668
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
-msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
+msgstr "子模组 '%s'（%s）已对路径 '%s' 注册\n"
-#
-#: builtin/submodule--helper.c:414
+#: builtin/submodule--helper.c:678
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
-#: builtin/submodule--helper.c:421
+#: builtin/submodule--helper.c:685
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册更新模式"
-#: builtin/submodule--helper.c:437
+#: builtin/submodule--helper.c:707
msgid "Suppress output for initializing a submodule"
-msgstr "初始化子模组时抑制输出"
+msgstr "阻止子模组初始化的输出"
+
+#: builtin/submodule--helper.c:712
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [<选项>] [<路径>]"
+
+#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
+
+#: builtin/submodule--helper.c:823
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "无法解析子模组 '%s' 的 HEAD 引用"
+
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "递归子模组 '%s' 失败"
+
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+msgid "Suppress submodule status output"
+msgstr "阻止子模组状态输出"
+
+#: builtin/submodule--helper.c:875
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交"
+
+#: builtin/submodule--helper.c:876
+msgid "recurse into nested submodules"
+msgstr "递归进入嵌套子模组中"
-#: builtin/submodule--helper.c:442
-msgid "git submodule--helper init [<path>]"
-msgstr "git submodule--helper init [<路径>]"
+#: builtin/submodule--helper.c:881
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
-#: builtin/submodule--helper.c:470
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路径>"
-#: builtin/submodule--helper.c:475
-#, c-format
-msgid "no submodule mapping found in .gitmodules for path '%s'"
-msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
+#: builtin/submodule--helper.c:969
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "为 '%s' 同步子模组 url\n"
+
+#: builtin/submodule--helper.c:975
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "无法为子模组路径 '%s' 注册 url"
+
+#: builtin/submodule--helper.c:989
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "无法得到子模组 '%s' 的默认远程关联"
+
+#: builtin/submodule--helper.c:1000
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "无法为子模组 '%s' 更新远程关联"
+
+#: builtin/submodule--helper.c:1047
+msgid "Suppress output of synchronizing submodule url"
+msgstr "阻止子模组 url 同步的输出"
+
+#: builtin/submodule--helper.c:1054
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
+
+#: builtin/submodule--helper.c:1108
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr ""
+"子模组工作区 '%s' 包含一个 .git 目录（如果您确需删除它及其全部历史，使用 'rm "
+"-rf' 命令）"
+
+#: builtin/submodule--helper.c:1120
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr "子模组工作区 '%s' 包含本地修改；使用 '-f' 丢弃它们"
+
+#: builtin/submodule--helper.c:1128
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "已清除目录 '%s'\n"
+
+#: builtin/submodule--helper.c:1130
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "无法移除子模组工作区 '%s'\n"
+
+#: builtin/submodule--helper.c:1141
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "不能创建空的子模组目录 %s"
+
+#: builtin/submodule--helper.c:1157
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
+
+#: builtin/submodule--helper.c:1186
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr "删除子模组工作区，即使包含本地修改"
+
+#: builtin/submodule--helper.c:1187
+msgid "Unregister all submodules"
+msgstr "将所有子模组取消注册"
+
+#: builtin/submodule--helper.c:1192
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
+
+#: builtin/submodule--helper.c:1206
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
-#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模组 '%s' 不能添加仓库备选：%s"
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:1340
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:1347
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
-#: builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:1370
msgid "where the new submodule will be cloned to"
msgstr "新的子模组将要克隆的路径"
-#: builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:1373
msgid "name of the new submodule"
msgstr "新子模组的名称"
-#: builtin/submodule--helper.c:632
+#: builtin/submodule--helper.c:1376
msgid "url where to clone the submodule from"
msgstr "克隆子模组的 url 地址"
-#: builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:1384
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
+#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
msgid "force cloning progress"
msgstr "强制显示克隆进度"
-#: builtin/submodule--helper.c:646
+#: builtin/submodule--helper.c:1392
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:1423
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-#: builtin/submodule--helper.c:692
+#: builtin/submodule--helper.c:1437
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' 的子模组目录"
-#: builtin/submodule--helper.c:757
+#: builtin/submodule--helper.c:1473
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
+
+#: builtin/submodule--helper.c:1477
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
+
+#: builtin/submodule--helper.c:1570
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模组 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:761
+#: builtin/submodule--helper.c:1574
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想要执行 'update --init'？"
-#: builtin/submodule--helper.c:790
+#: builtin/submodule--helper.c:1604
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未合并的子模组 %s"
-#: builtin/submodule--helper.c:819
+#: builtin/submodule--helper.c:1633
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过子模组 '%s'"
-#: builtin/submodule--helper.c:952
+#: builtin/submodule--helper.c:1777
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "克隆 '%s' 失败。按计划重试"
-#: builtin/submodule--helper.c:963
+#: builtin/submodule--helper.c:1788
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次尝试克隆 '%s' 失败，退出"
-#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
msgid "path into the working tree"
msgstr "到工作区的路径"
-#: builtin/submodule--helper.c:996
+#: builtin/submodule--helper.c:1853
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作区中的路径，递归嵌套子模组"
-#: builtin/submodule--helper.c:1000
+#: builtin/submodule--helper.c:1857
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:1004
+#: builtin/submodule--helper.c:1863
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:1866
msgid "parallel jobs"
msgstr "并发任务"
-#: builtin/submodule--helper.c:1009
+#: builtin/submodule--helper.c:1868
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
-#: builtin/submodule--helper.c:1010
+#: builtin/submodule--helper.c:1869
msgid "don't print cloning progress"
msgstr "不要输出克隆进度"
-#: builtin/submodule--helper.c:1017
+#: builtin/submodule--helper.c:1876
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:1030
+#: builtin/submodule--helper.c:1889
msgid "bad value for update parameter"
msgstr "update 参数取值错误"
-#: builtin/submodule--helper.c:1098
+#: builtin/submodule--helper.c:1937
#, 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:1214
+#: builtin/submodule--helper.c:2060
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "无法获得子模组 '%s' 的仓库句柄"
+
+#: builtin/submodule--helper.c:2093
msgid "recurse into submodules"
msgstr "在子模组中递归"
-#: builtin/submodule--helper.c:1220
-msgid "git submodule--helper embed-git-dir [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<路径>...]"
+#: builtin/submodule--helper.c:2099
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
+
+#: builtin/submodule--helper.c:2156
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr "检查写入 .gitmodules 文件是否安全"
+
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
+msgstr "取消 .gitmodules 文件中的设置"
+
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <名称> [<值>]"
+
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <名称>"
-#: builtin/submodule--helper.c:1278
+#: builtin/submodule--helper.c:2166
+msgid "git submodule--helper config --check-writeable"
+msgstr "git submodule--helper config --check-writeable"
+
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr "请确认 .gitmodules 文件在工作区里"
+
+#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
-#: builtin/submodule--helper.c:1284
+#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
msgid "shorten ref output"
msgstr "缩短引用输出"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
msgid "reason"
msgstr "原因"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
msgid "reason of the update"
msgstr "更新的原因"
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
+"\t\t<标签名> [<头>]"
-#: builtin/tag.c:25
+#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d <标签名>..."
-#: builtin/tag.c:26
+#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
"at <对象>]\n"
"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
-#: builtin/tag.c:28
+#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<格式>] <标签名>..."
-#: builtin/tag.c:86
+#: builtin/tag.c:88
#, c-format
msgid "tag '%s' not found."
msgstr "未发现标签 '%s'。"
-#: builtin/tag.c:102
+#: builtin/tag.c:104
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除标签 '%s'（曾为 %s）\n"
-#: builtin/tag.c:131
+#: builtin/tag.c:134
#, c-format
msgid ""
"\n"
" %s\n"
"以 '%c' 开头的行将被忽略。\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:138
#, c-format
msgid ""
"\n"
" %s\n"
"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
-#: builtin/tag.c:189
+#: builtin/tag.c:192
msgid "unable to sign the tag"
msgstr "无法签署标签"
-#: builtin/tag.c:191
+#: builtin/tag.c:194
msgid "unable to write tag file"
msgstr "无法写标签文件"
-#: builtin/tag.c:215
+#: builtin/tag.c:210
+#, c-format
+msgid ""
+"You have created a nested tag. The object referred to by your new tag is\n"
+"already a tag. If you meant to tag the object that it points to, use:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+msgstr ""
+"您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n"
+"对其指向的目标创建标签，使用：\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:226
msgid "bad object type."
msgstr "坏的对象类型。"
-#: builtin/tag.c:261
+#: builtin/tag.c:278
msgid "no tag message?"
msgstr "无标签说明？"
-#: builtin/tag.c:268
+#: builtin/tag.c:285
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "标签说明被保留在 %s\n"
-#: builtin/tag.c:376
+#: builtin/tag.c:396
msgid "list tag names"
msgstr "列出标签名称"
-#: builtin/tag.c:378
+#: builtin/tag.c:398
msgid "print <n> lines of each tag message"
msgstr "每个标签信息打印 <n> 行"
-#: builtin/tag.c:380
+#: builtin/tag.c:400
msgid "delete tags"
msgstr "删除标签"
-#: builtin/tag.c:381
+#: builtin/tag.c:401
msgid "verify tags"
msgstr "验证标签"
-#: builtin/tag.c:383
+#: builtin/tag.c:403
msgid "Tag creation options"
msgstr "标签创建选项"
-#: builtin/tag.c:385
+#: builtin/tag.c:405
msgid "annotated tag, needs a message"
msgstr "附注标签，需要一个说明"
-#: builtin/tag.c:387
+#: builtin/tag.c:407
msgid "tag message"
msgstr "标签说明"
-#: builtin/tag.c:389
+#: builtin/tag.c:409
+msgid "force edit of tag message"
+msgstr "强制编辑标签说明"
+
+#: builtin/tag.c:410
msgid "annotated and GPG-signed tag"
msgstr "附注并附加 GPG 签名的标签"
-#: builtin/tag.c:393
+#: builtin/tag.c:413
msgid "use another key to sign the tag"
msgstr "使用另外的私钥签名该标签"
-#: builtin/tag.c:394
+#: builtin/tag.c:414
msgid "replace the tag if exists"
msgstr "如果存在，替换现有的标签"
-#: builtin/tag.c:395 builtin/update-ref.c:368
+#: builtin/tag.c:415 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "创建引用日志"
-#: builtin/tag.c:397
+#: builtin/tag.c:417
msgid "Tag listing options"
msgstr "标签列表选项"
-#: builtin/tag.c:398
+#: builtin/tag.c:418
msgid "show tag list in columns"
msgstr "以列的方式显示标签列表"
-#: builtin/tag.c:399 builtin/tag.c:401
+#: builtin/tag.c:419 builtin/tag.c:421
msgid "print only tags that contain the commit"
msgstr "只打印包含该提交的标签"
-#: builtin/tag.c:400 builtin/tag.c:402
+#: builtin/tag.c:420 builtin/tag.c:422
msgid "print only tags that don't contain the commit"
msgstr "只打印不包含该提交的标签"
-#: builtin/tag.c:403
+#: builtin/tag.c:423
msgid "print only tags that are merged"
msgstr "只打印已经合并的标签"
-#: builtin/tag.c:404
+#: builtin/tag.c:424
msgid "print only tags that are not merged"
msgstr "只打印尚未合并的标签"
-#: builtin/tag.c:409
+#: builtin/tag.c:428
msgid "print only tags of the object"
msgstr "只打印指向该对象的标签"
-#: builtin/tag.c:453
+#: builtin/tag.c:472
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不兼容"
-#: builtin/tag.c:475
+#: builtin/tag.c:494
msgid "-n option is only allowed in list mode"
msgstr "-n 选项只允许用在列表显示模式"
-#: builtin/tag.c:477
+#: builtin/tag.c:496
msgid "--contains option is only allowed in list mode"
msgstr "--contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:479
+#: builtin/tag.c:498
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:481
+#: builtin/tag.c:500
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at 选项只允许用在列表显示模式"
-#: builtin/tag.c:483
+#: builtin/tag.c:502
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
-#: builtin/tag.c:494
+#: builtin/tag.c:513
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"
-#: builtin/tag.c:513
+#: builtin/tag.c:532
msgid "too many params"
msgstr "太多参数"
-#: builtin/tag.c:519
+#: builtin/tag.c:538
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的标签名称。"
-#: builtin/tag.c:524
+#: builtin/tag.c:543
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
-#: builtin/tag.c:554
+#: builtin/tag.c:574
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'（曾为 %s）\n"
-#: builtin/unpack-objects.c:494
+#: builtin/unpack-objects.c:500
msgid "Unpacking objects"
msgstr "展开对象中"
-#: builtin/update-index.c:80
+#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
-msgstr "无法创建目录 %s"
+msgstr "创建目录 %s 失败"
-#: builtin/update-index.c:86
-#, c-format
-msgid "failed to stat %s"
-msgstr "对 %s 调用 stat 失败"
-
-#: builtin/update-index.c:96
+#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
-msgstr "无法创建文件 %s"
+msgstr "创建文件 %s 失败"
-#: builtin/update-index.c:104
+#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
-msgstr "无法删除文件 %s"
+msgstr "删除文件 %s 失败"
-#: builtin/update-index.c:111 builtin/update-index.c:217
+#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
-msgstr "无法删除目录 %s"
+msgstr "删除目录 %s 失败"
-#: builtin/update-index.c:136
+#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr "在 '%s' 中测试 mtime "
-#: builtin/update-index.c:150
+#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr "添加一个新文件后，目录的状态信息未改变"
-#: builtin/update-index.c:163
+#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr "添加一个新目录后，目录的状态信息未改变"
-#: builtin/update-index.c:176
+#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr "更新一个文件后，目录的状态信息被修改"
-#: builtin/update-index.c:187
+#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "在子目录中添加文件后，目录的状态信息被修改"
-#: builtin/update-index.c:198
+#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr "删除一个文件后，目录的状态信息未改变"
-#: builtin/update-index.c:211
+#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr "删除一个目录后，目录的状态信息未改变"
-#: builtin/update-index.c:218
+#: builtin/update-index.c:221
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:571
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<选项>] [--] [<文件>...]"
-#: builtin/update-index.c:926
+#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr "当索引需要更新时继续刷新"
-#: builtin/update-index.c:929
+#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr "刷新：忽略子模组"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr "不忽略新的文件"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr "让文件替换目录（反之亦然）"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr "通知文件从工作区丢失"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引区包含未合并的条目也执行刷新"
-#: builtin/update-index.c:941
+#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr "刷新统计信息"
-#: builtin/update-index.c:945
+#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
-#: builtin/update-index.c:949
+#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr "<存取模式>,<对象>,<路径>"
-#: builtin/update-index.c:950
+#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr "添加指定的条目到索引区"
-#: builtin/update-index.c:959
+#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr "把文件标记为 \"没有变更\""
-#: builtin/update-index.c:962
+#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
-#: builtin/update-index.c:965
+#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr "把文件标记为 \"仅索引\""
-#: builtin/update-index.c:968
+#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr "只添加到索引区；不添加对象到对象库"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作区里，也删除路径"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "携带 --stdin：输入的行以 null 字符终止"
-#: builtin/update-index.c:977
+#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr "从标准输入中读取需要更新的路径列表"
-#: builtin/update-index.c:981
+#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr "从标准输入添加条目到索引区"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "为指定文件重新生成第2和第3暂存区"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr "只更新与 HEAD 不同的条目"
-#: builtin/update-index.c:993
+#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr "忽略工作区丢失的文件"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr "在标准输出显示操作"
-#: builtin/update-index.c:998
+#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘记保存的未解决的冲突"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr "以这种格式写入索引区"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr "启用或禁用索引拆分"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr "启用/禁用对未跟踪文件的缓存"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr "测试文件系统是否支持未跟踪文件缓存"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
-#: builtin/update-index.c:1107
+#: builtin/update-index.c:1058
+msgid "write out the index even if is not flagged as changed"
+msgstr "即使没有被标记为已更改，也要写出索引"
+
+#: builtin/update-index.c:1060
+msgid "enable or disable file system monitor"
+msgstr "启用或禁用文件系统监控"
+
+#: builtin/update-index.c:1062
+msgid "mark files as fsmonitor valid"
+msgstr "标记文件为 fsmonitor 有效"
+
+#: builtin/update-index.c:1065
+msgid "clear fsmonitor valid bit"
+msgstr "清除 fsmonitor 有效位"
+
+#: builtin/update-index.c:1168
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
+#: builtin/update-index.c:1177
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
+#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修"
"改它。"
-#: builtin/update-index.c:1131
+#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr "缓存未跟踪文件被禁用"
-#: builtin/update-index.c:1139
+#: builtin/update-index.c:1200
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或"
"修改它。"
-#: builtin/update-index.c:1143
+#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "缓存未跟踪文件在 '%s' 启用"
+#: builtin/update-index.c:1212
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr "core.fsmonitor 未设置；如果想要启用 fsmonitor 请设置该选项"
+
+#: builtin/update-index.c:1216
+msgid "fsmonitor enabled"
+msgstr "fsmonitor 被启用"
+
+#: builtin/update-index.c:1219
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr "core.fsmonitor 已设置；如果想要禁用 fsmonitor 请移除该选项"
+
+#: builtin/update-index.c:1223
+msgid "fsmonitor disabled"
+msgstr "fsmonitor 被禁用"
+
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<选项>] --stdin [-z]"
-#: builtin/update-ref.c:363
+#: builtin/update-ref.c:364
msgid "delete the reference"
msgstr "删除引用"
-#: builtin/update-ref.c:365
+#: builtin/update-ref.c:366
msgid "update <refname> not the one it points to"
msgstr "更新 <引用名> 本身而不是它指向的引用"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:367
msgid "stdin has NUL-terminated arguments"
msgstr "标准输入有以 NUL 字符终止的参数"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:368
msgid "read updates from stdin"
msgstr "从标准输入读取更新"
msgid "update the info files from scratch"
msgstr "从头开始更新文件信息"
-#: builtin/verify-commit.c:18
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<选项>] <目录>"
+
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "在一次单独的请求/响应之后退出"
+
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
+msgstr "在初始的引用广告后立即退出"
+
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "如果 <目录> 不是一个 Git 目录，不要尝试 <目录>/.git/"
+
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "不活动 <n> 秒钟后终止传输"
+
+#: builtin/verify-commit.c:20
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <提交>..."
-#: builtin/verify-commit.c:73
+#: builtin/verify-commit.c:76
msgid "print commit contents"
msgstr "打印提交内容"
-#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
msgid "print raw gpg status output"
msgstr "打印原始 gpg 状态输出"
msgid "print tag contents"
msgstr "打印标签内容"
-#: builtin/worktree.c:16
-msgid "git worktree add [<options>] <path> [<branch>]"
-msgstr "git worktree add [<选项>] <路径> [<分支>]"
+#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<选项>] <路径> [<提交>]"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<选项>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<选项>] <路径>"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:21
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <工作区> <新路径>"
+
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<选项>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:23
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<选项>] <工作区>"
+
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:46
+#: builtin/worktree.c:61 builtin/worktree.c:891
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "删除 '%s' 失败"
+
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "删除工作区/%s：不是一个有效的目录"
-#: builtin/worktree.c:52
+#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "删除 worktrees/%s：gitdir 文件不存在"
-#: builtin/worktree.c:57 builtin/worktree.c:66
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
-#: builtin/worktree.c:76
+#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"%<PRIuMAX>)"
msgstr "删除工作树/%s：读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）"
-#: builtin/worktree.c:84
+#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "删除 worktrees/%s：无效的 gitdir 文件"
-#: builtin/worktree.c:100
+#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr "报告清除的工作区"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
-msgstr "将早于 <time> 的工作区过期"
+msgstr "将早于 <时间> 的工作区过期"
-#: builtin/worktree.c:223
+#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已经存在"
-#: builtin/worktree.c:254
+#: builtin/worktree.c:252
+#, c-format
+msgid "unable to re-add worktree '%s'"
+msgstr "无法再次添加工作区 '%s'"
+
+#: builtin/worktree.c:257
+#, c-format
+msgid ""
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+msgstr ""
+"'%s' 是一个丢失但锁定的工作区，使用\n"
+"'add -f -f' 覆盖，或 'unlock' 和 'prune' 或 'remove' 清除"
+
+#: builtin/worktree.c:259
+#, c-format
+msgid ""
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
+msgstr ""
+"'%s' 是一个丢失但已经注册的工作区，使用\n"
+"'add -f' 覆盖，或 'prune' 或 'remove' 清除"
+
+#: builtin/worktree.c:302
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/worktree.c:293
+#: builtin/worktree.c:432 builtin/worktree.c:438
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr "准备工作区（新分支 '%s'）"
+
+#: builtin/worktree.c:434
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr "准备工作区（重置分支 '%s'，之前为 %s）"
+
+#: builtin/worktree.c:443
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr "准备工作区（检出 '%s'）"
+
+#: builtin/worktree.c:449
#, c-format
-msgid "Preparing %s (identifier %s)"
-msgstr "准备 %s（标识符 %s）"
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr "准备工作区（分离头指针 %s）"
-#: builtin/worktree.c:345
+#: builtin/worktree.c:490
msgid "checkout <branch> even if already checked out in other worktree"
-msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
+msgstr "检出 <分支>，即使已经被检出到其它工作区"
-#: builtin/worktree.c:347
+#: builtin/worktree.c:493
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:349
+#: builtin/worktree.c:495
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:351
+#: builtin/worktree.c:497
msgid "populate the new working tree"
msgstr "生成新的工作区"
-#: builtin/worktree.c:352
+#: builtin/worktree.c:498
msgid "keep the new working tree locked"
msgstr "锁定新工作区"
-#: builtin/worktree.c:360
+#: builtin/worktree.c:501
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "设置跟踪模式（参见 git-branch(1)）"
+
+#: builtin/worktree.c:504
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "尝试为新分支名匹配一个远程跟踪分支"
+
+#: builtin/worktree.c:512
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:499
+#: builtin/worktree.c:573
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr "只能在创建新分支时使用选项 --[no-]track "
+
+#: builtin/worktree.c:673
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:511 builtin/worktree.c:544
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:513 builtin/worktree.c:546
+#: builtin/worktree.c:687 builtin/worktree.c:720
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:518
+#: builtin/worktree.c:692
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定，原因：%s"
-#: builtin/worktree.c:520
+#: builtin/worktree.c:694
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:548
+#: builtin/worktree.c:722
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
-#: builtin/write-tree.c:14
+#: builtin/worktree.c:763
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr "不能移动或删除包含子模组的工作区"
+
+#: builtin/worktree.c:771
+msgid "force move even if worktree is dirty or locked"
+msgstr "强制移动，即使工作区是脏的或已锁定"
+
+#: builtin/worktree.c:794 builtin/worktree.c:921
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "'%s' 是一个主工作区"
+
+#: builtin/worktree.c:799
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "无法从 '%s' 算出目标名称"
+
+#: builtin/worktree.c:805
+#, c-format
+msgid "target '%s' already exists"
+msgstr "目标 '%s' 已存在"
+
+#: builtin/worktree.c:813
+#, c-format
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"无法移动一个锁定的工作区，锁定原因：%s\n"
+"使用 'move -f -f' 覆盖或先解锁"
+
+#: builtin/worktree.c:815
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"无法移动一个锁定的工作区，\n"
+"使用 'move -f -f' 覆盖或先解锁"
+
+#: builtin/worktree.c:818
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "验证失败，无法移动工作区：%s"
+
+#: builtin/worktree.c:823
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "移动 '%s' 到 '%s' 失败"
+
+#: builtin/worktree.c:871
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "在 '%s' 中执行 'git status' 失败"
+
+#: builtin/worktree.c:875
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr "'%s' 是脏的，使用 --force 删除"
+
+#: builtin/worktree.c:880
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d"
+
+#: builtin/worktree.c:903
+msgid "force removal even if worktree is dirty or locked"
+msgstr "强制删除，即使工作区是脏的或已锁定"
+
+#: builtin/worktree.c:926
+#, c-format
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"无法删除一个锁定的工作区，锁定原因：%s\n"
+"使用 'remove -f -f' 覆盖或先解锁"
+
+#: builtin/worktree.c:928
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"无法删除一个锁定的工作区，\n"
+"使用 'remove -f -f' 覆盖或先解锁"
+
+#: builtin/worktree.c:931
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "验证失败，无法删除工作区：%s"
+
+#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr "<前缀>/"
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr "将 <前缀> 子目录内容写到一个树对象"
msgid "only useful for debugging"
msgstr "只对调试有用"
-#: upload-pack.c:23
-msgid "git upload-pack [<options>] <dir>"
-msgstr "git upload-pack [<选项>] <目录>"
-
-#: upload-pack.c:1040
-msgid "quit after a single request/response exchange"
-msgstr "在一次单独的请求/响应（request/response）交换后退出"
-
-#: upload-pack.c:1042
-msgid "exit immediately after initial ref advertisement"
-msgstr "在初始的引用广告后立即退出"
-
-#: upload-pack.c:1044
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
-
-#: upload-pack.c:1046
-msgid "interrupt transfer after <n> seconds of inactivity"
-msgstr "不活动 <n> 秒钟后终止传输"
-
-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr "调试信息输出到标准错误"
-#: git.c:15
+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "提交 %s 没有标记为可达"
+
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
+msgstr "太多提交标记为可达"
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<选项>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "对能力广告之后立即退出"
+
+#: git.c:27
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
+" [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
+" <命令> [<参数>]"
+
+#: git.c:34
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
"帮助。"
-#: http.c:338
+#: git.c:185
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "没有为 --git-dir 提供目录\n"
+
+#: git.c:199
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "没有为 --namespace 提供命名空间\n"
+
+#: git.c:213
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "没有为 --work-tree 提供目录\n"
+
+#: git.c:227
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "没有为 --super-prefix 提供前缀\n"
+
+#: git.c:249
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "应为 -c 提供一个配置字符串\n"
+
+#: git.c:287
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "没有为 -C 提供目录\n"
+
+#: git.c:313
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "未知选项：%s\n"
+
+#: git.c:359
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "在扩展别名 '%s' 时：'%s'"
+
+#: git.c:368
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"别名 '%s' 修改环境变量。您可以使用在别名中\n"
+"使用 '!git'"
+
+#: git.c:376
+#, c-format
+msgid "empty alias for %s"
+msgstr "%s 的空别名"
+
+#: git.c:379
+#, c-format
+msgid "recursive alias: %s"
+msgstr "递归的别名：%s"
+
+#: git.c:459
+msgid "write failure on standard output"
+msgstr "在标准输出写入失败"
+
+#: git.c:461
+msgid "unknown write failure on standard output"
+msgstr "到标准输出的未知写入错误"
+
+#: git.c:463
+msgid "close failed on standard output"
+msgstr "标准输出关闭失败"
+
+#: git.c:797
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr "检测到别名循环：'%s'的扩展未终止：%s"
+
+#: git.c:847
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "不能作为内置命令处理 %s"
+
+#: git.c:860
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"用法：%s\n"
+"\n"
+
+#: git.c:880
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n"
+
+#: git.c:892
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "运行命令 '%s' 失败：%s\n"
+
+#: http.c:378
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "http.postbuffer 为负值，默认为 %d"
+
+#: http.c:399
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "不支持委托控制，因为 cURL < 7.22.0"
+
+#: http.c:408
+msgid "Public key pinning not supported with cURL < 7.44.0"
+msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
+
+#: http.c:876
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr "不支持 CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0"
+
+#: http.c:949
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
+msgstr "不支持协议限制，因为 cURL < 7.19.4"
+
+#: http.c:1085
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端："
+
+#: http.c:1092
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr "无法设置 SSL 后端为 '%s'：cURL: cURL 没有使用 SSL 后端构建"
+
+#: http.c:1096
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "无法将 SSL 后端设置为 '%s'：已经设置"
+
+#: http.c:1965
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
+msgstr ""
+"不能更新重定向的 url base：\n"
+" 请求：%s\n"
+" 重定向：%s"
+
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "在 push-option 取值中无效的引号：'%s'"
+
+#: remote-curl.c:254
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs 无效：这是一个 git 仓库么？"
+
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
+msgstr "无效的服务端响应。预期服务，得到 flush 包"
+
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "无效的服务端响应，得到 '%s'"
+
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
+msgstr "仓库 '%s' 未找到"
+
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "'%s' 鉴权失败"
+
+#: remote-curl.c:454
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "无法访问 '%s'：%s"
+
+#: remote-curl.c:460
+#, c-format
+msgid "redirecting to %s"
+msgstr "重定向到 %s"
+
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符"
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
+
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC 失败。%s"
+
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
+msgstr "不能处理这么大的推送"
+
+#: remote-curl.c:879
#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
-msgstr "http.postbuffer 为负值，默认为 %d"
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "不能压缩请求，zlib 压缩错误 %d"
-#: http.c:359
-msgid "Delegation control is not supported with cURL < 7.22.0"
-msgstr "当 cURL < 7.22.0 时，不支持委托控制"
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "不能压缩请求，zlib 结束错误 %d"
-#: http.c:368
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "哑 http 传输不支持 shalllow 能力"
-#: http.c:1768
+#: remote-curl.c:1028
+msgid "fetch failed."
+msgstr "获取失败。"
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr "无法通过智能 HTTP 获取 sha1"
+
+#: remote-curl.c:1120 remote-curl.c:1126
#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-" asked for: %s\n"
-" redirect: %s"
-msgstr ""
-"不能更新重定向的 url base：\n"
-" 请求：%s\n"
-" 重定向：%s"
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "协议错误：期望 sha/ref，却得到 '%s'"
-#: remote-curl.c:324
+#: remote-curl.c:1138 remote-curl.c:1252
#, c-format
-msgid "redirecting to %s"
-msgstr "重定向到 %s"
+msgid "http transport does not support %s"
+msgstr "http 传输协议不支持 %s"
-#: common-cmds.h:9
-msgid "start a working area (see also: git help tutorial)"
-msgstr "开始一个工作区（参见：git help tutorial）"
+#: remote-curl.c:1174
+msgid "git-http-push failed"
+msgstr "git-http-push 失败"
-#: common-cmds.h:10
-msgid "work on the current change (see also: git help everyday)"
-msgstr "在当前变更上工作（参见：git help everyday）"
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl：用法：git remote-curl <远程> [<url>]"
-#: common-cmds.h:11
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "检查历史和状态（参见：git help revisions）"
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl：错误读取来自 git 的命令流"
-#: common-cmds.h:12
-msgid "grow, mark and tweak your common history"
-msgstr "扩展、标记和调校您的历史记录"
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl：尝试没有本地仓库下获取"
-#: common-cmds.h:13
-msgid "collaborate (see also: git help workflows)"
-msgstr "协同（参见：git help workflows）"
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl：未知的来自 git 的命令 '%s'"
+
+#: list-objects-filter-options.h:61
+msgid "args"
+msgstr "参数"
-#: common-cmds.h:17
+#: list-objects-filter-options.h:62
+msgid "object filtering"
+msgstr "对象过滤"
+
+#: parse-options.h:170
+msgid "expiry-date"
+msgstr "到期时间"
+
+#: parse-options.h:184
+msgid "no-op (backward compatibility)"
+msgstr "空操作（向后兼容）"
+
+#: parse-options.h:304
+msgid "be more verbose"
+msgstr "更加详细"
+
+#: parse-options.h:306
+msgid "be more quiet"
+msgstr "更加安静"
+
+#: parse-options.h:312
+msgid "use <n> digits to display SHA-1s"
+msgstr "用 <n> 位数字显示 SHA-1 哈希值"
+
+#: parse-options.h:331
+msgid "how to strip spaces and #comments from message"
+msgstr "设置如何删除提交说明里的空格和#注释"
+
+#: ref-filter.h:101
+msgid "key"
+msgstr "key"
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr "排序的字段名"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr "如果可能，重用冲突解决更新索引"
+
+#: command-list.h:50
msgid "Add file contents to the index"
msgstr "添加文件内容至索引"
-#: common-cmds.h:18
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
+msgstr "应用邮箱格式的系列补丁"
+
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
+msgstr "使用提交信息注释文件行"
+
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
+msgstr "应用一个补丁到文件和/或索引区"
+
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
+msgstr "将一个 GNU Arch 仓库导入到 Git"
+
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
+msgstr "基于一个指定的树创建文件存档"
+
+#: command-list.h:56
msgid "Use binary search to find the commit that introduced a bug"
msgstr "通过二分查找定位引入 bug 的提交"
-#: common-cmds.h:19
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
+msgstr "显示文件每一行最后修改的版本和修改者"
+
+#: command-list.h:58
msgid "List, create, or delete branches"
msgstr "列出、创建或删除分支"
-#: common-cmds.h:20
+#: command-list.h:59
+msgid "Move objects and refs by archive"
+msgstr "通过归档移动对象和引用"
+
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
+msgstr "提供仓库对象的内容、类型或大小"
+
+#: command-list.h:61
+msgid "Display gitattributes information"
+msgstr "显示 gitattributes 信息"
+
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
+msgstr "调试 gitignore / exclude 文件"
+
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
+msgstr "显示联系人的规范名称和电子邮件"
+
+#: command-list.h:64
msgid "Switch branches or restore working tree files"
msgstr "切换分支或恢复工作区文件"
-#: common-cmds.h:21
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
+msgstr "从索引拷贝文件到工作区"
+
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
+msgstr "确保引用名称格式正确"
+
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
+msgstr "查找尚未应用到上游的提交"
+
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
+msgstr "应用一些现存提交引入的修改"
+
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
+msgstr "git-commit 的图形替代界面"
+
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
+msgstr "从工作区中删除未跟踪文件"
+
+#: command-list.h:71
msgid "Clone a repository into a new directory"
-msgstr "克隆一个仓库到一个新目录"
+msgstr "克隆仓库到一个新目录"
+
+#: command-list.h:72
+msgid "Display data in columns"
+msgstr "以列的方式显示数据"
-#: common-cmds.h:22
+#: command-list.h:73
msgid "Record changes to the repository"
msgstr "记录变更到仓库"
-#: common-cmds.h:23
+#: command-list.h:74
+msgid "Write and verify Git commit-graph files"
+msgstr "写入和校验 Git 提交图文件"
+
+#: command-list.h:75
+msgid "Create a new commit object"
+msgstr "创建一个新的提交对象"
+
+#: command-list.h:76
+msgid "Get and set repository or global options"
+msgstr "获取和设置仓库或者全局选项"
+
+#: command-list.h:77
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr "计算未打包对象的数量和磁盘空间占用"
+
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
+msgstr "检索和存储用户密码"
+
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
+msgstr "在内存中临时存储密码的助手"
+
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
+msgstr "在磁盘存储密码的助手"
+
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
+msgstr "将一个提交导出到 CVS 检出中"
+
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据"
+
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
+msgstr "Git 的一个 CVS 服务模拟器"
+
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
+msgstr "一个非常简单的 Git 仓库服务器"
+
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
+msgstr "基于一个现存的引用为一个对象起一个可读的名称"
+
+#: command-list.h:86
msgid "Show changes between commits, commit and working tree, etc"
msgstr "显示提交之间、提交和工作区之间等的差异"
-#: common-cmds.h:24
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
+msgstr "比较工作区和索引区中的文件"
+
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
+msgstr "将一个树和工作区或索引做比较"
+
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr "比较两个树对象的文件内容和模式"
+
+#: command-list.h:90
+msgid "Show changes using common diff tools"
+msgstr "使用常见的差异工具显示更改"
+
+#: command-list.h:91
+msgid "Git data exporter"
+msgstr "Git 数据导出器"
+
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
+msgstr "Git 快速数据导入器后端"
+
+#: command-list.h:93
msgid "Download objects and refs from another repository"
msgstr "从另外一个仓库下载对象和引用"
-#: common-cmds.h:25
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
+msgstr "从另一个仓库获取缺失的对象"
+
+#: command-list.h:95
+msgid "Rewrite branches"
+msgstr "重写分支"
+
+#: command-list.h:96
+msgid "Produce a merge commit message"
+msgstr "生成一个合并提交信息"
+
+#: command-list.h:97
+msgid "Output information on each ref"
+msgstr "对每一个引用输出信息 "
+
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
+msgstr "准备电子邮件提交的补丁"
+
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr "验证仓库中对象的连通性和有效性"
+
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr "清除不必要的文件和优化本地仓库"
+
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr "从 git-archive 创建的归档文件中提取提交 ID"
+
+#: command-list.h:102
msgid "Print lines matching a pattern"
msgstr "输出和模式匹配的行"
-#: common-cmds.h:26
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
+msgstr "一个便携的 Git 图形客户端"
+
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr "从一个文件计算对象 ID，并可以创建 blob 数据对象"
+
+#: command-list.h:105
+msgid "Display help information about Git"
+msgstr "显示 Git 的帮助信息"
+
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
+msgstr "Git HTTP 协议的服务端实现"
+
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
+msgstr "通过 HTTP 从远程 Git 仓库下载"
+
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr "通过 HTTP/DAV 推送对象另一个仓库"
+
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr "从标准输入将一组补丁发送到IMAP文件夹"
+
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
+msgstr "从一个现存的包存档文件创建包索引"
+
+#: command-list.h:111
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
-#: common-cmds.h:27
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
+msgstr "在 gitweb 中即时浏览您的工作仓库"
+
+#: command-list.h:113
+msgid "Add or parse structured information in commit messages"
+msgstr "添加或解析提交说明中的结构化信息"
+
+#: command-list.h:114
+msgid "The Git repository browser"
+msgstr "Git 仓库浏览器"
+
+#: command-list.h:115
msgid "Show commit logs"
msgstr "显示提交日志"
-#: common-cmds.h:28
+#: command-list.h:116
+msgid "Show information about files in the index and the working tree"
+msgstr "显示索引和工作区中文件的信息"
+
+#: command-list.h:117
+msgid "List references in a remote repository"
+msgstr "显示一个远程仓库的引用"
+
+#: command-list.h:118
+msgid "List the contents of a tree object"
+msgstr "显示一个树对象的内容"
+
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr "从单个电子邮件中提取补丁和作者身份"
+
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
+msgstr "简单的 UNIX mbox 邮箱切分程序"
+
+#: command-list.h:121
msgid "Join two or more development histories together"
msgstr "合并两个或更多开发历史"
-#: common-cmds.h:29
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
+msgstr "为了合并查找尽可能好的公共祖先提交"
+
+#: command-list.h:123
+msgid "Run a three-way file merge"
+msgstr "运行一个三路文件合并"
+
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
+msgstr "对于需要合并的文件执行合并"
+
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
+msgstr "与 git-merge-index 一起使用的标准向导程序"
+
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr "运行合并冲突解决工具以解决合并冲突"
+
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
+msgstr "显示三路合并而不动索引"
+
+#: command-list.h:128
+msgid "Write and verify multi-pack-indexes"
+msgstr "写入和校验多包索引"
+
+#: command-list.h:129
+msgid "Creates a tag object"
+msgstr "创建一个标签对象"
+
+#: command-list.h:130
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr "基于 ls-tree 的格式化文本创建一个树对象"
+
+#: command-list.h:131
msgid "Move or rename a file, a directory, or a symlink"
msgstr "移动或重命名一个文件、目录或符号链接"
-#: common-cmds.h:30
+# 查找给定版本的符号名称
+#: command-list.h:132
+msgid "Find symbolic names for given revs"
+msgstr "查找给定版本的符号名称"
+
+#: command-list.h:133
+msgid "Add or inspect object notes"
+msgstr "添加或检查对象注释"
+
+#: command-list.h:134
+msgid "Import from and submit to Perforce repositories"
+msgstr "导入和提交到 Perforce 仓库中"
+
+#: command-list.h:135
+msgid "Create a packed archive of objects"
+msgstr "创建对象的存档包"
+
+#: command-list.h:136
+msgid "Find redundant pack files"
+msgstr "查找冗余的包文件"
+
+#: command-list.h:137
+msgid "Pack heads and tags for efficient repository access"
+msgstr "打包头和标签以实现高效的仓库访问"
+
+#: command-list.h:138
+msgid "Routines to help parsing remote repository access parameters"
+msgstr "帮助解析远程仓库访问参数的例程"
+
+#: command-list.h:139
+msgid "Compute unique ID for a patch"
+msgstr "计算一个补丁的唯一 ID"
+
+#: command-list.h:140
+msgid "Prune all unreachable objects from the object database"
+msgstr "删除对象库中所有不可达对象"
+
+#: command-list.h:141
+msgid "Remove extra objects that are already in pack files"
+msgstr "删除已经在包文件中的多余对象"
+
+#: command-list.h:142
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "获取并整合另外的仓库或一个本地分支"
-#: common-cmds.h:31
+#: command-list.h:143
msgid "Update remote refs along with associated objects"
msgstr "更新远程引用和相关的对象"
-#: common-cmds.h:32
+#: command-list.h:144
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "将一个 quilt 补丁集应用到当前分支。"
+
+#: command-list.h:145
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr "比较两个提交范围（如一个分支的两个版本）"
+
+#: command-list.h:146
+msgid "Reads tree information into the index"
+msgstr "将树信息读取到索引"
+
+#: command-list.h:147
msgid "Reapply commits on top of another base tip"
msgstr "在另一个分支上重新应用提交"
-#: common-cmds.h:33
+#: command-list.h:148
+msgid "Receive what is pushed into the repository"
+msgstr "接收推送到仓库中的对象"
+
+#: command-list.h:149
+msgid "Manage reflog information"
+msgstr "管理 reflog 信息"
+
+#: command-list.h:150
+msgid "Manage set of tracked repositories"
+msgstr "管理已跟踪仓库"
+
+#: command-list.h:151
+msgid "Pack unpacked objects in a repository"
+msgstr "打包仓库中未打包对象"
+
+#: command-list.h:152
+msgid "Create, list, delete refs to replace objects"
+msgstr "创建、列出、删除对象替换引用"
+
+#: command-list.h:153
+msgid "Generates a summary of pending changes"
+msgstr "生成待定更改的摘要"
+
+#: command-list.h:154
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr "重用冲突合并的解决方案记录"
+
+#: command-list.h:155
msgid "Reset current HEAD to the specified state"
msgstr "重置当前 HEAD 到指定状态"
-#: common-cmds.h:34
+#: command-list.h:156
+msgid "Revert some existing commits"
+msgstr "回退一些现存提交"
+
+#: command-list.h:157
+msgid "Lists commit objects in reverse chronological order"
+msgstr "按时间顺序列出提交对象"
+
+#: command-list.h:158
+msgid "Pick out and massage parameters"
+msgstr "选出并处理参数"
+
+#: command-list.h:159
msgid "Remove files from the working tree and from the index"
msgstr "从工作区和索引中删除文件"
-#: common-cmds.h:35
+#: command-list.h:160
+msgid "Send a collection of patches as emails"
+msgstr "通过电子邮件发送一组补丁"
+
+#: command-list.h:161
+msgid "Push objects over Git protocol to another repository"
+msgstr "使用 Git 协议推送对象到另一个仓库"
+
+#: command-list.h:162
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "只允许 Git SSH 访问的受限登录shell"
+
+#: command-list.h:163
+msgid "Summarize 'git log' output"
+msgstr "'git log' 输出摘要"
+
+#: command-list.h:164
msgid "Show various types of objects"
msgstr "显示各种类型的对象"
-#: common-cmds.h:36
+#: command-list.h:165
+msgid "Show branches and their commits"
+msgstr "显示分支和提交"
+
+#: command-list.h:166
+msgid "Show packed archive index"
+msgstr "显示打包归档索引"
+
+#: command-list.h:167
+msgid "List references in a local repository"
+msgstr "显示本地仓库中的引用"
+
+#: command-list.h:168
+msgid "Git's i18n setup code for shell scripts"
+msgstr "为 shell 脚本准备的 Git 国际化设置代码"
+
+#: command-list.h:169
+msgid "Common Git shell script setup code"
+msgstr "常用的 Git shell 脚本设置代码"
+
+#: command-list.h:170
+msgid "Stash the changes in a dirty working directory away"
+msgstr "贮藏脏工作区中的修改"
+
+#: command-list.h:171
+msgid "Add file contents to the staging area"
+msgstr "将文件内容添加到索引"
+
+#: command-list.h:172
msgid "Show the working tree status"
msgstr "显示工作区状态"
-#: common-cmds.h:37
+#: command-list.h:173
+msgid "Remove unnecessary whitespace"
+msgstr "删除不必要的空白字符"
+
+#: command-list.h:174
+msgid "Initialize, update or inspect submodules"
+msgstr "初始化、更新或检查子模组"
+
+#: command-list.h:175
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Subersion 仓库和 Git 之间的双向操作"
+
+#: command-list.h:176
+msgid "Read, modify and delete symbolic refs"
+msgstr "读取、修改和删除符号引用"
+
+#: command-list.h:177
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
-#: parse-options.h:145
-msgid "expiry-date"
-msgstr "到期时间"
+#: command-list.h:178
+msgid "Creates a temporary file with a blob's contents"
+msgstr "用 blob 数据对象的内容创建一个临时文件"
-#: parse-options.h:160
-msgid "no-op (backward compatibility)"
-msgstr "空操作（向后兼容）"
+#: command-list.h:179
+msgid "Unpack objects from a packed archive"
+msgstr "从打包文件中解压缩对象"
-#: parse-options.h:238
-msgid "be more verbose"
-msgstr "更加详细"
+#: command-list.h:180
+msgid "Register file contents in the working tree to the index"
+msgstr "将工作区的文件内容注册到索引"
-#: parse-options.h:240
-msgid "be more quiet"
-msgstr "更加安静"
+#: command-list.h:181
+msgid "Update the object name stored in a ref safely"
+msgstr "安全地更新存储于引用中的对象名称"
-#: parse-options.h:246
-msgid "use <n> digits to display SHA-1s"
-msgstr "用 <n> 位数字显示 SHA-1 哈希值"
+#: command-list.h:182
+msgid "Update auxiliary info file to help dumb servers"
+msgstr "更新辅助信息文件以帮助哑协议服务"
-#: rerere.h:40
-msgid "update the index with reused conflict resolution if possible"
-msgstr "å¦\82æ\9e\9cå\8f¯è\83½ï¼\8cé\87\8dç\94¨å\86²çª\81解å\86³æ\9b´æ\96°ç´¢å¼\95"
+#: command-list.h:183
+msgid "Send archive back to git-archive"
+msgstr "å°\86å\98æ¡£å\8f\91é\80\81å\9b\9e git-archive"
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "您需要执行 \"git bisect start\" 来开始"
+#: command-list.h:184
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "将对象压缩包发送回 git-fetch-pack"
-# 译者：注意保持句尾空格
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "您想让我为您这样做么[Y/n]？ "
+#: command-list.h:185
+msgid "Show a Git logical variable"
+msgstr "显示一个Git逻辑变量"
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "未能识别的选项：'$arg'"
+#: command-list.h:186
+msgid "Check the GPG signature of commits"
+msgstr "检查 GPG 提交签名"
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "'$arg' 看起来不像是一个有效的版本"
+#: command-list.h:187
+msgid "Validate packed Git archive files"
+msgstr "校验打包的Git存仓文件"
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr "坏的 HEAD - 我需要一个 HEAD"
+#: command-list.h:188
+msgid "Check the GPG signature of tags"
+msgstr "检查标签的 GPG 签名"
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
+#: command-list.h:189
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git web 界面（Git 仓库的 web 前端）"
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr "不会在做了 cg-seek 的树上做二分查找"
+#: command-list.h:190
+msgid "Show logs with difference each commit introduces"
+msgstr "显示每一个提交引入的差异日志"
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "坏的 HEAD - 奇怪的符号引用"
+#: command-list.h:191
+msgid "Manage multiple working trees"
+msgstr "管理多个工作区"
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "坏的 bisect_write 参数：$state"
+#: command-list.h:192
+msgid "Create a tree object from the current index"
+msgstr "从当前索引创建一个树对象"
-#: git-bisect.sh:262
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "坏的输入版本：$arg"
+#: command-list.h:193
+msgid "Defining attributes per path"
+msgstr "定义路径的属性"
-#: git-bisect.sh:281
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "坏的输入版本：$bisected_head"
+#: command-list.h:194
+msgid "Git command-line interface and conventions"
+msgstr "Git 命令行界面和约定"
-#: git-bisect.sh:290
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "坏的输入版本：$rev"
+#: command-list.h:195
+msgid "A Git core tutorial for developers"
+msgstr "面向开发人员的 Git 核心教程"
-#: git-bisect.sh:299
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
+#: command-list.h:196
+msgid "Git for CVS users"
+msgstr "适合 CVS 用户的 Git 帮助"
-#: git-bisect.sh:322
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "警告：在仅有一个坏（$TERM_BAD）提交下进行二分查找。"
+#: command-list.h:197
+msgid "Tweaking diff output"
+msgstr "调整差异输出"
+
+#: command-list.h:198
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr "每一天 Git 的一组有用的最小命令集合"
+
+#: command-list.h:199
+msgid "A Git Glossary"
+msgstr "Git 词汇表"
+
+#: command-list.h:200
+msgid "Hooks used by Git"
+msgstr "Git 使用的钩子"
+
+#: command-list.h:201
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "忽略指定的未跟踪文件"
+
+#: command-list.h:202
+msgid "Defining submodule properties"
+msgstr "定义子模组属性"
+
+#: command-list.h:203
+msgid "Git namespaces"
+msgstr "Git 名字空间"
+
+#: command-list.h:204
+msgid "Git Repository Layout"
+msgstr "Git 仓库布局"
+
+#: command-list.h:205
+msgid "Specifying revisions and ranges for Git"
+msgstr "指定 Git 的版本和版本范围"
+
+#: command-list.h:206
+msgid "A tutorial introduction to Git: part two"
+msgstr "一个 Git 教程：第二部分"
+
+#: command-list.h:207
+msgid "A tutorial introduction to Git"
+msgstr "一个 Git 教程"
+
+#: command-list.h:208
+msgid "An overview of recommended workflows with Git"
+msgstr "Git 推荐的工作流概览"
+
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
+msgstr "您需要执行 \"git bisect start\" 来开始"
# 译者：注意保持句尾空格
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:328
-msgid "Are you sure [Y/n]? "
-msgstr "您确认么[Y/n]？ "
-
-#: git-bisect.sh:340
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"您需要给我至少一个好版本和一个坏版本。\n"
-"（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）"
+#: git-bisect.sh:60
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "您想让我为您这样做么[Y/n]？ "
-#: git-bisect.sh:343
+#: git-bisect.sh:101
#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"您需要执行 \"git bisect start\" 来开始。\n"
-"然后需要提供我至少一个好版本和一个坏版本。\n"
-"（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）"
+msgid "Bad rev input: $arg"
+msgstr "坏的输入版本：$arg"
-#: git-bisect.sh:414 git-bisect.sh:546
-msgid "We are not bisecting."
-msgstr "我们没有在二分查找。"
+#: git-bisect.sh:121
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "坏的输入版本：$bisected_head"
-#: git-bisect.sh:421
+#: git-bisect.sh:130
#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "'$invalid' 不是一个有效的提交"
+msgid "Bad rev input: $rev"
+msgstr "坏的输入版本：$rev"
-#: git-bisect.sh:430
+#: git-bisect.sh:139
#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-"不能检出原始 HEAD '$branch'。\n"
-"尝试 'git bisect reset <提交>'。"
+msgid "'git bisect $TERM_BAD' can take only one argument."
+msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
-#: git-bisect.sh:458
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr "未提供日志文件"
-#: git-bisect.sh:459
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr "不能读取 $file 来重放"
-#: git-bisect.sh:480
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr "?? 您在说什么?"
-#: git-bisect.sh:492
+#: git-bisect.sh:241
+msgid "bisect run failed: no command provided."
+msgstr "二分查找运行失败：没有提供命令。"
+
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr "运行 $command"
-#: git-bisect.sh:499
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
"二分查找运行失败：\n"
"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
-#: git-bisect.sh:525
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr "二分查找不能继续运行"
-#: git-bisect.sh:531
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
"二分查找运行失败：\n"
"'bisect_state $state' 退出码为 $res"
-#: git-bisect.sh:538
+#: git-bisect.sh:292
msgid "bisect run success"
msgstr "二分查找运行成功"
-#: git-bisect.sh:565
-msgid "please use two different terms"
-msgstr "请使用两个不同的术语"
-
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
-msgstr "'$term' 不是一个有效的名称"
-
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
-msgstr "不能使用内置命令 '$term' 作为术语"
-
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
-msgstr "不能修改术语 '$term' 的含义"
-
-#: git-bisect.sh:606
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr "无效的命令：您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
-
-#: git-bisect.sh:636
-msgid "no terms defined"
-msgstr "未定义术语"
-
-#: git-bisect.sh:653
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
-msgstr ""
-"参数 $arg 对命令 'git bisect terms' 无效。\n"
-"支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "我们没有在二分查找。"
#: git-merge-octopus.sh:46
msgid ""
msgid "Simple merge did not work, trying automatic merge."
msgstr "简单合并未生效，尝试自动合并。"
-#: git-rebase.sh:58
-msgid ""
-"Resolve all conflicts manually, mark them as resolved with\n"
-"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
-"You can instead skip this commit: run \"git rebase --skip\".\n"
-"To abort and get back to the state before \"git rebase\", run \"git rebase --"
-"abort\"."
-msgstr ""
-"手工解决所有冲突，执行 \"git add/rm <conflicted_files>\" 标记\n"
-"冲突已解决，然后执行 \"git rebase --continue\"。您也可以执行\n"
-"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
-"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
-
-#: git-rebase.sh:160 git-rebase.sh:402
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "无法移回 $head_name"
-
-#: git-rebase.sh:171
-msgid "Applied autostash."
-msgstr "成功应用 autostash。"
-
-#: git-rebase.sh:174
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "无法保存 $stash_sha1"
-
-#: git-rebase.sh:214
-msgid "The pre-rebase hook refused to rebase."
-msgstr "钩子 pre-rebase 拒绝变基操作。"
-
-#: git-rebase.sh:219
-msgid "It looks like git-am is in progress. Cannot rebase."
-msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
-
-#: git-rebase.sh:363
-msgid "No rebase in progress?"
-msgstr "没有正在进行的变基？"
-
-#: git-rebase.sh:374
-msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-
-#: git-rebase.sh:381
-msgid "Cannot read HEAD"
-msgstr "不能读取 HEAD"
-
-#: git-rebase.sh:384
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
-msgstr ""
-"您必须编辑所有的合并冲突，然后通过 git add\n"
-"命令将它们标记为已解决"
-
-#: git-rebase.sh:424
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
-msgstr ""
-"好像已有 $state_dir_base 目录，我怀疑您正处于另外一个变基操作\n"
-"过程中。 如果是这样，请执行\n"
-"\t$cmd_live_rebase\n"
-"如果不是这样，请执行\n"
-"\t$cmd_clear_stale_rebase\n"
-"然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
-
-#: git-rebase.sh:480
-#, sh-format
-msgid "invalid upstream $upstream_name"
-msgstr "无效的上游 $upstream_name"
-
-#: git-rebase.sh:504
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name: 有一个以上的合并基准"
-
-#: git-rebase.sh:507 git-rebase.sh:511
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr "$onto_name: 没有合并基准"
-
-#: git-rebase.sh:516
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr "没有指向一个有效的提交：$onto_name"
-
-#: git-rebase.sh:539
-#, sh-format
-msgid "fatal: no such branch: $branch_name"
-msgstr "严重错误：无此分支：$branch_name"
-
-#: git-rebase.sh:572
-msgid "Cannot autostash"
-msgstr "无法 autostash"
-
-#: git-rebase.sh:577
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr "创建了 autostash: $stash_abbrev"
-
-#: git-rebase.sh:581
-msgid "Please commit or stash them."
-msgstr "请提交或贮藏修改。"
-
-#: git-rebase.sh:601
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr "当前分支 $branch_name 是最新的。"
-
-#: git-rebase.sh:605
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr "当前分支 $branch_name 是最新的，强制变基。"
-
-#: git-rebase.sh:616
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr "变更从 $mb 到 $onto："
-
-#: git-rebase.sh:625
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr "首先，回退分支以便在上面重放您的工作..."
-
-#: git-rebase.sh:635
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "快进 $branch_name 至 $onto_name。"
-
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash clear 不支持参数"
-
-#: git-stash.sh:102
-msgid "You do not have the initial commit yet"
-msgstr "您尚未建立初始提交"
-
-#: git-stash.sh:117
-msgid "Cannot save the current index state"
-msgstr "无法保存当前索引状态"
-
-#: git-stash.sh:132
-msgid "Cannot save the untracked files"
-msgstr "无法保存未跟踪文件"
-
-#: git-stash.sh:152 git-stash.sh:165
-msgid "Cannot save the current worktree state"
-msgstr "无法保存当前工作区状态"
-
-#: git-stash.sh:169
-msgid "No changes selected"
-msgstr "没有选择变更"
-
-#: git-stash.sh:172
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr "无法删除临时索引（不应发生）"
-#: git-stash.sh:185
-msgid "Cannot record working tree state"
-msgstr "不能记录工作区状态"
-
-#: git-stash.sh:217
+#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "无法用 $w_commit 更新 $ref_stash"
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ 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:273
+#: git-legacy-stash.sh:323
#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
-msgstr ""
-"错误：'stash save' 的未知选项：$option\n"
-" 要提供一个描述信息，使用 git stash save -- '$option'"
-
-#: git-stash.sh:288
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-
-#: git-stash.sh:296
-msgid "No local changes to save"
-msgstr "没有要保存的本地修改"
-
-#: git-stash.sh:301
-msgid "Cannot initialize stash"
-msgstr "无法初始化贮藏"
-
-#: git-stash.sh:305
-msgid "Cannot save the current status"
-msgstr "无法保存当前状态"
+msgid "error: unknown option for 'stash push': $option"
+msgstr "错误：'stash push' 的未知选项：$option"
-#: git-stash.sh:306
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "保存工作目录和索引状态 $stash_msg"
-#: git-stash.sh:334
-msgid "Cannot remove worktree changes"
-msgstr "无法删除工作区变更"
-
-#: git-stash.sh:482
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr "未知选项: $opt"
-#: git-stash.sh:495
-msgid "No stash entries found."
-msgstr "未发现贮藏条目。"
-
-#: git-stash.sh:502
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "指定了太多的版本：$REV"
-#: git-stash.sh:517
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference 不是一个有效的引用"
-#: git-stash.sh:545
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' 不是贮藏式提交"
-#: git-stash.sh:556
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' 不是一个贮藏引用"
-#: git-stash.sh:564
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr "无法刷新索引"
-#: git-stash.sh:568
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程应用贮藏"
-#: git-stash.sh:576
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不使用 --index。"
-#: git-stash.sh:578
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr "不能保存索引树"
-#: git-stash.sh:587
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr "无法从贮藏条目中恢复未跟踪文件"
-#: git-stash.sh:612
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr "无法将修改的文件取消暂存"
-#: git-stash.sh:627
-msgid "Index was not unstashed."
-msgstr "索引未从贮藏中恢复。"
-
-#: git-stash.sh:641
-msgid "The stash entry is kept in case you need it again."
-msgstr "贮藏条目被保留以备您再次需要。"
-
-#: git-stash.sh:650
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"
-#: git-stash.sh:651
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}：无法丢弃贮藏条目"
-#: git-stash.sh:659
-msgid "No branch name specified"
-msgstr "未指定分支名"
-
-#: git-stash.sh:738
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "（为恢复数据输入 \"git stash apply\"）"
-#: git-submodule.sh:181
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "只能在工作区的顶级目录中使用相对路径"
-#: git-submodule.sh:191
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
-#: git-submodule.sh:210
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' 已经存在于索引中"
-#: git-submodule.sh:213
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
-#: git-submodule.sh:219
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "'$sm_path' 没有检出的提交"
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"如果您确实想添加它，使用 -f 参数。"
-#: git-submodule.sh:237
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "添加位于 '$sm_path' 的现存仓库到索引"
-#: git-submodule.sh:239
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
-#: git-submodule.sh:247
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库："
-#: git-submodule.sh:249
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
"或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。"
-#: git-submodule.sh:255
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "激活本地 git 目录到子模组 '$sm_name'。"
-#: git-submodule.sh:267
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "不能检出子模组 '$sm_path'"
-#: git-submodule.sh:272
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加子模组 '$sm_path'"
-#: git-submodule.sh:281
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
-#: git-submodule.sh:342
-#, sh-format
-msgid "Entering '$displaypath'"
-msgstr "正在进入 '$displaypath'"
-
-#: git-submodule.sh:362
-#, sh-format
-msgid "Stopping at '$displaypath'; script returned non-zero status."
-msgstr "停止于 '$displaypath'；脚本返回非零值。"
-
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr "pathspec 和 --all 不兼容"
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-"子模组工作区 '$displaypath' 包含一个 .git 目录\n"
-"（如果您真的想删除它及其全部历史，使用 'rm -rf' 命令）"
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们"
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr "已清除目录 '$displaypath'"
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr "无法移除子模组工作区 '$displaypath'"
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr "不能创建空的子模组目录 '$displaypath'"
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
-
-#: git-submodule.sh:637
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
-#: git-submodule.sh:647
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-submodule.sh:652
+#: git-submodule.sh:588
#, 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:670
+#: git-submodule.sh:606
#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "无法在子模组路径 '$displaypath' 中获取"
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr "无法在子模组路径 '$displaypath' 中获取，尝试直接获取 $sha1："
-#: git-submodule.sh:676
+#: git-submodule.sh:612
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
msgstr ""
"获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。"
-#: git-submodule.sh:683
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:684
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
-#: git-submodule.sh:688
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-#: git-submodule.sh:689
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
-#: git-submodule.sh:694
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-#: git-submodule.sh:695
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
-#: git-submodule.sh:700
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:701
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "子模组 '$displaypath'：'$command $sha1'"
-#: git-submodule.sh:732
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进子模组路径 '$displaypath'"
-#: git-submodule.sh:840
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached 不能和选项 --files 同时使用"
-#: git-submodule.sh:892
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:912
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告：$display_name 未包含提交 $sha1_src"
# 译者：注意保持前导空格
-#: git-submodule.sh:915
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告：$display_name 未包含提交 $sha1_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:918
+#: git-submodule.sh:908
#, 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:1064
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr "无法递归进子模组路径 '$sm_path'"
-
-#: git-submodule.sh:1136
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "为 '$displaypath' 同步子模组 url"
-
#: git-parse-remote.sh:89
#, sh-format
msgid "See git-${cmd}(1) for details."
msgstr "详见 git-${cmd}(1)。"
-#: git-rebase--interactive.sh:140
+#: git-rebase--preserve-merges.sh:136
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "变基中（$new_count/$total）"
-#: git-rebase--interactive.sh:156
+#: git-rebase--preserve-merges.sh:152
msgid ""
"\n"
"Commands:\n"
-"p, pick = use commit\n"
-"r, reword = use commit, but edit the commit message\n"
-"e, edit = use commit, but stop for amending\n"
-"s, squash = use commit, but meld into previous commit\n"
-"f, fixup = like \"squash\", but discard this commit's log message\n"
-"x, exec = run command (the rest of the line) using shell\n"
-"d, drop = remove commit\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <commit> = run command (the rest of the line) using shell\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
"\n"
"命令:\n"
-"p, pick = 使用提交\n"
-"r, reword = 使用提交，但修改提交说明\n"
-"e, edit = 使用提交，但停止以便进行提交修补\n"
-"s, squash = 使用提交，但和前一个版本融合\n"
-"f, fixup = 类似于 \"squash\"，但丢弃提交说明日志\n"
-"x, exec = 使用 shell 运行命令（此行剩余部分）\n"
-"d, drop = 删除提交\n"
-"\n"
-"这些行可以被重新排序；它们会被从上至下地执行。\n"
-
-#: git-rebase--interactive.sh:171
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-"\n"
-"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
-
-#: git-rebase--interactive.sh:175
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
+"p, pick <提交> = 使用提交\n"
+"r, reword <提交> = 使用提交，但修改提交说明\n"
+"e, edit <提交> = 使用提交，但停下来修补\n"
+"s, squash <提交> = 使用提交，但融合到前一个提交\n"
+"f, fixup <提交> = 类似于 \"squash\"，但丢弃提交说明日志\n"
+"x, exec <命令> = 使用 shell 运行命令（此行剩余部分）\n"
+"d, drop <提交> = 删除提交\n"
+"l, label <标签> = 为当前 HEAD 打上标签\n"
+"t, reset <标签> = 重置 HEAD 到该标签\n"
+"m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
+". 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"
+". 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"
+". -c <提交> 可以编辑提交说明。\n"
"\n"
-"å¦\82æ\9e\9cæ\82¨å\9c¨è¿\99é\87\8cå\88 é\99¤ä¸\80è¡\8cï¼\8c对åº\94ç\9a\84æ\8f\90交å°\86ä¼\9a丢失。\n"
+"å\8f¯ä»¥å¯¹è¿\99äº\9bè¡\8cé\87\8dæ\96°æ\8e\92åº\8fï¼\8cå°\86ä»\8eä¸\8aè\87³ä¸\8bæ\89§è¡\8c。\n"
-#: git-rebase--interactive.sh:211
+#: git-rebase--preserve-merges.sh:215
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:236
+#: git-rebase--preserve-merges.sh:240
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1：不是一个可以被拣选的提交"
-#: git-rebase--interactive.sh:275
+#: git-rebase--preserve-merges.sh:279
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "无效的提交名：$sha1"
-#: git-rebase--interactive.sh:317
+#: git-rebase--preserve-merges.sh:309
msgid "Cannot write current commit's replacement sha1"
msgstr "不能写入当前提交的替代 sha1"
-#: git-rebase--interactive.sh:369
+#: git-rebase--preserve-merges.sh:360
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "快进到 $sha1"
-#: git-rebase--interactive.sh:371
+#: git-rebase--preserve-merges.sh:362
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "不能快进到 $sha1"
-#: git-rebase--interactive.sh:380
+#: git-rebase--preserve-merges.sh:371
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "不能移动 HEAD 到 $first_parent"
-#: git-rebase--interactive.sh:385
+#: git-rebase--preserve-merges.sh:376
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "拒绝压缩一个合并：$sha1"
-#: git-rebase--interactive.sh:400
+#: git-rebase--preserve-merges.sh:394
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "无法重做合并 $sha1"
-#: git-rebase--interactive.sh:408
+#: git-rebase--preserve-merges.sh:403
#, sh-format
msgid "Could not pick $sha1"
msgstr "不能拣选 $sha1"
-#: git-rebase--interactive.sh:417
+#: git-rebase--preserve-merges.sh:412
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "这是提交说明 #${n}："
-#: git-rebase--interactive.sh:422
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "提交说明 #${n} 将被跳过："
-#: git-rebase--interactive.sh:433
+#: git-rebase--preserve-merges.sh:428
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "这是一个 $count 个提交的组合。"
msgstr[1] "这是一个 $count 个提交的组合。"
-#: git-rebase--interactive.sh:442
+#: git-rebase--preserve-merges.sh:437
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "不能写入 $fixup_msg"
-#: git-rebase--interactive.sh:445
+#: git-rebase--preserve-merges.sh:440
msgid "This is a combination of 2 commits."
msgstr "这是一个 2 个提交的组合。"
-#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
-#: git-rebase--interactive.sh:532
+#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
+#: git-rebase--preserve-merges.sh:527
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "不能应用 $sha1... $rest"
-#: git-rebase--interactive.sh:560
+#: git-rebase--preserve-merges.sh:556
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"这通常是因为空的提交说明，或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
"钩子执行失败，你可能需要在重写提交说明前解决这个问题。"
-#: git-rebase--interactive.sh:575
+#: git-rebase--preserve-merges.sh:571
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "停止在 $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:590
+#: git-rebase--preserve-merges.sh:586
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "没有父提交的情况下不能 '$squash_style'"
-#: git-rebase--interactive.sh:632
+#: git-rebase--preserve-merges.sh:628
#, sh-format
msgid "Executing: $rest"
msgstr "执行：$rest"
-#: git-rebase--interactive.sh:640
+#: git-rebase--preserve-merges.sh:636
#, sh-format
msgid "Execution failed: $rest"
msgstr "执行失败：$rest"
-#: git-rebase--interactive.sh:642
+#: git-rebase--preserve-merges.sh:638
msgid "and made changes to the index and/or the working tree"
msgstr "并且修改索引和/或工作区"
# 译者：注意保持前导空格
-#: git-rebase--interactive.sh:644
+#: git-rebase--preserve-merges.sh:640
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:657
+#: git-rebase--preserve-merges.sh:653
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:668
+#: git-rebase--preserve-merges.sh:664
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "未知命令：$command $sha1 $rest"
-#: git-rebase--interactive.sh:669
+#: git-rebase--preserve-merges.sh:665
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "要修改请使用命令 'git rebase --edit-todo'。"
-#: git-rebase--interactive.sh:704
+#: git-rebase--preserve-merges.sh:700
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "成功变基并更新 $head_name。"
-#: git-rebase--interactive.sh:749
-msgid "could not detach HEAD"
-msgstr "不能检出为分离头指针"
-
-#: git-rebase--interactive.sh:784
+#: git-rebase--preserve-merges.sh:757
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:789
+#: git-rebase--preserve-merges.sh:762
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:806
+#: git-rebase--preserve-merges.sh:779
msgid "Error trying to find the author identity to amend commit"
msgstr "在修补提交中查找作者信息时遇到错误"
-#: git-rebase--interactive.sh:811
+#: git-rebase--preserve-merges.sh:784
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:816 git-rebase--interactive.sh:820
+#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
msgid "Could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: git-rebase--interactive.sh:848
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-" git rebase --continue\n"
-"\n"
-msgstr ""
-"\n"
-"您正在修改运行中的交互式变基待办列表。若要在编辑结束后继续变基，\n"
-"请执行：\n"
-" git rebase --continue\n"
-"\n"
-
-#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
+#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
msgid "Could not execute editor"
msgstr "无法运行编辑器"
-#: git-rebase--interactive.sh:869
+#: git-rebase--preserve-merges.sh:845
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "不能检出 $switch_to"
-#: git-rebase--interactive.sh:874
+#: git-rebase--preserve-merges.sh:852
msgid "No HEAD?"
msgstr "没有 HEAD？"
-#: git-rebase--interactive.sh:875
+#: git-rebase--preserve-merges.sh:853
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "不能创建临时 $state_dir"
-#: git-rebase--interactive.sh:877
+#: git-rebase--preserve-merges.sh:856
msgid "Could not mark as interactive"
msgstr "不能标记为交互式"
-#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
-msgid "Could not init rewritten commits"
-msgstr "不能对重写提交进行初始化"
-
-#: git-rebase--interactive.sh:993
+#: git-rebase--preserve-merges.sh:888
#, 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:998
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-"\n"
-"然而，如果您删除全部内容，变基操作将会终止。\n"
-"\n"
-
-#: git-rebase--interactive.sh:1005
-msgid "Note that empty commits are commented out"
-msgstr "注意空提交已被注释掉"
+#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+msgid "Could not init rewritten commits"
+msgstr "不能对重写提交进行初始化"
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "用法：$dashless $USAGE"
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr "不能切换目录到 $cdup，工作区的顶级目录"
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "严重错误：$program_name 不能在没有工作区的情况下使用"
+msgstr "致命错误：$program_name 不能在没有工作区的情况下使用"
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "不能重写分支：您有未暂存的变更。"
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "无法通过变基方式拉取：您有未暂存的变更。"
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "不能 $action：您有未暂存的变更。"
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "不能变基：您的索引中包含未提交的变更。"
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。"
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "不能 $action：您的索引中包含未提交的变更。"
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr "而且您的索引中包含未提交的变更。"
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr "您需要在工作区的顶级目录中运行这个命令。"
-#: git-sh-setup.sh:377
+#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr "不能确定 git 目录的绝对路径"
msgid "unstaged"
msgstr "未缓存"
-#: git-add--interactive.perl:246 git-add--interactive.perl:271
+#: git-add--interactive.perl:253 git-add--interactive.perl:278
msgid "binary"
msgstr "二进制"
-#: git-add--interactive.perl:255 git-add--interactive.perl:309
+#: git-add--interactive.perl:262 git-add--interactive.perl:316
msgid "nothing"
msgstr "无"
-#: git-add--interactive.perl:291 git-add--interactive.perl:306
+#: git-add--interactive.perl:298 git-add--interactive.perl:313
msgid "unchanged"
msgstr "没有修改"
-#: git-add--interactive.perl:602
+#: git-add--interactive.perl:609
#, 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:605
+#: git-add--interactive.perl:612
#, 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:608
+#: git-add--interactive.perl:615
#, 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:611
+#: git-add--interactive.perl:618
#, 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:620
+#: git-add--interactive.perl:627
msgid "Update"
msgstr "更新"
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:639
msgid "Revert"
msgstr "还原"
-#: git-add--interactive.perl:655
+#: git-add--interactive.perl:662
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "说明：%s 现已成为未跟踪的。\n"
-#: git-add--interactive.perl:666
+#: git-add--interactive.perl:673
msgid "Add untracked"
msgstr "添加未跟踪的"
-#: git-add--interactive.perl:672
+#: git-add--interactive.perl:679
msgid "No untracked files.\n"
msgstr "没有未跟踪的文件。\n"
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。"
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr "如果补丁能干净地应用，编辑块将立即标记为贮藏。"
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1039
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。"
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。"
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。"
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1085
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
-msgstr "无法写入块编辑文件：%s"
+msgstr "为写入打开块编辑文件失败：%s"
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1086
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1092
#, perl-format
msgid ""
"---\n"
"以 %s 开始的行将被删除。\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1100
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"
"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
"此次编辑被终止，该块不会被修改。\n"
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
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:1134
+#: git-add--interactive.perl:1213
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1222
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1228
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1234
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a - 不暂存该块和本文件中后面的全部块\n"
"d - 不要不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1240
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1246
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1252
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1258
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1273
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1304
msgid "The selected hunks do not apply to the index!\n"
msgstr "选中的块不能应用到索引！\n"
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1305
msgid "Apply them to the worktree anyway? "
msgstr "无论如何都要应用到工作区么？"
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1308
msgid "Nothing was applied.\n"
msgstr "未应用。\n"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1319
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "忽略未合入的：%s\n"
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1328
msgid "Only binary files changed.\n"
msgstr "只有二进制文件被修改。\n"
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1330
msgid "No changes.\n"
msgstr "没有修改。\n"
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1338
msgid "Patch update"
msgstr "补丁更新"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1390
#, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1391
#, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1392
#, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "暂存该块 [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "暂存该块 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1395
#, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
-msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1396
#, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
-msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1397
#, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1400
#, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1401
#, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1402
#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1405
#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
-msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1406
#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
-msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "将删除应用到索引 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1407
#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
-msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1410
#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "ä¿®æ\94¹å·¥ä½\9cå\8cºä¸ç\9a\84丢å¼\83ç\8a¶æ\80\81 [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "ä»\8eå·¥ä½\9cå\8cºä¸ä¸¢å¼\83模å¼\8få\8f\98æ\9b´ [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1411
#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1412
#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1415
#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "ä¿®æ\94¹ç´¢å¼\95å\92\8cå·¥ä½\9cå\8cºä¸ç\9a\84丢å¼\83ç\8a¶æ\80\81 [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ä»\8eç´¢å¼\95å\92\8cå·¥ä½\9cå\8cºä¸ä¸¢å¼\83模å¼\8få\8f\98æ\9b´ [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1416
#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1417
#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
+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:1335
+#: git-add--interactive.perl:1420
#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? "
+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:1336
+#: git-add--interactive.perl:1421
#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "将删除应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1422
#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? "
+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:1522
+msgid "No other hunks to goto\n"
+msgstr "没有其它可供跳转的块\n"
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1529
msgid "go to which hunk (<ret> to see more)? "
msgstr "跳转到哪个块（<回车> 查看更多）？ "
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1531
msgid "go to which hunk? "
msgstr "跳转到哪个块？"
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1540
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "无效数字：'%s'\n"
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1545
#, 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:1482
+#: git-add--interactive.perl:1571
+msgid "No other hunks to search\n"
+msgstr "没有其它可供查找的块\n"
+
+#: git-add--interactive.perl:1575
msgid "search for regex? "
msgstr "使用正则表达式搜索？"
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1588
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "错误的正则表达式 %s：%s\n"
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1598
msgid "No hunk matches the given pattern\n"
msgstr "没有和给定模式相匹配的快\n"
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
msgid "No previous hunk\n"
msgstr "没有前一个块\n"
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
msgid "No next hunk\n"
msgstr "没有下一个块\n"
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1644
+msgid "Sorry, cannot split this hunk\n"
+msgstr "对不起，不能拆分这个块\n"
+
+#: git-add--interactive.perl:1650
#, 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:1605
+#: git-add--interactive.perl:1660
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "对不起，不能编辑这个块\n"
+
+#: git-add--interactive.perl:1706
msgid "Review diff"
msgstr "检视 diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1725
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"diff - 显示 HEAD 和索引间差异\n"
"add untracked - 添加未跟踪文件的内容至暂存列表\n"
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
+#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
+#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
msgid "missing --"
msgstr "缺失 --"
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1763
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "未知的 --patch 模式：%s"
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "无效的参数 %s，期望是 --"
-#: git-send-email.perl:126
+#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "本地时间和 GMT 有不到一分钟间隔\n"
-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:145 git-send-email.perl:151
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "本地时间偏移量大于等于 24 小时\n"
-#: git-send-email.perl:207 git-send-email.perl:213
+#: git-send-email.perl:219 git-send-email.perl:225
msgid "the editor exited uncleanly, aborting everything"
msgstr "编辑器非正常退出，终止所有操作"
-#: git-send-email.perl:290
+#: git-send-email.perl:302
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
-#: git-send-email.perl:295
+#: git-send-email.perl:307
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' 包含编辑的邮件。\n"
-#: git-send-email.perl:313
+#: git-send-email.perl:326
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases 和其它选项不兼容\n"
-#: git-send-email.perl:378 git-send-email.perl:629
+#: git-send-email.perl:395 git-send-email.perl:656
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "不能在仓库之外运行 git format-patch\n"
-#: git-send-email.perl:447
+#: git-send-email.perl:398
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr "`batch-size` 和 `relogin` 必须同时定义（通过命令行或者配置选项）\n"
+
+#: git-send-email.perl:470
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "未知的 --suppress-cc 字段：'%s'\n"
-#: git-send-email.perl:476
+#: git-send-email.perl:501
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "未知的 --confirm 设置：'%s'\n"
-#: git-send-email.perl:504
+#: git-send-email.perl:529
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "警告：不支持带引号的 sendmail 别名：%s\n"
-#: git-send-email.perl:506
+#: git-send-email.perl:531
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "警告：不支持 `:include:`：%s\n"
-#: git-send-email.perl:508
+#: git-send-email.perl:533
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:538
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "警告：不能识别的 sendmail 行：%s\n"
-#: git-send-email.perl:595
+#: git-send-email.perl:622
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * 如果含义为一个文件，使用 \"./%s\"，或者\n"
" * 如果含义为一个范围，使用 --format-patch 选项。\n"
-#: git-send-email.perl:616
+#: git-send-email.perl:643
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "无法打开目录 %s: %s"
-#: git-send-email.perl:640
+#: git-send-email.perl:667
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
-"严重：%s：%s\n"
+"致命错误：%s：%s\n"
"警告：补丁未能发送\n"
-#: git-send-email.perl:651
+#: git-send-email.perl:678
msgid ""
"\n"
"No patch files specified!\n"
"未指定补丁文件！\n"
"\n"
-#: git-send-email.perl:664
+#: git-send-email.perl:691
#, perl-format
msgid "No subject line in %s?"
msgstr "在 %s 中没有标题行？"
-#: git-send-email.perl:674
+#: git-send-email.perl:701
#, perl-format
msgid "Failed to open for writing %s: %s"
-msgstr "无法写入 %s: %s"
+msgstr "为写入打开 %s 失败: %s"
-#: git-send-email.perl:684
+#: git-send-email.perl:712
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
"以 \"GIT:\" 开头的行将被删除。\n"
-"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"
+"考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n"
"\n"
"如果您不想发送摘要，清除内容。\n"
-#: git-send-email.perl:707
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr "无法打开 %s.final: %s"
-
-#: git-send-email.perl:710
+#: git-send-email.perl:736
#, perl-format
msgid "Failed to open %s: %s"
msgstr "无法打开 %s: %s"
-#: git-send-email.perl:745
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-msgstr "To/Cc/Bcc 字段不解析，它们被忽略\n"
+#: git-send-email.perl:753
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "无法打开 %s.final: %s"
-#: git-send-email.perl:754
+#: git-send-email.perl:796
msgid "Summary email is empty, skipping it\n"
msgstr "摘要邮件为空，跳过\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:786
+#: git-send-email.perl:831
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "您确认要使用 <%s> [y/N]？"
-#: git-send-email.perl:815
+#: git-send-email.perl:886
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr "如下文件含 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n"
-#: git-send-email.perl:820
+#: git-send-email.perl:891
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？"
-#: git-send-email.perl:828
+#: git-send-email.perl:899
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"\t%s\n"
"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n"
-#: git-send-email.perl:847
+#: git-send-email.perl:918
msgid "To whom should the emails be sent (if anyone)?"
msgstr "邮件将要发送给谁？"
-#: git-send-email.perl:865
+#: git-send-email.perl:936
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
-msgstr "严重：别名 '%s' 扩展为它自己\n"
+msgstr "致命错误：别名 '%s' 扩展为它自己\n"
-#: git-send-email.perl:877
+#: git-send-email.perl:948
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ？"
-#: git-send-email.perl:927 git-send-email.perl:935
+#: git-send-email.perl:1006 git-send-email.perl:1014
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:939
+#: git-send-email.perl:1018
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)："
-#: git-send-email.perl:1260
+#: git-send-email.perl:1335
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA 路径 \"%s\" 不存在"
-#: git-send-email.perl:1335
+#: git-send-email.perl:1418
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
" sendemail.confirm auto'。\n"
"\n"
-#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1350
-msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
-msgstr "发送邮件？([y]es|[n]o|[q]uit|[a]ll)："
+#: git-send-email.perl:1433
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+msgstr "发送这封邮件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-#: git-send-email.perl:1353
+#: git-send-email.perl:1436
msgid "Send this email reply required"
msgstr "发送要求的邮件回复"
-#: git-send-email.perl:1379
+#: git-send-email.perl:1464
msgid "The required SMTP server is not properly defined."
msgstr "要求的 SMTP 服务器未被正确定义。"
-#: git-send-email.perl:1426
+#: git-send-email.perl:1511
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "服务器不支持 STARTTLS！%s"
-#: git-send-email.perl:1431 git-send-email.perl:1435
+#: git-send-email.perl:1516 git-send-email.perl:1520
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS 失败！%s"
-#: git-send-email.perl:1445
+#: git-send-email.perl:1529
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
-#: git-send-email.perl:1463
+#: git-send-email.perl:1547
#, perl-format
msgid "Failed to send %s\n"
msgstr "无法发送 %s\n"
-#: git-send-email.perl:1466
+#: git-send-email.perl:1550
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "演习发送 %s\n"
-#: git-send-email.perl:1466
+#: git-send-email.perl:1550
#, perl-format
msgid "Sent %s\n"
msgstr "正发送 %s\n"
-#: git-send-email.perl:1468
+#: git-send-email.perl:1552
msgid "Dry-OK. Log says:\n"
msgstr "演习成功。日志说：\n"
-#: git-send-email.perl:1468
+#: git-send-email.perl:1552
msgid "OK. Log says:\n"
msgstr "OK。日志说：\n"
-#: git-send-email.perl:1480
+#: git-send-email.perl:1564
msgid "Result: "
msgstr "结果："
-#: git-send-email.perl:1483
+#: git-send-email.perl:1567
msgid "Result: OK\n"
msgstr "结果：OK\n"
-#: git-send-email.perl:1496
+#: git-send-email.perl:1585
#, perl-format
msgid "can't open file %s"
msgstr "无法打开文件 %s"
-#: git-send-email.perl:1543 git-send-email.perl:1563
+#: git-send-email.perl:1632 git-send-email.perl:1652
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1549
+#: git-send-email.perl:1638
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
-#: git-send-email.perl:1597
+#: git-send-email.perl:1691
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1622
+#: git-send-email.perl:1726
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) 添加 cc: %s 自行 '%s'\n"
-#: git-send-email.perl:1728
+#: git-send-email.perl:1837
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) 不能执行 '%s'"
-#: git-send-email.perl:1735
+#: git-send-email.perl:1844
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) 添加 %s: %s 自：'%s'\n"
-#: git-send-email.perl:1739
+#: git-send-email.perl:1848
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) 无法关闭管道至 '%s'"
-#: git-send-email.perl:1766
+#: git-send-email.perl:1878
msgid "cannot send message as 7bit"
msgstr "不能以 7bit 形式发送信息"
-#: git-send-email.perl:1774
+#: git-send-email.perl:1886
msgid "invalid transfer encoding"
msgstr "无效的传送编码"
-#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
+#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "不能打开 %s：%s\n"
-#: git-send-email.perl:1815
+#: git-send-email.perl:1930
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s：补丁包含一个超过 998 字符的行"
-#: git-send-email.perl:1831
+#: git-send-email.perl:1947
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "略过 %s 含备份后缀 '%s'。\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1835
+#: git-send-email.perl:1951
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "您真的要发送 %s？[y|N]："