From 5a2b9753ab89f70c76deb7fc098be4d4de8f331d Mon Sep 17 00:00:00 2001 From: Teng Long Date: Fri, 16 Feb 2024 14:33:24 +0800 Subject: [PATCH] l10n: zh_CN: for git 2.44 rnd2 Signed-off-by: Teng Long --- po/zh_CN.po | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index ff8c9f2d1fe248..c57d754b86bbd3 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -152,8 +152,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2024-02-12 20:22+0800\n" -"PO-Revision-Date: 2024-02-13 23:32+0800\n" +"POT-Creation-Date: 2024-02-16 14:27+0800\n" +"PO-Revision-Date: 2024-02-17 11:25+0800\n" "Last-Translator: Teng Long \n" "Language-Team: GitHub \n" "Language: zh_CN\n" @@ -1927,6 +1927,12 @@ msgstr "错误的 --attr-source 或 GIT_ATTR_SOURCE" msgid "unable to stat '%s'" msgstr "无法对 %s 执行 stat" +#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c +#: builtin/pack-objects.c combine-diff.c rerere.c +#, c-format +msgid "unable to read %s" +msgstr "不能读 %s" + #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" @@ -5519,8 +5525,10 @@ msgid "" " " msgstr "" "git commit-graph write [--object-dir <目录>] [--append]\n" -" [--split[=<策略>]] [--reachable | --stdin-packs | --stdin-commits] \n" -" [--changed-paths] [--[no-]max-new-filters ] [--[no-]progress]\n" +" [--split[=<策略>]] [--reachable | --stdin-packs | --" +"stdin-commits] \n" +" [--changed-paths] [--[no-]max-new-filters ] [--" +"[no-]progress]\n" " <切分选项>" #: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c @@ -8391,6 +8399,11 @@ msgstr "没有线程支持，忽略 %s" msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" +#: builtin/grep.c +#, c-format +msgid "unable to read tree %s" +msgstr "无法读取树 %s" + #: builtin/grep.c #, c-format msgid "unable to grep from object of type %s" @@ -8914,11 +8927,6 @@ msgstr "解压缩严重的不一致" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c builtin/pack-objects.c -#, c-format -msgid "unable to read %s" -msgstr "不能读 %s" - #: builtin/index-pack.c #, c-format msgid "cannot read existing object info %s" @@ -10322,7 +10330,7 @@ msgstr "'%s' 没有指向一个提交" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c builtin/stash.c merge-recursive.c +#: builtin/merge.c merge-recursive.c msgid "Unable to write index." msgstr "不能写入索引。" @@ -11646,7 +11654,9 @@ msgstr "枚举对象中" msgid "" "Total % (delta %), reused % (delta %), pack-" "reused % (from %)" -msgstr "总共 %（差异 %），复用 %（差异 %），包复用 %（来自 % 个包）" +msgstr "" +"总共 %（差异 %），复用 %（差异 %），包复用 " +"%（来自 % 个包）" #: builtin/pack-redundant.c msgid "" @@ -13247,8 +13257,8 @@ msgid "" msgid_plural "" "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" "to delete them, use:" -msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用：" -msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用：" +msgstr[0] "注意：refs/remotes/ 层级之外的一个分支未被移除。要删除它，使用：" +msgstr[1] "注意：refs/remotes/ 层级之外的一些分支未被移除。要删除它们，使用：" #: builtin/remote.c #, c-format @@ -14020,7 +14030,9 @@ msgstr "不能隐式地确定 --onto 正确的基线" msgid "" "(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " ") ..." -msgstr "（还处于试验中的特性！）git replay ([--contained] --onto <新基线> | --advance <分支>) <版本范围>..." +msgstr "" +"（还处于试验中的特性！）git replay ([--contained] --onto <新基线> | --" +"advance <分支>) <版本范围>..." #: builtin/replay.c msgid "make replay advance given branch" @@ -19545,8 +19557,8 @@ msgid "output only the last line of --stat" msgstr "只输出 --stat 的最后一行" #: diff.c -msgid "..." -msgstr "<参数1,参数2>..." +msgid ",..." +msgstr "<参数1>,<参数2>..." #: diff.c msgid "" @@ -19558,8 +19570,8 @@ msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同义" #: diff.c -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "是 --dirstat=files,param1,param2... 的同义词" +msgid "synonym for --dirstat=files,,..." +msgstr "是 --dirstat=files,<参数1>,<参数2>... 的同义词" #: diff.c msgid "warn if changes introduce conflict markers or whitespace errors"