l10n: zh_CN: 2.43-rc1

[dyrone]

Thanks for taking the time to contribute to Git! Please be advised that the
Git community does not use github.com for their contributions. Instead, we use
a mailing list ([email protected]) for code submissions, code reviews, and
bug reports. Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
to conveniently send your Pull Requests commits to our mailing list.

Please read the "guidelines for contributing" linked above!

[jiangxin]

发现一个以前带入的有问题的翻译，我顺手改掉

 msgid "pack prefix %s does not begin with objdir %s"
 msgstr "包前缀 %s 没有以对象目录 .%s 开始"

[jiangxin]

做了如下修改：

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 75b77453cc..86402725b2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2115,7 +2115,7 @@ msgstr "'%s' 被 applypatch-msg 钩子删除"
 #: builtin/checkout.c
 #, c-format
 msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree"
-msgstr "'%s'，'%s' 或 '%s' 不能在检出一个树时使用"
+msgstr "'%s'、'%s' 或 '%s' 不能在检出一个树时使用"
 
 #: builtin/help.c
 #, c-format
@@ -6229,7 +6229,7 @@ msgid ""
 "No local or remote refs exist despite at least one remote\n"
 "present, stopping; use 'add -f' to override or fetch a remote first"
 msgstr ""
-"尽管已配置远程仓库，但不存在任何本地的或远程的引用，操作终止；\n"
+"尽管已配置远程仓库，但不存在任何本地的或远程的引用，操作终止。\n"
 "请先使用 'add -f' 来覆盖或拉取一个远程仓库"
 
 #: compat/regex/regcomp.c
@@ -10450,7 +10450,7 @@ msgstr "'%2$s' 的错误的布尔取值 '%1$s'"
 #: parse.c
 #, c-format
 msgid "bad boolean environment value '%s' for '%s'"
-msgstr "'%2$s' 的错误的布尔环境取值 '%1$s'"
+msgstr "对于 '%2$s' 的错误的布尔环境取值 '%1$s'"
 
 #: config.c
 #, c-format
@@ -12095,7 +12095,7 @@ msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
 #: commit-graph.c
 #, c-format
 msgid "commit-graph has both zero and non-zero generations (e.g., commits '%s' and '%s')"
-msgstr "提交图形具有零和非零的世代（例如，提交 '%s' 和 '%s'）"
+msgstr "提交图形具有零和非零的世代（例如：提交 '%s' 和 '%s'）"
 
 #: commit-graph.c
 #, c-format
@@ -13576,7 +13576,7 @@ msgstr "为新的分支创建引用日志"
 
 #: scalar.c
 msgid "create repository within 'src' directory"
-msgstr "在 'src' 目录中创建存储库"
+msgstr "在 'src' 目录中创建仓库"
 
 #: builtin/branch.c builtin/submodule--helper.c
 msgid "create the branch's reflog"
@@ -20289,7 +20289,7 @@ 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'，虽然它已经合并到 HEAD，\n"
 "         然而却尚未被合并到分支 '%s'"
 
 #: builtin/merge-recursive.c
@@ -20792,7 +20792,7 @@ msgstr "选项 '%s' 和提交号不能同时使用"
 #: builtin/repack.c
 #, c-format
 msgid "option '%s' can only be used along with '%s'"
-msgstr "'%s' 只能和 '%s' 搭配使用"
+msgstr "选项 '%s' 只能和 '%s' 搭配使用"
 
 #: setup.c
 #, c-format
@@ -20891,7 +20891,7 @@ msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用"
 #: builtin/worktree.c
 #, c-format
 msgid "options '%s', and '%s' cannot be used together"
-msgstr "选项 '%s'，与 '%s' 不能同时使用"
+msgstr "选项 '%s' 与 '%s' 不能同时使用"
 
 #: builtin/checkout.c
 #, c-format
@@ -21043,7 +21043,7 @@ msgstr "打包松散的不可达对象"
 #: builtin/repack.c
 #, c-format
 msgid "pack prefix %s does not begin with objdir %s"
-msgstr "包前缀 %s 没有以对象目录 .%s 开始"
+msgstr "包前缀 %s 没有以对象目录 %s 开始"
 
 #: builtin/repack.c
 msgid "pack prefix to store a pack containing filtered out objects"
@@ -22707,12 +22707,12 @@ msgstr "仓库 '%s' 未找到"
 #: scalar.c
 #, c-format
 msgid "repository at '%s' has a format issue"
-msgstr "位于 '%s' 处的存储库存在格式问题"
+msgstr "位于 '%s' 处的仓库存在格式问题"
 
 #: scalar.c
 #, c-format
 msgid "repository at '%s' has different owner"
-msgstr "位于 '%s' 处的存储库有不同的所有者"
+msgstr "位于 '%s' 处的仓库有不同的所有者"
 
 #: builtin/commit.c
 msgid ""
@@ -22730,7 +22730,7 @@ msgstr "仓库缺乏执行三方合并所必需的数据对象。"
 #: scalar.c
 #, c-format
 msgid "repository not found in '%s'"
-msgstr "在 '%s' 中找不到存储库"
+msgstr "在 '%s' 中找不到仓库"
 
 #: connect.c
 msgid "repository on the other end cannot be shallow"
@@ -24501,7 +24501,7 @@ msgid ""
 "If you are sure you want to delete it, run 'git branch -D %s'"
 msgstr ""
 "分支 '%s' 没有完全合并。\n"
-"如果您确认要删除它，执行 'git branch -D %s'。"
+"如果您确认要删除它，执行 'git branch -D %s'"
 
 #: builtin/commit.c
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
@@ -27277,60 +27277,3 @@ msgstr "您的本地修改将被%s覆盖。"
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'"
-
-#, c-format
-#~ msgid "%s : incompatible with something else"
-#~ msgstr "%s：和其它的不兼容"
-
-#~ msgid "--merge-base only works with commits"
-#~ msgstr "--merge-base 仅适用于提交"
-
-#~ msgid "--strategy requires --merge or --interactive"
-#~ msgstr "--strategy 需要 --merge 或 --interactive"
-
-#, c-format
-#~ msgid "Cannot delete branch '%s' checked out at '%s'"
-#~ msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
-
-#, c-format
-#~ msgid "Could not stat '%s'"
-#~ msgstr "不能对 '%s' 调用 stat"
-
-#~ msgid "Could not write patch"
-#~ msgstr "不能生成补丁"
-
-#~ msgid "cannot move directory over file"
-#~ msgstr "不能将目录移动到文件"
-
-#~ msgid "cannot use --filter without --stdout"
-#~ msgstr "不能在没有 --stdout 的情况下使用 --filter"
-
-#~ msgid "cannot use --max-pack-size with --cruft"
-#~ msgstr "不能将 --max-pack-size 和 --cruft 同时使用"
-
-#, c-format
-#~ msgid "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-#~ msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
-
-#, c-format
-#~ msgid "could not rename '%s' to '%s'"
-#~ msgstr "不能将 '%s' 重命名为 '%s'"
-
-#~ msgid "do not apply config rules"
-#~ msgstr "不要应用配置规则"
-
-#~ msgid "join whitespace-continued values"
-#~ msgstr "连接空白折行的值"
-
-#, c-format
-#~ msgid "options '%s=%s' and '%s=%s' cannot be used together"
-#~ msgstr "选项 '%s=%s' 和 '%s=%s' 不能同时使用"
-
-#~ msgid "scalar clone [<options>] [--] <repo> [<dir>]"
-#~ msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]"
-
-#~ msgid "set parsing options"
-#~ msgstr "设置解析选项"
-
-#~ msgid "unable to write new_index file"
-#~ msgstr "无法写 new_index 文件"