From d5be499eed5593426c29debeb8898e73bf0a97cb Mon Sep 17 00:00:00 2001
From: Fangyi Zhou <me@fangyi.io>
Date: Fri, 16 Sep 2022 11:31:26 +0100
Subject: [PATCH] l10n: zh_CN v2.38.0 rounds 1 & 2
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Reviewed-by: Jiang Xin <worldhello.net@gmail.com>
Reviewed-by: Li Linchao <lilinchao@oschina.cn>
Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Fangyi Zhou <me@fangyi.io>
---
 po/zh_CN.po | 1541 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 1057 insertions(+), 484 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7de9c72d56..c6a3777ae2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -144,8 +144,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-06-22 10:25+0100\n"
-"PO-Revision-Date: 2022-06-14 20:52+0100\n"
+"POT-Creation-Date: 2022-09-23 14:51+0100\n"
+"PO-Revision-Date: 2022-09-23 14:53+0100\n"
 "Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
 "Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n"
 "Language: zh_CN\n"
@@ -153,14 +153,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 40.0\n"
+"X-Generator: Gtranslator 42.0\n"
 
 #: add-interactive.c
 #, c-format
 msgid "Huh (%s)?"
 msgstr "嗯（%s）？"
 
-#: add-interactive.c builtin/rebase.c reset.c sequencer.c
+#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c
 msgid "could not read index"
 msgstr "不能读取索引"
 
@@ -341,8 +341,8 @@ msgid "unstaged"
 msgstr "未缓存"
 
 #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c
-#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c
-#: git-add--interactive.perl
+#: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c
+#: builtin/submodule--helper.c git-add--interactive.perl
 msgid "path"
 msgstr "路径"
 
@@ -623,6 +623,26 @@ msgstr ""
 "a - 应用该块和本文件中后面的全部块\n"
 "d - 不要应用该块和本文件中后面的全部块\n"
 
+#: add-patch.c git-add--interactive.perl
+#, c-format, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c git-add--interactive.perl
+#, c-format, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c git-add--interactive.perl
+#, c-format, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c git-add--interactive.perl
+#, c-format, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
+
 #: add-patch.c
 msgid ""
 "y - apply this hunk to worktree\n"
@@ -642,11 +662,6 @@ msgstr ""
 msgid "could not parse hunk header '%.*s'"
 msgstr "无法解析数据块头信息 '%.*s'"
 
-#: add-patch.c
-#, c-format
-msgid "could not parse colored hunk header '%.*s'"
-msgstr "无法解析彩色数据块头信息 '%.*s'"
-
 #: add-patch.c
 msgid "could not parse diff"
 msgstr "不能解析差异信息"
@@ -973,6 +988,26 @@ msgstr ""
 "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
 "\n"
 
+#: advice.c
+#, c-format
+msgid ""
+"The following paths have been moved outside the\n"
+"sparse-checkout definition but are not sparse due to local\n"
+"modifications.\n"
+msgstr ""
+"下列的路径已经被移动至稀疏检出的定义之外，\n"
+"但是由于本地的修改而并非稀疏。\n"
+
+#: advice.c
+msgid ""
+"To correct the sparsity of these paths, do the following:\n"
+"* Use \"git add --sparse <paths>\" to update the index\n"
+"* Use \"git sparse-checkout reapply\" to apply the sparsity rules"
+msgstr ""
+"为了修正这些的路径的稀疏性，请运行下列命令：\n"
+"* 使用 \"git add --sparse <路径>\" 来更新索引\n"
+"* 使用 \"git sparse-checkout reapply\" 来应用稀疏规则"
+
 #: alias.c
 msgid "cmdline ends with \\"
 msgstr "命令行以 \\ 结尾"
@@ -1204,7 +1239,7 @@ msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却
 msgid "patch failed: %s:%ld"
 msgstr "打补丁失败：%s:%ld"
 
-#: apply.c
+#: apply.c builtin/mv.c
 #, c-format
 msgid "cannot checkout %s"
 msgstr "不能检出 %s"
@@ -1597,6 +1632,11 @@ msgstr "不能打开数据对象 %s"
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "不支持的文件模式：0%o (SHA1: %s)"
 
+#: archive-tar.c archive-zip.c builtin/pack-objects.c
+#, c-format
+msgid "deflate error (%d)"
+msgstr "压缩错误 (%d)"
+
 #: archive-tar.c
 #, c-format
 msgid "unable to start '%s' filter"
@@ -1621,11 +1661,6 @@ msgstr "路径不是有效的 UTF-8：%s"
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "路径太长（%d 字符，SHA1：%s）：%s"
 
-#: archive-zip.c builtin/pack-objects.c
-#, c-format
-msgid "deflate error (%d)"
-msgstr "压缩错误 (%d)"
-
 #: archive-zip.c
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
@@ -1941,10 +1976,10 @@ msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
 
 #: blame.c builtin/commit.c builtin/log.c builtin/merge.c
-#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c
-#: remote.c sequencer.c submodule.c
+#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c
+#: ref-filter.c remote.c sequencer.c submodule.c
 msgid "revision walk setup failed"
-msgstr "版本遍历设置失败"
+msgstr "版本遍历初始化失败"
 
 #: blame.c
 msgid ""
@@ -2399,7 +2434,7 @@ msgstr "fseek 失败"
 msgid "could not open '%s' for reading"
 msgstr "无法打开 '%s' 进行读取"
 
-#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c
+#: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "无法打开 '%s' 进行写入"
@@ -2700,8 +2735,8 @@ msgid "n"
 msgstr "n"
 
 #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
-#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c
-#: builtin/verify-tag.c
+#: builtin/diagnose.c builtin/for-each-ref.c builtin/ls-files.c
+#: builtin/ls-tree.c builtin/replace.c builtin/tag.c builtin/verify-tag.c
 msgid "format"
 msgstr "格式"
 
@@ -2804,7 +2839,7 @@ msgstr "交互式模式需要命令行上提供补丁"
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<选项>] [<补丁>...]"
 
-#: builtin/archive.c contrib/scalar/scalar.c
+#: builtin/archive.c diagnose.c
 msgid "could not redirect output"
 msgstr "不能重定向输出"
 
@@ -3686,8 +3721,8 @@ msgstr "排序和过滤属于大小写不敏感"
 msgid "recurse through submodules"
 msgstr "在子模组中递归"
 
-#: builtin/branch.c builtin/for-each-ref.c builtin/ls-tree.c builtin/tag.c
-#: builtin/verify-tag.c
+#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c
+#: builtin/tag.c builtin/verify-tag.c
 msgid "format to use for the output"
 msgstr "输出格式"
 
@@ -3810,8 +3845,12 @@ msgid "not run from a git repository - no hooks to show\n"
 msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n"
 
 #: builtin/bugreport.c
-msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
-msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]"
+msgid ""
+"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--"
+"diagnose[=<mode>]"
+msgstr ""
+"git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>] [--"
+"diagnose[=<模式>]"
 
 #: builtin/bugreport.c
 msgid ""
@@ -3847,19 +3886,34 @@ msgstr ""
 "请检查下面错误报告中余下的内容。\n"
 "您可以删除任何您不想共享的内容。\n"
 
+#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c
+#: parse-options.h
+msgid "mode"
+msgstr "模式"
+
+#: builtin/bugreport.c
+msgid ""
+"create an additional zip archive of detailed diagnostics (default 'stats')"
+msgstr "额外创建详细诊断信息的压缩包（默认 'stats'）"
+
 #: builtin/bugreport.c
-msgid "specify a destination for the bugreport file"
+msgid "specify a destination for the bugreport file(s)"
 msgstr "指定错误报告文件的目标位置"
 
 #: builtin/bugreport.c
-msgid "specify a strftime format suffix for the filename"
+msgid "specify a strftime format suffix for the filename(s)"
 msgstr "指定文件的 strftime 格式后缀"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c builtin/diagnose.c
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "不能为 '%s' 创建先导目录"
 
+#: builtin/bugreport.c builtin/diagnose.c
+#, c-format
+msgid "unable to create diagnostics archive %s"
+msgstr "不能创建诊断归档包 %s"
+
 #: builtin/bugreport.c
 msgid "System Info"
 msgstr "系统信息"
@@ -3935,11 +3989,6 @@ msgstr "需要一个仓库来解开归档包。"
 msgid "Unbundling objects"
 msgstr "解包对象中"
 
-#: builtin/bundle.c builtin/remote.c
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "未知子命令：%s"
-
 #: builtin/cat-file.c merge-recursive.c
 #, c-format
 msgid "cannot read object %s '%s'"
@@ -4037,6 +4086,10 @@ msgstr "显示对象大小"
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "允许 -s 和 -t 对损坏的对象生效"
 
+#: builtin/cat-file.c builtin/log.c
+msgid "use mail map file"
+msgstr "使用邮件映射文件"
+
 #: builtin/cat-file.c
 msgid "Batch objects requested on stdin (or --batch-all-objects)"
 msgstr "批量处理标准输入中请求的对象（或者 --batch-all-objects）"
@@ -4049,6 +4102,10 @@ msgstr "显示完整的 <对象> 或 <版本> 内容"
 msgid "like --batch, but don't emit <contents>"
 msgstr "类似于 --batch，但不输出 <内容>"
 
+#: builtin/cat-file.c
+msgid "stdin is NUL-terminated"
+msgstr "标准输入以 NUL 字符分隔"
+
 #: builtin/cat-file.c
 msgid "read commands from stdin"
 msgstr "从标准输入读取命令"
@@ -4725,7 +4782,7 @@ msgstr ""
 
 #: builtin/checkout.c
 msgid "you must specify path(s) to restore"
-msgstr "您必须指定一个要恢复的路径"
+msgstr "您必须指定要恢复的路径"
 
 #: builtin/checkout.c builtin/clone.c builtin/remote.c
 #: builtin/submodule--helper.c builtin/worktree.c
@@ -5130,6 +5187,14 @@ msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr "初始化稀疏检出文件，只包含根目录文件"
 
+#: builtin/clone.c
+msgid "uri"
+msgstr "uri"
+
+#: builtin/clone.c
+msgid "a URI for downloading bundles before fetching from origin remote"
+msgstr "用于在从 origin 远程获取之前下载归档包的 URI"
+
 #: builtin/clone.c
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
@@ -5204,8 +5269,8 @@ msgid "failed to initialize sparse-checkout"
 msgstr "无法初始化稀疏检出"
 
 #: builtin/clone.c
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
+msgid "remote HEAD refers to nonexistent ref, unable to checkout"
+msgstr "远程 HEAD 指向一个不存在的引用，无法检出"
 
 #: builtin/clone.c
 msgid "unable to checkout working tree"
@@ -5227,7 +5292,7 @@ msgstr "无法删除临时的 alternates 文件"
 msgid "Too many arguments."
 msgstr "太多参数。"
 
-#: builtin/clone.c contrib/scalar/scalar.c
+#: builtin/clone.c scalar.c
 msgid "You must specify a repository to clone."
 msgstr "您必须指定一个仓库来克隆。"
 
@@ -5236,6 +5301,12 @@ msgstr "您必须指定一个仓库来克隆。"
 msgid "options '%s' and '%s %s' cannot be used together"
 msgstr "选项 '%s' 和 '%s %s' 不能同时使用"
 
+#: builtin/clone.c
+msgid ""
+"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-"
+"exclude"
+msgstr "--bundle-uri 与 --depth、--shallow-since 和 --shallow-exclude 不兼容"
+
 #: builtin/clone.c
 #, c-format
 msgid "repository '%s' does not exist"
@@ -5324,6 +5395,15 @@ msgstr "--local 被忽略"
 msgid "cannot clone from filtered bundle"
 msgstr "无法从经过过滤的归档包克隆"
 
+#: builtin/clone.c
+msgid "failed to initialize the repo, skipping bundle URI"
+msgstr "无法初始化仓库，跳过归档包 URI"
+
+#: builtin/clone.c
+#, c-format
+msgid "failed to fetch objects from bundle URI '%s'"
+msgstr "无法从归档包 URI '%s' 获取对象"
+
 #: builtin/clone.c
 msgid "remote transport reported error"
 msgstr "远程传输报告错误"
@@ -5471,11 +5551,6 @@ msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
 msgid "Collecting commits from input"
 msgstr "正从标准输入收集提交"
 
-#: builtin/commit-graph.c builtin/multi-pack-index.c
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "未识别的子命令：%s"
-
 #: builtin/commit-tree.c
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -5903,10 +5978,6 @@ msgstr "以长格式显示状态（默认）"
 msgid "terminate entries with NUL"
 msgstr "条目以 NUL 字符结尾"
 
-#: builtin/commit.c builtin/fast-export.c builtin/rebase.c parse-options.h
-msgid "mode"
-msgstr "模式"
-
 #: builtin/commit.c
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
@@ -6644,6 +6715,26 @@ msgstr "没有发现名称，无法描述任何东西。"
 msgid "option '%s' and commit-ishes cannot be used together"
 msgstr "选项 '%s' 和提交号不能同时使用"
 
+#: builtin/diagnose.c
+msgid ""
+"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--"
+"mode=<mode>]"
+msgstr ""
+"git diagnose [-o|--output-directory <文件>] [-s|--suffix <格式>] [--mode=<模"
+"式>]"
+
+#: builtin/diagnose.c
+msgid "specify a destination for the diagnostics archive"
+msgstr "指定诊断归档包的目标位置"
+
+#: builtin/diagnose.c
+msgid "specify a strftime format suffix for the filename"
+msgstr "指定文件的 strftime 格式后缀"
+
+#: builtin/diagnose.c
+msgid "specify the content of the diagnostic archive"
+msgstr "指定诊断信息归档包的内容"
+
 #: builtin/diff-tree.c
 msgid "--merge-base only works with two commits"
 msgstr "--merge-base 仅适用于两个提交"
@@ -7115,12 +7206,8 @@ msgid "[rejected]"
 msgstr "[已拒绝]"
 
 #: builtin/fetch.c
-msgid "can't fetch in current branch"
-msgstr "当前分支下不能执行获取操作"
-
-#: builtin/fetch.c
-msgid "checked out in another worktree"
-msgstr "已在另一个工作树中检出"
+msgid "can't fetch into checked-out branch"
+msgstr "无法获取到已检出的分支"
 
 #: builtin/fetch.c
 msgid "[tag update]"
@@ -7658,6 +7745,11 @@ msgstr "%s：cache-tree 中无效的 sha1 指针"
 msgid "non-tree in cache-tree"
 msgstr "cache-tree 中非树对象"
 
+#: builtin/fsck.c
+#, c-format
+msgid "%s: invalid sha1 pointer in resolve-undo"
+msgstr "%s：resolve-undo 中无效的 sha1 指针"
+
 #: builtin/fsck.c
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<选项>] [<对象>...]"
@@ -8075,12 +8167,16 @@ msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'"
 
 #: builtin/gc.c
-msgid "failed to run 'crontab'; your system might not support 'cron'"
-msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'"
+msgid "failed to create crontab temporary file"
+msgstr "无法创建 crontab 临时文件"
 
 #: builtin/gc.c
-msgid "failed to open stdin of 'crontab'"
-msgstr "无法打开 'crontab' 的标准输入"
+msgid "failed to open temporary file"
+msgstr "无法打开临时文件"
+
+#: builtin/gc.c
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'"
 
 #: builtin/gc.c
 msgid "'crontab' died"
@@ -8142,11 +8238,6 @@ msgstr "无法将仓库添加到全局配置"
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <子命令> [<选项>]"
 
-#: builtin/gc.c
-#, c-format
-msgid "invalid subcommand: %s"
-msgstr "无效子命令：%s"
-
 #: builtin/grep.c
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
@@ -8370,6 +8461,10 @@ msgstr "分页显示匹配的文件"
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "允许调用 grep(1)（本次构建忽略）"
 
+#: builtin/grep.c
+msgid "maximum number of results per file"
+msgstr "每个文件的最大结果数量"
+
 #: builtin/grep.c
 msgid "no pattern given"
 msgstr "未提供匹配模式"
@@ -8481,13 +8576,21 @@ msgstr "打印命令描述"
 msgid "print list of useful guides"
 msgstr "显示有用的指南列表"
 
+#: builtin/help.c
+msgid "print list of user-facing repository, command and file interfaces"
+msgstr "打印面向用户的仓库、命令和文件接口列表"
+
+#: builtin/help.c
+msgid "print list of file formats, protocols and other developer interfaces"
+msgstr "打印文件格式、协议和其他开发者接口列表"
+
 #: builtin/help.c
 msgid "print all configuration variable names"
 msgstr "打印所有配置变量名称"
 
 #: builtin/help.c
-msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
-msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<命令>]"
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]"
+msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<命令>|<文档>]"
 
 #: builtin/help.c
 #, c-format
@@ -9078,8 +9181,8 @@ msgid "show source"
 msgstr "显示源"
 
 #: builtin/log.c
-msgid "use mail map file"
-msgstr "使用邮件映射文件"
+msgid "clear all previously-defined decoration filters"
+msgstr "清除所有之前定义的修饰过滤器"
 
 #: builtin/log.c
 msgid "only decorate refs that match <pattern>"
@@ -9404,6 +9507,10 @@ msgstr "在附函或单个补丁中显示和 <引用规格> 的差异"
 msgid "percentage by which creation is weighted"
 msgstr "创建权重的百分比"
 
+#: builtin/log.c
+msgid "show in-body From: even if identical to the e-mail header"
+msgstr "显示正文内的 From:，即使其与电子邮件头中一致"
+
 #: builtin/log.c
 #, c-format
 msgid "invalid ident line: %s"
@@ -9479,11 +9586,26 @@ msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
 
+#: builtin/ls-files.c
+#, c-format
+msgid "bad ls-files format: element '%s' does not start with '('"
+msgstr "坏的 ls-files 格式：元素 '%s' 没有以 '(' 开头"
+
+#: builtin/ls-files.c
+#, c-format
+msgid "bad ls-files format: element '%s' does not end in ')'"
+msgstr "坏的 ls-files 格式：元素 '%s' 没有以 ')' 结尾"
+
+#: builtin/ls-files.c
+#, c-format
+msgid "bad ls-files format: %%%.*s"
+msgstr "坏的 ls-files 格式: %%%.*s"
+
 #: builtin/ls-files.c
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<选项>] [<文件>...]"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c builtin/merge-tree.c
 msgid "separate paths with the NUL character"
 msgstr "用 NUL 字符分隔路径"
 
@@ -9591,6 +9713,14 @@ msgstr "抑制重复条目"
 msgid "show sparse directories in the presence of a sparse index"
 msgstr "在稀疏索引存在时显示稀疏目录"
 
+#: builtin/ls-files.c
+msgid ""
+"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, "
+"--eol"
+msgstr ""
+"--format 不能和 -s、-o、-k、-t、--resolve-undo、--deduplicate 和 --eol 同时使"
+"用"
+
 #: builtin/ls-remote.c
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -9874,6 +10004,50 @@ msgstr "无法解析引用 '%s'"
 msgid "Merging %s with %s\n"
 msgstr "合并 %s 和 %s\n"
 
+#: builtin/merge-tree.c builtin/merge.c
+msgid "not something we can merge"
+msgstr "不是可以合并的东西"
+
+#: builtin/merge-tree.c builtin/merge.c
+msgid "refusing to merge unrelated histories"
+msgstr "拒绝合并无关的历史"
+
+#: builtin/merge-tree.c
+msgid "failure to merge"
+msgstr "合并失败"
+
+#: builtin/merge-tree.c
+msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>"
+msgstr "git merge-tree [--write-tree] [<选项>] <分支1> <分支2>"
+
+#: builtin/merge-tree.c
+msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>"
+msgstr "git merge-tree [--trivial-merge] <基准树> <分支1> <分支2>"
+
+#: builtin/merge-tree.c
+msgid "do a real merge instead of a trivial merge"
+msgstr "进行真正的合并而不是简单的合并"
+
+#: builtin/merge-tree.c
+msgid "do a trivial merge only"
+msgstr "只进行简单的合并"
+
+#: builtin/merge-tree.c
+msgid "also show informational/conflict messages"
+msgstr "同时显示额外信息/冲突消息"
+
+#: builtin/merge-tree.c
+msgid "list filenames without modes/oids/stages"
+msgstr "列出没有模式/对象 ID/暂存的文件名"
+
+#: builtin/merge-tree.c builtin/merge.c builtin/pull.c
+msgid "allow merging unrelated histories"
+msgstr "允许合并不相关的历史"
+
+#: builtin/merge-tree.c
+msgid "--trivial-merge is incompatible with all other options"
+msgstr "--trivial-merge 与其他所有选项不兼容"
+
 #: builtin/merge.c
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<选项>] [<提交>...]"
@@ -9980,10 +10154,6 @@ msgstr "--abort，但是保留索引和工作区"
 msgid "continue the current in-progress merge"
 msgstr "继续当前正在进行的合并"
 
-#: builtin/merge.c builtin/pull.c
-msgid "allow merging unrelated histories"
-msgstr "允许合并不相关的历史"
-
 #: builtin/merge.c
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
@@ -10128,10 +10298,6 @@ msgstr "不能关闭 '%s'"
 msgid "not something we can merge in %s: %s"
 msgstr "不能在 %s 中合并：%s"
 
-#: builtin/merge.c
-msgid "not something we can merge"
-msgstr "不能合并"
-
 #: builtin/merge.c
 msgid "--abort expects no arguments"
 msgstr "--abort 不带参数"
@@ -10193,15 +10359,20 @@ msgstr "%s - 不能被合并"
 msgid "Can merge only exactly one commit into empty head"
 msgstr "只能将一个提交合并到空分支上"
 
-#: builtin/merge.c
-msgid "refusing to merge unrelated histories"
-msgstr "拒绝合并无关的历史"
-
 #: builtin/merge.c
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "更新 %s..%s\n"
 
+#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"您对下列文件的本地修改将被合并操作覆盖：\n"
+"  %s"
+
 #: builtin/merge.c
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
@@ -10242,6 +10413,11 @@ msgstr "使用 %s 策略以准备手工解决。\n"
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "自动合并进展顺利，按要求在提交前停止\n"
 
+#: builtin/merge.c
+#, c-format
+msgid "When finished, apply stashed changes with `git stash pop`\n"
+msgstr "在完成后，使用 `git stash pop` 应用贮藏的变更\n"
+
 #: builtin/mktag.c
 #, c-format
 msgid "warning: tag input does not pass fsck: %s"
@@ -10389,6 +10565,10 @@ msgstr "检查 '%s' 到 '%s' 的重命名\n"
 msgid "bad source"
 msgstr "坏的源"
 
+#: builtin/mv.c
+msgid "destination exists"
+msgstr "目标已存在"
+
 #: builtin/mv.c
 msgid "can not move directory into itself"
 msgstr "不能将目录移动到自身"
@@ -10409,10 +10589,6 @@ msgstr "不在版本控制之下"
 msgid "conflicted"
 msgstr "冲突"
 
-#: builtin/mv.c
-msgid "destination exists"
-msgstr "目标已存在"
-
 #: builtin/mv.c
 #, c-format
 msgid "overwriting '%s'"
@@ -10430,6 +10606,10 @@ msgstr "同一目标具有多个源"
 msgid "destination directory does not exist"
 msgstr "目标目录不存在"
 
+#: builtin/mv.c
+msgid "destination exists in the index"
+msgstr "目标在索引中已存在"
+
 #: builtin/mv.c
 #, c-format
 msgid "%s, source=%s, destination=%s"
@@ -10872,10 +11052,10 @@ msgstr "注解引用"
 msgid "use notes from <notes-ref>"
 msgstr "从 <注解引用> 使用注解"
 
-#: builtin/notes.c builtin/stash.c
+#: builtin/notes.c builtin/remote.c parse-options.c
 #, c-format
-msgid "unknown subcommand: %s"
-msgstr "未知子命令：%s"
+msgid "unknown subcommand: `%s'"
+msgstr "未知子命令：`%s'"
 
 #: builtin/pack-objects.c
 msgid ""
@@ -11473,7 +11653,7 @@ msgstr "详见 git-pull(1)。"
 msgid "<remote>"
 msgstr "<远程>"
 
-#: builtin/pull.c contrib/scalar/scalar.c
+#: builtin/pull.c scalar.c
 msgid "<branch>"
 msgstr "<分支>"
 
@@ -11924,14 +12104,20 @@ msgstr "仅显示与第一个范围有关的输出"
 msgid "only emit output related to the second range"
 msgstr "仅显示与第二个范围有关的输出"
 
+#: builtin/range-diff.c
+#, c-format
+msgid "not a revision: '%s'"
+msgstr "不是版本：'%s'"
+
 #: builtin/range-diff.c
 #, c-format
 msgid "not a commit range: '%s'"
-msgstr "不是一个提交范围：'%s'"
+msgstr "不是提交范围：'%s'"
 
 #: builtin/range-diff.c
-msgid "single arg format must be symmetric range"
-msgstr "单个参数格式必须是对称范围（即包含...）"
+#, c-format
+msgid "not a symmetric range: '%s'"
+msgstr "不是对称的范围：'%s'"
 
 #: builtin/range-diff.c
 msgid "need two commit ranges"
@@ -12265,6 +12451,10 @@ msgstr "保留初始为空的提交"
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交"
 
+#: builtin/rebase.c
+msgid "update branches that point to commits that are being rebased"
+msgstr "更新指向正在被变基的提交的分支"
+
 #: builtin/rebase.c
 msgid "add exec lines after each commit of the editable list"
 msgstr "可编辑列表的每一个提交下面增加一行 exec"
@@ -12888,6 +13078,10 @@ msgstr " 新的（下一次获取将存储于 remotes/%s）"
 msgid " tracked"
 msgstr " 已跟踪"
 
+#: builtin/remote.c
+msgid " skipped"
+msgstr " 已跳过"
+
 #: builtin/remote.c
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " 过时（使用 'git remote prune' 来移除）"
@@ -13729,11 +13923,16 @@ msgstr "不能重置索引文件至版本 '%s'。"
 msgid "Could not write new index file."
 msgstr "不能写入新的索引文件。"
 
-#: builtin/rev-list.c pack-bitmap.c
+#: builtin/rev-list.c
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "无法得到 %s 的磁盘使用量"
 
+#: builtin/rev-list.c
+#, c-format
+msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
+msgstr "'%s' 的值无效：'%s'，唯一允许的格式是 '%s'"
+
 #: builtin/rev-list.c
 msgid "rev-list does not support display of notes"
 msgstr "rev-list 不支持显示注解"
@@ -13767,6 +13966,10 @@ msgstr "输入过早结束"
 msgid "no usage string given before the `--' separator"
 msgstr "在 `--' 分隔符之前没有给出使用方法字符串"
 
+#: builtin/rev-parse.c
+msgid "missing opt-spec before option flags"
+msgstr "选项参数之前缺少选项规格"
+
 #: builtin/rev-parse.c
 msgid "Needed a single revision"
 msgstr "需要一个单独的版本"
@@ -14317,7 +14520,7 @@ msgstr "初始化稀疏检出为锥形模式"
 msgid "toggle the use of a sparse index"
 msgstr "切换稀疏索引的使用"
 
-#: builtin/sparse-checkout.c commit-graph.c midx.c
+#: builtin/sparse-checkout.c commit-graph.c midx.c sequencer.c
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "不能为 %s 创建先导目录"
@@ -14711,6 +14914,11 @@ msgstr "为每一行的行首添加注释符和空格"
 msgid "Expecting a full ref name, got %s"
 msgstr "期望一个完整的引用名称，却得到 %s"
 
+#: builtin/submodule--helper.c
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "无法获得子模组 '%s' 的仓库句柄"
+
 #: builtin/submodule--helper.c
 #, c-format
 msgid ""
@@ -14718,14 +14926,6 @@ msgid ""
 "authoritative upstream."
 msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
 
-#: builtin/submodule--helper.c
-msgid "alternative anchor for relative paths"
-msgstr "相对路径的替代锚记（anchor）"
-
-#: builtin/submodule--helper.c
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-
 #: builtin/submodule--helper.c
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
@@ -14764,8 +14964,8 @@ msgid "recurse into nested submodules"
 msgstr "递归进入嵌套子模组中"
 
 #: builtin/submodule--helper.c
-msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
+msgid "git submodule foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule foreach [--quiet] [--recursive] [--] <命令>"
 
 #: builtin/submodule--helper.c
 #, c-format
@@ -14792,8 +14992,8 @@ msgid "suppress output for initializing a submodule"
 msgstr "抑制子模组初始化的输出"
 
 #: builtin/submodule--helper.c
-msgid "git submodule--helper init [<options>] [<path>]"
-msgstr "git submodule--helper init [<选项>] [<路径>]"
+msgid "git submodule init [<options>] [<path>]"
+msgstr "git submodule init [<选项>] [<路径>]"
 
 #: builtin/submodule--helper.c
 #, c-format
@@ -14824,10 +15024,6 @@ msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
 
-#: builtin/submodule--helper.c
-msgid "git submodule--helper name <path>"
-msgstr "git submodule--helper name <路径>"
-
 #: builtin/submodule--helper.c
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
@@ -14870,8 +15066,8 @@ msgid "limit the summary size"
 msgstr "限制总结的大小"
 
 #: builtin/submodule--helper.c
-msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
-msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]"
+msgid "git submodule summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule summary [<选项>] [<提交>] [--] [<路径>]"
 
 #: builtin/submodule--helper.c
 msgid "could not fetch a revision for HEAD"
@@ -14887,11 +15083,6 @@ msgstr "为 '%s' 同步子模组 url\n"
 msgid "failed to register url for submodule path '%s'"
 msgstr "无法为子模组路径 '%s' 注册 url"
 
-#: builtin/submodule--helper.c
-#, c-format
-msgid "failed to get the default remote for submodule '%s'"
-msgstr "无法得到子模组 '%s' 的默认远程关联"
-
 #: builtin/submodule--helper.c
 #, c-format
 msgid "failed to update remote for submodule '%s'"
@@ -14902,8 +15093,8 @@ msgid "suppress output of synchronizing submodule url"
 msgstr "抑制子模组 URL 同步的输出"
 
 #: builtin/submodule--helper.c
-msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
-msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
+msgid "git submodule sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule sync [--quiet] [--recursive] [<路径>]"
 
 #: builtin/submodule--helper.c
 #, c-format
@@ -14971,6 +15162,11 @@ msgstr ""
 "Git 不使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而非\n"
 "'--reference' 来克隆。"
 
+#: builtin/submodule--helper.c
+#, c-format
+msgid "could not get a repository handle for gitdir '%s'"
+msgstr "无法获得 git 目录 '%s' 的仓库句柄"
+
 #: builtin/submodule--helper.c
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
@@ -15006,6 +15202,10 @@ msgstr "目录非空：'%s'"
 msgid "could not get submodule directory for '%s'"
 msgstr "无法得到 '%s' 的子模组目录"
 
+#: builtin/submodule--helper.c
+msgid "alternative anchor for relative paths"
+msgstr "相对路径的替代锚记（anchor）"
+
 #: builtin/submodule--helper.c
 msgid "where the new submodule will be cloned to"
 msgstr "新的子模组将要克隆的路径"
@@ -15040,11 +15240,6 @@ msgstr ""
 "[--name <名字>] [--depth <深度>] [--single-branch] [--filter <过滤器规格>] --"
 "url <url> --path <路径>"
 
-#: builtin/submodule--helper.c
-#, c-format
-msgid "Invalid update mode '%s' for submodule path '%s'"
-msgstr "子模组路径 '%2$s' 的更新模式 '%1$s' 无效"
-
 #: builtin/submodule--helper.c
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
@@ -15131,6 +15326,11 @@ msgid ""
 "of that commit failed."
 msgstr "获取了子模组路径 '%s'，但是它没有包含 %s。直接获取该提交失败。"
 
+#: builtin/submodule--helper.c
+#, c-format
+msgid "could not initialize submodule at path '%s'"
+msgstr "无法在路径 '%s' 初始化子模组"
+
 #: builtin/submodule--helper.c
 #, c-format
 msgid ""
@@ -15138,11 +15338,6 @@ msgid ""
 "the superproject is not on any branch"
 msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上"
 
-#: builtin/submodule--helper.c
-#, c-format
-msgid "could not get a repository handle for submodule '%s'"
-msgstr "无法获得子模组 '%s' 的仓库句柄"
-
 #: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to find current revision in submodule path '%s'"
@@ -15188,12 +15383,16 @@ msgid "path into the working tree"
 msgstr "到工作区的路径"
 
 #: builtin/submodule--helper.c
-msgid "path into the working tree, across nested submodule boundaries"
-msgstr "工作区中的路径，递归嵌套子模组"
+msgid "use the 'checkout' update strategy (default)"
+msgstr "使用 'checkout' 更新策略（默认）"
 
 #: builtin/submodule--helper.c
-msgid "rebase, merge, checkout or none"
-msgstr "rebase、merge、checkout 或 none"
+msgid "use the 'merge' update strategy"
+msgstr "使用 'merge' 更新策略"
+
+#: builtin/submodule--helper.c
+msgid "use the 'rebase' update strategy"
+msgstr "使用 'rebase' 更新策略"
 
 #: builtin/submodule--helper.c
 msgid "create a shallow clone truncated to the specified number of revisions"
@@ -15211,6 +15410,10 @@ msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
 msgid "don't print cloning progress"
 msgstr "不要输出克隆进度"
 
+#: builtin/submodule--helper.c
+msgid "disallow cloning into non-empty directory, implies --init"
+msgstr "不允许克隆到一个非空目录，暗含 --init"
+
 #: builtin/submodule--helper.c
 msgid ""
 "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
@@ -15223,17 +15426,13 @@ msgstr ""
 "shallow] [--reference <仓库>] [--recursive] [--[no-]single-branch] [--] [<路"
 "径>...]"
 
-#: builtin/submodule--helper.c
-msgid "bad value for update parameter"
-msgstr "update 参数取值错误"
-
 #: builtin/submodule--helper.c
 msgid "recurse into submodules"
 msgstr "在子模组中递归"
 
 #: builtin/submodule--helper.c
-msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
-msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
+msgid "git submodule absorbgitdirs [<options>] [<path>...]"
+msgstr "git submodule absorbgitdirs [<选项>] [<路径>...]"
 
 #: builtin/submodule--helper.c
 msgid "check if it is safe to write to the .gitmodules file"
@@ -15260,8 +15459,8 @@ msgid "suppress output for setting url of a submodule"
 msgstr "抑制设置子模组 URL 的输出"
 
 #: builtin/submodule--helper.c
-msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
-msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>"
+msgid "git submodule set-url [--quiet] <path> <newurl>"
+msgstr "git submodule set-url [--quiet] <路径> <新地址>"
 
 #: builtin/submodule--helper.c
 msgid "set the default tracking branch to master"
@@ -15272,14 +15471,12 @@ msgid "set the default tracking branch"
 msgstr "设置默认跟踪分支"
 
 #: builtin/submodule--helper.c
-msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
-msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>"
+msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>"
+msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <路径>"
 
 #: builtin/submodule--helper.c
-msgid ""
-"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
-msgstr ""
-"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>"
+msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
+msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <分支> <路径>"
 
 #: builtin/submodule--helper.c
 msgid "--branch or --default required"
@@ -15394,8 +15591,8 @@ msgid ""
 msgstr "将子模组的名称设置为给定的字符串，而非默认为其路径"
 
 #: builtin/submodule--helper.c
-msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
-msgstr "git submodule--helper add [<选项>] [--] <仓库> [<路径>]"
+msgid "git submodule add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule add [<选项>] [--] <仓库> [<路径>]"
 
 #: builtin/submodule--helper.c
 msgid "Relative path can only be used from the toplevel of the working tree"
@@ -15648,6 +15845,19 @@ msgstr "已更新标签 '%s'（曾为 %s）\n"
 msgid "pack exceeds maximum allowed size"
 msgstr "包超过了最大允许大小"
 
+#: builtin/unpack-objects.c
+msgid "failed to write object in stream"
+msgstr "无法在流中写入对象"
+
+#: builtin/unpack-objects.c
+#, c-format
+msgid "inflate returned (%d)"
+msgstr "解压缩返回了 (%d)"
+
+#: builtin/unpack-objects.c
+msgid "invalid blob object from stream"
+msgstr "流中无效的数据对象"
+
 #: builtin/unpack-objects.c
 msgid "Unpacking objects"
 msgstr "展开对象中"
@@ -16290,6 +16500,33 @@ msgstr "将 <前缀> 子目录内容写到一个树对象"
 msgid "only useful for debugging"
 msgstr "只对调试有用"
 
+#: bulk-checkin.c
+msgid "core.fsyncMethod = batch is unsupported on this platform"
+msgstr "core.fsyncMethod = batch 不支持本平台"
+
+#: bundle-uri.c
+msgid "failed to create temporary file"
+msgstr "无法创建临时文件"
+
+#: bundle-uri.c
+msgid "insufficient capabilities"
+msgstr "缺乏能力"
+
+#: bundle-uri.c
+#, c-format
+msgid "failed to download bundle from URI '%s'"
+msgstr "无法从 URI '%s' 下载归档包"
+
+#: bundle-uri.c
+#, c-format
+msgid "file at URI '%s' is not a bundle"
+msgstr "位于 URI '%s' 的文件不是归档包"
+
+#: bundle-uri.c
+#, c-format
+msgid "failed to unbundle bundle from URI '%s'"
+msgstr "无法从 URI '%s' 解开归档包"
+
 #: bundle.c
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
@@ -16552,6 +16789,10 @@ msgstr "一个非常简单的 Git 仓库服务器"
 msgid "Give an object a human readable name based on an available ref"
 msgstr "基于一个现存的引用为一个对象起一个可读的名称"
 
+#: command-list.h
+msgid "Generate a zip archive of diagnostic information"
+msgstr "生成诊断信息的压缩包"
+
 #: command-list.h
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "显示提交之间、提交和工作区之间等的差异"
@@ -16721,8 +16962,8 @@ msgid "The standard helper program to use with git-merge-index"
 msgstr "与 git-merge-index 一起使用的标准向导程序"
 
 #: command-list.h
-msgid "Show three-way merge without touching index"
-msgstr "在不动索引的情况下显示三路合并"
+msgid "Perform merge without touching index or working tree"
+msgstr "在不触碰索引或工作树情况下应用合并"
 
 #: command-list.h
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
@@ -16982,6 +17223,10 @@ msgstr "校验打包的Git存仓文件"
 msgid "Check the GPG signature of tags"
 msgstr "检查标签的 GPG 签名"
 
+#: command-list.h
+msgid "Display version information about Git"
+msgstr "显示关于 Git 的版本信息"
+
 #: command-list.h
 msgid "Show logs with difference each commit introduces"
 msgstr "显示每一个提交引入的差异日志"
@@ -17027,16 +17272,40 @@ msgid "Frequently asked questions about using Git"
 msgstr "关于使用 Git 的常见问题"
 
 #: command-list.h
-msgid "A Git Glossary"
-msgstr "Git 词汇表"
+msgid "The bundle file format"
+msgstr "归档包文件格式"
 
 #: command-list.h
-msgid "Hooks used by Git"
+msgid "Chunk-based file formats"
+msgstr "块式文件格式"
+
+#: command-list.h
+msgid "Git commit graph format"
+msgstr "Git 提交图格式"
+
+#: command-list.h
+msgid "Git index format"
+msgstr "Git 索引格式"
+
+#: command-list.h
+msgid "Git pack format"
+msgstr "Git 包格式"
+
+#: command-list.h
+msgid "Git cryptographic signature formats"
+msgstr "Git 密码学签名格式"
+
+#: command-list.h
+msgid "A Git Glossary"
+msgstr "Git 词汇表"
+
+#: command-list.h
+msgid "Hooks used by Git"
 msgstr "Git 使用的钩子"
 
 #: command-list.h
 msgid "Specifies intentionally untracked files to ignore"
-msgstr "忽略指定的未跟踪文件"
+msgstr "指定故意忽略的未跟踪文件"
 
 #: command-list.h
 msgid "The Git repository browser"
@@ -17054,6 +17323,26 @@ msgstr "定义子模组属性"
 msgid "Git namespaces"
 msgstr "Git 名字空间"
 
+#: command-list.h
+msgid "Protocol v0 and v1 capabilities"
+msgstr "协议 v0 和 v1 能力"
+
+#: command-list.h
+msgid "Things common to various protocols"
+msgstr "不同协议的共同部分"
+
+#: command-list.h
+msgid "Git HTTP-based protocols"
+msgstr "Git 基于 HTTP 的协议"
+
+#: command-list.h
+msgid "How packs are transferred over-the-wire"
+msgstr "包在线路中传输的方式"
+
+#: command-list.h
+msgid "Git Wire Protocol, Version 2"
+msgstr "Git 传输协议，第二版"
+
 #: command-list.h
 msgid "Helper programs to interact with remote repositories"
 msgstr "与远程仓库交互的助手程序"
@@ -17086,6 +17375,10 @@ msgstr "Git web 界面（Git 仓库的 web 前端）"
 msgid "An overview of recommended workflows with Git"
 msgstr "Git 推荐的工作流概览"
 
+#: command-list.h
+msgid "A tool for managing large Git repositories"
+msgstr "一个管理大型 Git 仓库的工具"
+
 #: commit-graph.c
 msgid "commit-graph file is too small"
 msgstr "提交图形文件太小"
@@ -17374,6 +17667,16 @@ msgstr "编译器信息不可用\n"
 msgid "no libc information available\n"
 msgstr "libc 信息不可用\n"
 
+#: compat/disk.h
+#, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr "不能确定 '%s' 的空余磁盘空间"
+
+#: compat/disk.h
+#, c-format
+msgid "could not get info for '%s'"
+msgstr "无法获得 '%s' 的信息"
+
 #: compat/fsmonitor/fsm-health-win32.c
 #, c-format
 msgid "[GLE %ld] health thread could not open '%ls'"
@@ -17442,6 +17745,16 @@ msgstr "GetOverlappedResult 失败于 '%s' [GLE %ld]"
 msgid "could not read directory changes [GLE %ld]"
 msgstr "无法获取目录变更 [GLE %ld]"
 
+#: compat/fsmonitor/fsm-settings-win32.c
+#, c-format
+msgid "[GLE %ld] unable to open for read '%ls'"
+msgstr "[GLE %ld] 无法打开要读取的 '%ls'"
+
+#: compat/fsmonitor/fsm-settings-win32.c
+#, c-format
+msgid "[GLE %ld] unable to get protocol information for '%ls'"
+msgstr "[GLE %ld] 无法获取 '%ls' 的协议信息 "
+
 #: compat/mingw.c
 #, c-format
 msgid "failed to copy SID (%ld)"
@@ -18115,229 +18428,6 @@ msgstr "写入 rev-list 失败"
 msgid "failed to close rev-list's stdin"
 msgstr "无法关闭 rev-list 的标准输入"
 
-#: contrib/scalar/scalar.c worktree.c
-#, c-format
-msgid "'%s' does not exist"
-msgstr "'%s' 不存在"
-
-#: contrib/scalar/scalar.c
-msgid "need a working directory"
-msgstr "需要一个工作目录"
-
-#: contrib/scalar/scalar.c
-msgid "could not find enlistment root"
-msgstr "无法找到登记根"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "could not switch to '%s'"
-msgstr "无法切换到 '%s'"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "could not configure %s=%s"
-msgstr "无法配置 %s=%s"
-
-#: contrib/scalar/scalar.c
-msgid "could not configure log.excludeDecoration"
-msgstr "无法配置 log.excludeDecoration"
-
-#: contrib/scalar/scalar.c
-msgid "Scalar enlistments require a worktree"
-msgstr "Scalar 登记需要一个工作树"
-
-#: contrib/scalar/scalar.c dir.c
-#, c-format
-msgid "could not open directory '%s'"
-msgstr "不能打开目录 '%s'"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "skipping '%s', which is neither file nor directory"
-msgstr "跳过 '%s'，既不是文件又不是目录"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "could not determine free disk size for '%s'"
-msgstr "不能确定 '%s' 的空余磁盘空间"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "could not get info for '%s'"
-msgstr "不能获得 '%s' 的信息"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "remote HEAD is not a branch: '%.*s'"
-msgstr "远程 HEAD 不是一个分支：'%.*s'"
-
-#: contrib/scalar/scalar.c
-msgid "failed to get default branch name from remote; using local default"
-msgstr "无法从远程获取默认分支名称；使用本地默认值"
-
-#: contrib/scalar/scalar.c
-msgid "failed to get default branch name"
-msgstr "无法获取默认分支名称"
-
-#: contrib/scalar/scalar.c
-msgid "failed to unregister repository"
-msgstr "无法取消注册仓库"
-
-#: contrib/scalar/scalar.c
-msgid "failed to delete enlistment directory"
-msgstr "无法删除登记目录"
-
-#: contrib/scalar/scalar.c
-msgid "branch to checkout after clone"
-msgstr "克隆后要检出的分支"
-
-#: contrib/scalar/scalar.c
-msgid "when cloning, create full working directory"
-msgstr "在克隆时，创建完整的工作目录"
-
-#: contrib/scalar/scalar.c
-msgid "only download metadata for the branch that will be checked out"
-msgstr "只下载要检出的分支的元信息"
-
-#: contrib/scalar/scalar.c
-msgid "scalar clone [<options>] [--] <repo> [<dir>]"
-msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "cannot deduce worktree name from '%s'"
-msgstr "无法从 '%s' 猜测工作区名称"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "directory '%s' exists already"
-msgstr "目录 '%s' 已存在"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "failed to get default branch for '%s'"
-msgstr "无法获取 '%s' 的默认分支"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "could not configure remote in '%s'"
-msgstr "无法在 '%s' 中配置远程"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "could not configure '%s'"
-msgstr "无法配置 '%s'"
-
-#: contrib/scalar/scalar.c
-msgid "partial clone failed; attempting full clone"
-msgstr "部分克隆失败；尝试完整克隆"
-
-#: contrib/scalar/scalar.c
-msgid "could not configure for full clone"
-msgstr "无法配置完整克隆"
-
-#: contrib/scalar/scalar.c
-msgid "scalar diagnose [<enlistment>]"
-msgstr "scalar diagnose [<登记>]"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "could not create directory for '%s'"
-msgstr "不能为 '%s' 创建目录"
-
-#: contrib/scalar/scalar.c
-msgid "could not duplicate stdout"
-msgstr "不能复制标准输出"
-
-#: contrib/scalar/scalar.c
-msgid "failed to write archive"
-msgstr "无法写入归档"
-
-#: contrib/scalar/scalar.c
-msgid "`scalar list` does not take arguments"
-msgstr "`scalar list` 不带参数"
-
-#: contrib/scalar/scalar.c
-msgid "scalar register [<enlistment>]"
-msgstr "scalar register [<登记>]"
-
-#: contrib/scalar/scalar.c
-msgid "reconfigure all registered enlistments"
-msgstr "重新配置所有注册的登记"
-
-#: contrib/scalar/scalar.c
-msgid "scalar reconfigure [--all | <enlistment>]"
-msgstr "scalar reconfigure [--all | <登记>]"
-
-#: contrib/scalar/scalar.c
-msgid "--all or <enlistment>, but not both"
-msgstr "--all 或者 <登记>，而不是两个一起"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "git repository gone in '%s'"
-msgstr "在 '%s' 的 git 仓库已消失"
-
-#: contrib/scalar/scalar.c
-msgid ""
-"scalar run <task> [<enlistment>]\n"
-"Tasks:\n"
-msgstr ""
-"scalar run <任务> [<登记>]\n"
-"任务：\n"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "no such task: '%s'"
-msgstr "没有此任务：'%s'"
-
-#: contrib/scalar/scalar.c
-msgid "scalar unregister [<enlistment>]"
-msgstr "scalar unregister [<登记>]"
-
-#: contrib/scalar/scalar.c
-msgid "scalar delete <enlistment>"
-msgstr "scalar delete <登记>"
-
-#: contrib/scalar/scalar.c
-msgid "refusing to delete current working directory"
-msgstr "拒绝删除当前工作目录"
-
-#: contrib/scalar/scalar.c
-msgid "include Git version"
-msgstr "包括 Git 的版本"
-
-#: contrib/scalar/scalar.c
-msgid "include Git's build options"
-msgstr "包括 Git 的构建选项"
-
-#: contrib/scalar/scalar.c
-msgid "scalar verbose [-v | --verbose] [--build-options]"
-msgstr "scalar verbose [-v | --verbose] [--build-options]"
-
-#: contrib/scalar/scalar.c
-msgid "-C requires a <directory>"
-msgstr "-C 需要 <目录>"
-
-#: contrib/scalar/scalar.c
-#, c-format
-msgid "could not change to '%s'"
-msgstr "无法变更到 '%s'"
-
-#: contrib/scalar/scalar.c
-msgid "-c requires a <key>=<value> argument"
-msgstr "-c 需要 <键>=<值> 参数"
-
-#: contrib/scalar/scalar.c
-msgid ""
-"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
-"\n"
-"Commands:\n"
-msgstr ""
-"scalar [-C <目录>] [-c <键>=<值>] <命令> [<选项>]\n"
-"\n"
-"命令：\n"
-
 #: convert.c
 #, c-format
 msgid "illegal crlf_action %d"
@@ -18578,6 +18668,39 @@ msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多
 msgid "Marked %d islands, done.\n"
 msgstr "已标记 %d 个数据岛，结束。\n"
 
+#: diagnose.c
+#, c-format
+msgid "invalid --%s value '%s'"
+msgstr "无效的 --%s 值 '%s'"
+
+#: diagnose.c
+#, c-format
+msgid "could not archive missing directory '%s'"
+msgstr "无法归档缺失的目录 '%s'"
+
+#: diagnose.c dir.c
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "无法打开目录 '%s'"
+
+#: diagnose.c
+#, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr "跳过 '%s'，既不是文件又不是目录"
+
+#: diagnose.c
+msgid "could not duplicate stdout"
+msgstr "无法复制标准输出"
+
+#: diagnose.c
+#, c-format
+msgid "could not add directory '%s' to archiver"
+msgstr "无法添加目录 '%s' 至归档器"
+
+#: diagnose.c
+msgid "failed to write archive"
+msgstr "无法写入归档"
+
 #: diff-lib.c
 msgid "--merge-base does not work with ranges"
 msgstr "--merge-base 不适用于范围"
@@ -19327,6 +19450,10 @@ msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
 msgid "unable to write to remote"
 msgstr "无法写到远程"
 
+#: fetch-pack.c
+msgid "Server supports filter"
+msgstr "服务器支持 filter"
+
 #: fetch-pack.c
 #, c-format
 msgid "invalid shallow line: %s"
@@ -19468,10 +19595,6 @@ msgstr "服务器不支持算法 '%s'"
 msgid "Server does not support shallow requests"
 msgstr "服务器不支持浅克隆请求"
 
-#: fetch-pack.c
-msgid "Server supports filter"
-msgstr "服务器支持 filter"
-
 #: fetch-pack.c
 msgid "unable to write request to remote"
 msgstr "无法将请求写到远程"
@@ -19886,6 +20009,14 @@ msgstr "低级命令/同步仓库"
 msgid "Low-level Commands / Internal Helpers"
 msgstr "低级命令/内部助手"
 
+#: help.c
+msgid "User-facing repository, command and file interfaces"
+msgstr "面向用户的仓库、命令和文件接口"
+
+#: help.c
+msgid "Developer-facing file formats, protocols and other interfaces"
+msgstr "面向开发者的文件格式、协议和其他接口"
+
 #: help.c
 #, c-format
 msgid "available git commands in '%s'"
@@ -19903,6 +20034,14 @@ msgstr "这些是各种场合常见的 Git 命令："
 msgid "The Git concept guides are:"
 msgstr "Git 概念向导有："
 
+#: help.c
+msgid "User-facing repository, command and file interfaces:"
+msgstr "面向用户的仓库、命令和文件接口："
+
+#: help.c
+msgid "File formats, protocols and other developer interfaces:"
+msgstr "文件格式、协议和其他开发者接口列表："
+
 #: help.c
 msgid "External commands"
 msgstr "外部命令"
@@ -19999,11 +20138,6 @@ msgstr ""
 "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
 "配置 `git config advice.ignoredHook false` 来关闭这条警告。"
 
-#: hook.c
-#, c-format
-msgid "Couldn't start hook '%s'\n"
-msgstr "不能启动钩子 '%s'\n"
-
 #: http-fetch.c
 #, c-format
 msgid "argument to --packfile must be a valid hash (got '%s')"
@@ -20221,20 +20355,16 @@ msgstr "在 ls-refs 参数后应该有一个 flush 包"
 msgid "quoted CRLF detected"
 msgstr "检测到被引用的 CRLF"
 
-#: merge-ort-wrappers.c merge-recursive.c
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"您对下列文件的本地修改将被合并操作覆盖：\n"
-"  %s"
-
 #: merge-ort.c merge-recursive.c
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "无法合并子模组 %s （没有检出）"
 
+#: merge-ort.c
+#, c-format
+msgid "Failed to merge submodule %s (no merge base)"
+msgstr "无法合并子模组 %s （没有合并基线）"
+
 #: merge-ort.c merge-recursive.c
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
@@ -20258,27 +20388,8 @@ msgstr "无法合并子模组 %s"
 #: merge-ort.c
 #, c-format
 msgid ""
-"Failed to merge submodule %s, but a possible merge resolution exists:\n"
-"%s\n"
-msgstr ""
-"无法合并子模组 %s，但是存在一个可能的合并方案：\n"
-"%s\n"
-
-#: merge-ort.c merge-recursive.c
-#, c-format
-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"
+"Failed to merge submodule %s, but a possible merge resolution exists: %s"
+msgstr "无法合并子模组 %s，但是存在一个可能的合并方案：%s"
 
 #: merge-ort.c
 #, c-format
@@ -20455,12 +20566,45 @@ msgstr ""
 "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"
 "在树中被保留。"
 
+#. TRANSLATORS: This is a line of advice to resolve a merge
+#. conflict in a submodule. The first argument is the submodule
+#. name, and the second argument is the abbreviated id of the
+#. commit that needs to be merged.  For example:
+#.  - go to submodule (mysubmodule), and either merge commit abc1234"
+#.
+#: merge-ort.c
+#, c-format
+msgid ""
+" - go to submodule (%s), and either merge commit %s\n"
+"   or update to an existing commit which has merged those changes\n"
+msgstr ""
+" - 进入子模组（%s），要么合并提交 %s\n"
+"   要么更新至已合并这些变更的提交\n"
+
 #: merge-ort.c
 #, c-format
 msgid ""
-"Note: %s not up to date and in way of checking out conflicted version; old "
-"copy renamed to %s"
-msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副本重命名为 %s"
+"Recursive merging with submodules currently only supports trivial cases.\n"
+"Please manually handle the merging of each conflicted submodule.\n"
+"This can be accomplished with the following steps:\n"
+"%s - come back to superproject and run:\n"
+"\n"
+"      git add %s\n"
+"\n"
+"   to record the above merge or update\n"
+" - resolve any other conflicts in the superproject\n"
+" - commit the resulting index in the superproject\n"
+msgstr ""
+"子模组内的递归合并现在只支持简单的情况。\n"
+"请手动合并每个有冲突的子模组。\n"
+"这可以通过下列步骤完成：\n"
+"%s - 回到上级项目并运行：\n"
+"\n"
+"      git add %s\n"
+"\n"
+"   来记录上述的合并或更新\n"
+" - 解决上级项目中的其他冲突\n"
+" - 提交上级项目中的结果索引\n"
 
 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
 #. base, and 2-3) the trees for the two trees we're merging.
@@ -20547,6 +20691,22 @@ msgstr "无法合并子模组 %s（非快进）"
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "找到子模组的一个可能的合并方案：\n"
 
+#: merge-recursive.c
+#, c-format
+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"
+
 #: merge-recursive.c
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
@@ -21182,6 +21342,26 @@ msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
 msgid "confused by unstable object source data for %s"
 msgstr "被 %s 的不稳定对象源数据搞糊涂了"
 
+#: object-file.c
+#, c-format
+msgid "write stream object %ld != %<PRIuMAX>"
+msgstr "写入流对象 %ld != %<PRIuMAX>"
+
+#: object-file.c
+#, c-format
+msgid "unable to stream deflate new object (%d)"
+msgstr "不能流式压缩新对象（%d）"
+
+#: object-file.c
+#, c-format
+msgid "deflateEnd on stream object failed (%d)"
+msgstr "在流对象上调用 deflateEnd 失败（%d）"
+
+#: object-file.c
+#, c-format
+msgid "unable to create directory %s"
+msgstr "无法创建目录 %s"
+
 #: object-file.c
 #, c-format
 msgid "cannot read object for %s"
@@ -21412,59 +21592,184 @@ msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）"
 msgid "relative path syntax can't be used outside working tree"
 msgstr "不能在工作区之外使用相对路径语法"
 
-#: object-name.c
-#, c-format
-msgid "<object>:<path> required, only <object> '%s' given"
-msgstr "需要 <对象>:<路径>，只给出了 <对象> '%s'"
+#: object-name.c
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "需要 <对象>:<路径>，只给出了 <对象> '%s'"
+
+#: object-name.c
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "无效的对象名 '%.*s'。"
+
+#: object.c
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "无效的对象类型 \"%s\""
+
+#: object.c
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "对象 %s 是一个 %s，不是一个 %s"
+
+#: object.c
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "对象 %s 有未知的类型 id %d"
+
+#: object.c
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "不能解析对象：%s"
+
+#: object.c
+#, c-format
+msgid "hash mismatch %s"
+msgstr "哈希值与 %s 不匹配"
+
+#: pack-bitmap-write.c
+msgid "trying to write commit not in index"
+msgstr "尝试写入未在索引中的提交"
+
+#: pack-bitmap.c
+msgid "failed to load bitmap index (corrupted?)"
+msgstr "无法载入位图索引（已损坏？）"
+
+#: pack-bitmap.c
+msgid "corrupted bitmap index (too small)"
+msgstr "损坏的位图索引（太小）"
+
+#: pack-bitmap.c
+msgid "corrupted bitmap index file (wrong header)"
+msgstr "损坏的位图索引（错误的文件头）"
+
+#: pack-bitmap.c
+#, c-format
+msgid "unsupported version '%d' for bitmap index file"
+msgstr "不支持的位图索引文件版本 '%d'"
+
+#: pack-bitmap.c
+msgid "corrupted bitmap index file (too short to fit hash cache)"
+msgstr "损坏的位图索引（太小，容不下哈希缓存）"
+
+#: pack-bitmap.c
+msgid "corrupted bitmap index file (too short to fit lookup table)"
+msgstr "损坏的位图索引（太小，容不下查询表）"
+
+#: pack-bitmap.c
+#, c-format
+msgid "duplicate entry in bitmap index: '%s'"
+msgstr "位图索引中的重复条目：'%s'"
+
+#: pack-bitmap.c
+#, c-format
+msgid "corrupt ewah bitmap: truncated header for entry %d"
+msgstr "损坏的 EWAH 位图：条目 %d 截断的文件头"
+
+#: pack-bitmap.c
+#, c-format
+msgid "corrupt ewah bitmap: commit index %u out of range"
+msgstr "损坏的 EWAH 位图：提交索引 %u 超出范围"
+
+#: pack-bitmap.c
+msgid "corrupted bitmap pack index"
+msgstr "损坏的位图包索引"
+
+#: pack-bitmap.c
+msgid "invalid XOR offset in bitmap pack index"
+msgstr "位图包索引中 XOR 偏移值无效"
+
+#: pack-bitmap.c
+msgid "cannot fstat bitmap file"
+msgstr "不能对位图文件调用 fstat"
+
+#: pack-bitmap.c
+#, c-format
+msgid "ignoring extra bitmap file: '%s'"
+msgstr "忽略额外的位图文件：'%s'"
+
+#: pack-bitmap.c
+msgid "checksum doesn't match in MIDX and bitmap"
+msgstr "MIDX 和位图中的校验码不匹配"
+
+#: pack-bitmap.c
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "多包位图缺少必需的反向索引"
+
+#: pack-bitmap.c
+#, c-format
+msgid "could not open pack %s"
+msgstr "不能打开包 %s"
+
+#: pack-bitmap.c
+#, c-format
+msgid "preferred pack (%s) is invalid"
+msgstr "首选包 (%s) 无效"
+
+#: pack-bitmap.c
+msgid "corrupt bitmap lookup table: triplet position out of index"
+msgstr "损坏的位图查询表：三元组位置超出索引"
+
+#: pack-bitmap.c
+msgid "corrupt bitmap lookup table: xor chain exceed entry count"
+msgstr "损坏的位图查询表：xor 链超出条目数"
 
-#: object-name.c
+#: pack-bitmap.c
 #, c-format
-msgid "invalid object name '%.*s'."
-msgstr "无效的对象名 '%.*s'。"
+msgid "corrupt bitmap lookup table: commit index %u out of range"
+msgstr "损坏的位图查询表：提交索引 %u 超出范围"
 
-#: object.c
+#: pack-bitmap.c
 #, c-format
-msgid "invalid object type \"%s\""
-msgstr "无效的对象类型 \"%s\""
+msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\""
+msgstr "损坏的 EWAH 位图：提交 \"%s\" 位图的文件头被截断"
 
-#: object.c
+#: pack-bitmap.c
 #, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "对象 %s 是一个 %s，不是一个 %s"
+msgid "object '%s' not found in type bitmaps"
+msgstr "对象 %s 为在类型位图中找到"
 
-#: object.c
+#: pack-bitmap.c
 #, c-format
-msgid "object %s has unknown type id %d"
-msgstr "对象 %s 有未知的类型 id %d"
+msgid "object '%s' does not have a unique type"
+msgstr "对象 '%s' 没有唯一的类型"
 
-#: object.c
+#: pack-bitmap.c
 #, c-format
-msgid "unable to parse object: %s"
-msgstr "不能解析对象：%s"
+msgid "object '%s': real type '%s', expected: '%s'"
+msgstr "对象 '%s'：实际类型 '%s'，预期：'%s'"
 
-#: object.c
+#: pack-bitmap.c
 #, c-format
-msgid "hash mismatch %s"
-msgstr "哈希值与 %s 不匹配"
+msgid "object not in bitmap: '%s'"
+msgstr "对象不在位图中：%s"
 
 #: pack-bitmap.c
-msgid "multi-pack bitmap is missing required reverse index"
-msgstr "多包位图缺少必需的反向索引"
+msgid "failed to load bitmap indexes"
+msgstr "无法载入位图索引"
+
+#: pack-bitmap.c
+msgid "you must specify exactly one commit to test"
+msgstr "您必须准确指定一个提交来测试"
 
 #: pack-bitmap.c
 #, c-format
-msgid "could not open pack %s"
-msgstr "不能打开包 %s"
+msgid "commit '%s' doesn't have an indexed bitmap"
+msgstr "提交 '%s' 没有索引位图"
+
+#: pack-bitmap.c
+msgid "mismatch in bitmap results"
+msgstr "位图结果不一致"
 
 #: pack-bitmap.c
 #, c-format
-msgid "preferred pack (%s) is invalid"
-msgstr "首选包 (%s) 无效"
+msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>"
+msgstr "无法在包 '%2$s' 偏移 %3$<PRIuMAX> 中找到 '%1$s'"
 
 #: pack-bitmap.c
 #, c-format
-msgid "could not find %s in pack %s at offset %<PRIuMAX>"
-msgstr "在包 %2$s 偏移 %3$<PRIuMAX> 中无法找到 %1$s"
+msgid "unable to get disk usage of '%s'"
+msgstr "无法得到 '%s' 的磁盘使用量"
 
 #: pack-mtimes.c
 #, c-format
@@ -21619,6 +21924,10 @@ msgstr "您的意思是 `--%s`（有两个短线）？"
 msgid "alias of --%s"
 msgstr "--%s 的别名"
 
+#: parse-options.c
+msgid "need a subcommand"
+msgstr "需要一个子命令"
+
 #: parse-options.c
 #, c-format
 msgid "unknown option `%s'"
@@ -22147,9 +22456,12 @@ msgid ""
 "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"
+"        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"
+"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n"
+"                      to this position in the new commits. The <ref> is\n"
+"                      updated at the end of the rebase\n"
 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
@@ -22157,7 +22469,7 @@ msgstr ""
 "命令:\n"
 "p, pick <提交> = 使用提交\n"
 "r, reword <提交> = 使用提交，但编辑提交说明\n"
-"e, edit <提交> = 使用提交，但停止以便在 shell 中修补提交\n"
+"e, edit <提交> = 使用提交，但停止以便修补提交\n"
 "s, squash <提交> = 使用提交，但挤压到前一个提交\n"
 "f, fixup [-C | -c] <提交> = 类似于 \"squash\"，但只保留前一个提交\n"
 "                   的提交说明，除非使用了 -C 参数，此情况下则只\n"
@@ -22172,6 +22484,9 @@ msgstr ""
 ".       创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"
 ".       原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"
 ".       -c <提交> 可以编辑提交说明。\n"
+"u, update-ref <引用> = 为引用 <ref> 设置一个占位符，以将该引用更新为此处的新"
+"提交。\n"
+"                      此 <引用> 在变基结束后更新。\n"
 "\n"
 "可以对这些行重新排序，将从上至下执行。\n"
 
@@ -22737,6 +23052,15 @@ msgstr "协议错误：期望 sha/ref，却得到 '%s'"
 msgid "http transport does not support %s"
 msgstr "http 传输协议不支持 %s"
 
+#: remote-curl.c
+msgid "protocol error: expected '<url> <path>', missing space"
+msgstr "协议错误：预期 '<url> <path>'，缺少空格"
+
+#: remote-curl.c
+#, c-format
+msgid "failed to download file at URL '%s'"
+msgstr "无法下载位于 URL '%s' 的文件"
+
 #: remote-curl.c
 msgid "git-http-push failed"
 msgstr "git-http-push 失败"
@@ -23142,6 +23466,16 @@ msgstr "不能确定 HEAD 版本"
 msgid "failed to find tree of %s"
 msgstr "无法找到 %s 指向的树"
 
+#: revision.c
+#, c-format
+msgid "resolve-undo records `%s` which is missing"
+msgstr "resolve-undo 记录 `%s`，现缺失"
+
+#: revision.c
+#, c-format
+msgid "could not get commit for ancestry-path argument %s"
+msgstr "无法获得 ancestry-path 参数 %s 的提交"
+
 #: revision.c
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "不再支持 --unpacked=<packfile>"
@@ -23168,6 +23502,220 @@ msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
 msgid "cannot create async thread: %s"
 msgstr "不能创建 async 线程：%s"
 
+#: scalar.c worktree.c
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' 不存在"
+
+#: scalar.c
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "无法切换到 '%s'"
+
+#: scalar.c
+msgid "need a working directory"
+msgstr "需要一个工作目录"
+
+#: scalar.c
+msgid "Scalar enlistments require a worktree"
+msgstr "Scalar 登记需要一个工作树"
+
+#: scalar.c
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "无法配置 %s=%s"
+
+#: scalar.c
+msgid "could not configure log.excludeDecoration"
+msgstr "无法配置 log.excludeDecoration"
+
+#: scalar.c
+msgid "could not add enlistment"
+msgstr "无法添加登记"
+
+#: scalar.c
+msgid "could not set recommended config"
+msgstr "无法设置推荐的配置"
+
+#: scalar.c
+msgid "could not turn on maintenance"
+msgstr "无法打开维护模式"
+
+#: scalar.c
+msgid "could not start the FSMonitor daemon"
+msgstr "无法启动 FSMonitor 守护进程"
+
+#: scalar.c
+msgid "could not turn off maintenance"
+msgstr "无法关闭维护模式"
+
+#: scalar.c
+msgid "could not remove enlistment"
+msgstr "无法删除登记"
+
+#: scalar.c
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "远程 HEAD 不是一个分支：'%.*s'"
+
+#: scalar.c
+msgid "failed to get default branch name from remote; using local default"
+msgstr "无法从远程获取默认分支名称；使用本地默认值"
+
+#: scalar.c
+msgid "failed to get default branch name"
+msgstr "无法获取默认分支名称"
+
+#: scalar.c
+msgid "failed to unregister repository"
+msgstr "无法取消注册仓库"
+
+#: scalar.c
+msgid "failed to stop the FSMonitor daemon"
+msgstr "无法停止 FSMonitor 守护进程"
+
+#: scalar.c
+msgid "failed to delete enlistment directory"
+msgstr "无法删除登记目录"
+
+#: scalar.c
+msgid "branch to checkout after clone"
+msgstr "克隆后要检出的分支"
+
+#: scalar.c
+msgid "when cloning, create full working directory"
+msgstr "在克隆时，创建完整的工作目录"
+
+#: scalar.c
+msgid "only download metadata for the branch that will be checked out"
+msgstr "只下载要检出的分支的元信息"
+
+#: scalar.c
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]"
+
+#: scalar.c
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "无法从 '%s' 猜测工作区名称"
+
+#: scalar.c
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "目录 '%s' 已存在"
+
+#: scalar.c
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "无法获取 '%s' 的默认分支"
+
+#: scalar.c
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "无法在 '%s' 中配置远程"
+
+#: scalar.c
+#, c-format
+msgid "could not configure '%s'"
+msgstr "无法配置 '%s'"
+
+#: scalar.c
+msgid "partial clone failed; attempting full clone"
+msgstr "部分克隆失败；尝试完整克隆"
+
+#: scalar.c
+msgid "could not configure for full clone"
+msgstr "无法配置完整克隆"
+
+#: scalar.c
+msgid "scalar diagnose [<enlistment>]"
+msgstr "scalar diagnose [<登记>]"
+
+#: scalar.c
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` 不带参数"
+
+#: scalar.c
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<登记>]"
+
+#: scalar.c
+msgid "reconfigure all registered enlistments"
+msgstr "重新配置所有注册的登记"
+
+#: scalar.c
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <登记>]"
+
+#: scalar.c
+msgid "--all or <enlistment>, but not both"
+msgstr "--all 或者 <登记>，而不是两个一起"
+
+#: scalar.c
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "在 '%s' 的 git 仓库已消失"
+
+#: scalar.c
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <任务> [<登记>]\n"
+"任务：\n"
+
+#: scalar.c
+#, c-format
+msgid "no such task: '%s'"
+msgstr "没有此任务：'%s'"
+
+#: scalar.c
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<登记>]"
+
+#: scalar.c
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <登记>"
+
+#: scalar.c
+msgid "refusing to delete current working directory"
+msgstr "拒绝删除当前工作目录"
+
+#: scalar.c
+msgid "include Git version"
+msgstr "包括 Git 的版本"
+
+#: scalar.c
+msgid "include Git's build options"
+msgstr "包括 Git 的构建选项"
+
+#: scalar.c
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: scalar.c
+msgid "-C requires a <directory>"
+msgstr "-C 需要 <目录>"
+
+#: scalar.c
+#, c-format
+msgid "could not change to '%s'"
+msgstr "无法变更到 '%s'"
+
+#: scalar.c
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c 需要 <键>=<值> 参数"
+
+#: scalar.c
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <目录>] [-c <键>=<值>] <命令> [<选项>]\n"
+"\n"
+"命令：\n"
+
 #: send-pack.c
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "读取远程解包状态时收到意外的 flush 包"
@@ -23308,11 +23856,6 @@ msgstr "您的本地修改将被%s覆盖。"
 msgid "commit your changes or stash them to proceed."
 msgstr "提交您的修改或贮藏后再继续。"
 
-#: sequencer.c
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s：快进"
-
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
 #.
@@ -23899,6 +24442,30 @@ msgstr "甚至不能尝试合并 '%.*s'"
 msgid "merge: Unable to write new index file"
 msgstr "合并：无法写入新索引文件"
 
+#: sequencer.c
+#, c-format
+msgid ""
+"another 'rebase' process appears to be running; '%s.lock' already exists"
+msgstr "另一个 'rebase' 进程似乎在运行；'%s.lock' 已存在"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"Updated the following refs with %s:\n"
+"%s"
+msgstr ""
+"已用 %s 更新下列引用：\n"
+"%s"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"Failed to update the following refs with %s:\n"
+"%s"
+msgstr ""
+"无法用 %s 更新下列引用：\n"
+"%s"
+
 #: sequencer.c
 msgid "Cannot autostash"
 msgstr "无法自动贮藏"
@@ -24101,6 +24668,11 @@ msgstr "无法跳过不必要的拣选"
 msgid "the script was already rearranged."
 msgstr "脚本已经重新编排。"
 
+#: sequencer.c
+#, c-format
+msgid "update-refs file at '%s' is invalid"
+msgstr "位于 '%s' 的 update-refs 文件无效"
+
 #: setup.c
 #, c-format
 msgid "'%s' is outside repository at '%s'"
@@ -24243,16 +24815,21 @@ msgstr ""
 #: setup.c
 #, c-format
 msgid ""
-"unsafe repository ('%s' is owned by someone else)\n"
-"To add an exception for this directory, call:\n"
+"detected dubious ownership in repository at '%s'\n"
+"%sTo add an exception for this directory, call:\n"
 "\n"
 "\tgit config --global --add safe.directory %s"
 msgstr ""
-"仓库不安全（'%s' 的所有者是其他人）\n"
-"要为本仓库创建特例，请使用：\n"
+"在 '%s' 检测到可疑的仓库所有权\n"
+"%s要为本仓库创建特例，请运行：\n"
 "\n"
 "\tgit config --global --add safe.directory %s"
 
+#: setup.c
+#, c-format
+msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')"
+msgstr "无法使用纯仓库 '%s' （safe.bareRepository 为 '%s'）"
+
 #: setup.c
 #, c-format
 msgid ""
@@ -25278,6 +25855,22 @@ msgstr "无效的端口号"
 msgid "invalid '..' path segment"
 msgstr "无效的 '..' 路径片段"
 
+#: usage.c
+msgid "usage: "
+msgstr "用法："
+
+#: usage.c
+msgid "fatal: "
+msgstr "致命错误："
+
+#: usage.c
+msgid "error: "
+msgstr "错误："
+
+#: usage.c
+msgid "warning: "
+msgstr "警告："
+
 #: walker.c
 msgid "Fetching objects"
 msgstr "正在获取对象"
@@ -25970,7 +26563,7 @@ msgstr "另外，您的索引中包含未提交的变更。"
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "不能%s：您的索引中包含未提交的变更。"
 
-#: git-merge-octopus.sh
+#: git-merge-octopus.sh git-merge-resolve.sh
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
 "merge"
@@ -26258,26 +26851,6 @@ msgstr "选中的块不能应用到索引！\n"
 msgid "ignoring unmerged: %s\n"
 msgstr "忽略未合入的：%s\n"
 
-#: git-add--interactive.perl
-#, perl-format
-msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
-msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl
-#, perl-format
-msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
-msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl
-#, perl-format
-msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
-msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl
-#, perl-format
-msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
-msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
-
 #: git-add--interactive.perl
 msgid "No other hunks to goto\n"
 msgstr "没有其它可供跳转的块\n"
-- 
2.39.2