diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 1310 |
1 files changed, 831 insertions, 479 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 86402725b2..4838c19b0b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -46,6 +46,7 @@ # commit | 提交 # commit message | 提交说明 # commit object | 提交对象 +# commit-graph | 提交图 # commit-ish (also committish) | 提交号 # cone | 锥形（稀疏检出模型）；锥（稀疏检出） # conflict | 冲突 @@ -99,8 +100,10 @@ # plumbing | 管件（Git 底层核心命令的别称） # porcelain | 瓷件（Git 上层封装命令的别称） # precious-objects repo | 珍品仓库 +# preferred pack | 首选包（多包索引中引入的首选包概念） # promisor | 承诺者 # prune | 清除 +# pseudorefs | 伪引用 # pull | 拉，拉取 # push | 推，推送 # reachable | 可达 @@ -151,8 +154,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2023-11-10 10:49+0800\n" -"PO-Revision-Date: 2023-11-10 17:13+0800\n" +"POT-Creation-Date: 2024-04-28 19:59+0800\n" +"PO-Revision-Date: 2024-04-28 20:31+0800\n" "Last-Translator: Teng Long <dyroneteng@gmail.com>\n" "Language-Team: GitHub <https://github.com/dyrone/git/>\n" "Language: zh_CN\n" @@ -724,12 +727,12 @@ msgid "" "---\n" "To remove '%c' lines, make them ' ' lines (context).\n" "To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" +"Lines starting with %s will be removed.\n" msgstr "" "---\n" "要删除 '%c' 开始的行，使其成为 ' ' 开始的行（上下文）。\n" "要删除 '%c' 开始的行，删除它们。\n" -"以 %c 开始的行将被删除。\n" +"以 %s 开始的行将被删除。\n" #: add-patch.c msgid "" @@ -781,6 +784,7 @@ msgid "" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" +"p - print the current hunk\n" "? - print help\n" msgstr "" "j - 维持该块未决状态，查看下一个未决块\n" @@ -791,6 +795,7 @@ msgstr "" "/ - 查找和给定正则表达式匹配的块\n" "s - 拆分当前块为更小的块\n" "e - 手动编辑当前块\n" +"p - 显示当前块\n" "? - 显示帮助\n" #: add-patch.c @@ -870,8 +875,8 @@ msgstr "" #: advice.c #, c-format -msgid "%shint: %.*s%s\n" -msgstr "%s提示：%.*s%s\n" +msgid "%shint:%s%.*s%s\n" +msgstr "%s提示：%s%.*s%s\n" #: advice.c msgid "Cherry-picking is not possible because you have unmerged files." @@ -1031,7 +1036,7 @@ msgid "unclosed quote" msgstr "未关闭的引号" #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c +#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "太多参数" @@ -1046,12 +1051,13 @@ msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" #: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c -#: builtin/checkout.c builtin/clone.c builtin/commit.c builtin/describe.c -#: builtin/diff-tree.c builtin/difftool.c builtin/fast-export.c builtin/fetch.c -#: builtin/help.c builtin/index-pack.c builtin/init-db.c builtin/log.c -#: builtin/ls-files.c builtin/merge-base.c builtin/merge.c -#: builtin/pack-objects.c builtin/push.c builtin/rebase.c builtin/repack.c -#: builtin/reset.c builtin/rev-list.c builtin/show-branch.c builtin/stash.c +#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c +#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c +#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c +#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c +#: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c +#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.c +#: builtin/rev-parse.c builtin/show-branch.c builtin/stash.c #: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c #: range-diff.c revision.c #, c-format @@ -1468,11 +1474,6 @@ msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..." #: apply.c #, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "截短 .rej 文件名为 %.*s.rej" - -#: apply.c -#, c-format msgid "cannot open %s" msgstr "不能打开 %s" @@ -1861,6 +1862,11 @@ msgstr "未知参数 --output" #: archive.c #, c-format +msgid "extra command line parameter '%s'" +msgstr "额外的命令行参数：'%s'" + +#: archive.c +#, c-format msgid "Unknown archive format '%s'" msgstr "未知归档格式 '%s'" @@ -1915,6 +1921,17 @@ msgstr "忽略过大的 gitattributes 数据对象 '%s'" msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "错误的 --attr-source 或 GIT_ATTR_SOURCE" +#: attr.c read-cache.c +#, c-format +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" @@ -1994,6 +2011,11 @@ msgstr "需要一个 %s 版本" msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" +#: bisect.c builtin/notes.c +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "不能为对象 '%s' 开始 'show'" + #: bisect.c builtin/merge.c #, c-format msgid "could not read file '%s'" @@ -2043,8 +2065,8 @@ 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 midx.c pack-bitmap.c remote.c -#: sequencer.c submodule.c +#: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c +#: remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "版本遍历初始化失败" @@ -2161,6 +2183,10 @@ msgstr "" msgid "'%s' is not a valid branch name" msgstr "'%s' 不是一个有效的分支名称" +#: branch.c builtin/branch.c +msgid "See `man git check-ref-format`" +msgstr "查阅 `man git check-ref-format`" + #: branch.c #, c-format msgid "a branch named '%s' already exists" @@ -2391,14 +2417,8 @@ msgid "adding embedded git repository: %s" msgstr "正在添加嵌入式 git 仓库：%s" #: builtin/add.c -msgid "" -"Use -f if you really want to add them.\n" -"Turn this message off by running\n" -"\"git config advice.addIgnoredFile false\"" -msgstr "" -"如果您确实要添加它们，使用 -f 参数。\n" -"运行下面的命令来关闭本消息\n" -"\"git config advice.addIgnoredFile false\"" +msgid "Use -f if you really want to add them." +msgstr "如果您确实想添加它们，请使用 -f 选项。" #: builtin/add.c msgid "adding files failed" @@ -2421,14 +2441,8 @@ msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" #: builtin/add.c -msgid "" -"Maybe you wanted to say 'git add .'?\n" -"Turn this message off by running\n" -"\"git config advice.addEmptyPathspec false\"" -msgstr "" -"也许您想要执行 'git add .'？\n" -"运行下面的命令来关闭本消息\n" -"\"git config advice.addEmptyPathspec false\"" +msgid "Maybe you wanted to say 'git add .'?" +msgstr "也许您想要执行 'git add .'？" #: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c #: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c @@ -2448,8 +2462,8 @@ msgid "bad action '%s' for '%s'" msgstr "'%2$s' 的错误动作 '%1$s'" #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c -#: sequencer.c setup.c +#: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c +#: ls-refs.c parallel-checkout.c sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" msgstr "'%s' 的值无效：'%s'" @@ -2533,18 +2547,19 @@ msgstr "无法拆分补丁。" #: builtin/am.c #, c-format -msgid "When you have resolved this problem, run \"%s --continue\"." -msgstr "当您解决这一问题，执行 \"%s --continue\"。" +msgid "When you have resolved this problem, run \"%s --continue\".\n" +msgstr "当您解决这一问题之后，执行 \"%s --continue\"。\n" #: builtin/am.c #, c-format -msgid "If you prefer to skip this patch, run \"%s --skip\" instead." -msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" +msgid "If you prefer to skip this patch, run \"%s --skip\" instead.\n" +msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。\n" #: builtin/am.c #, c-format -msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." -msgstr "若要把空补丁记录为空提交，执行 \"%s --allow-empty\"。" +msgid "" +"To record the empty patch as an empty commit, run \"%s --allow-empty\".\n" +msgstr "若要把空补丁记录为空提交，执行 \"%s --allow-empty\"。\n" #: builtin/am.c #, c-format @@ -2602,8 +2617,7 @@ msgstr "git write-tree 无法写入树对象" msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c -#: t/helper/test-fast-rebase.c +#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c msgid "failed to write commit object" msgstr "无法写提交对象" @@ -2783,8 +2797,9 @@ msgid "n" msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.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 +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c +#: builtin/verify-tag.c msgid "format" msgstr "格式" @@ -2916,7 +2931,9 @@ msgstr "git archive：应有一个 flush 包" msgid "" "git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" "checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" -msgstr "git bisect start [--term-{new|bad}=<术语> --term-{old|good}=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径规格>...]" +msgstr "" +"git bisect start [--term-{new|bad}=<术语> --term-{old|good}=<术语>] [--no-" +"checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径规格>...]" #: builtin/bisect.c msgid "git bisect (good|bad) [<rev>...]" @@ -3473,12 +3490,13 @@ msgstr "无法查询 '%s' 指向的提交对象" #: builtin/branch.c #, 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'" +msgid "the branch '%s' is not fully merged" +msgstr "分支 '%s' 没有完全合并" + +#: builtin/branch.c +#, c-format +msgid "If you are sure you want to delete it, run 'git branch -D %s'" +msgstr "如果您确认要删除它，执行 'git branch -D %s'" #: builtin/branch.c msgid "update of config-file failed" @@ -3601,11 +3619,11 @@ msgstr "分支已拷贝，但更新配置文件失败" msgid "" "Please edit the description for the branch\n" " %s\n" -"Lines starting with '%c' will be stripped.\n" +"Lines starting with '%s' will be stripped.\n" msgstr "" "请编辑分支的描述\n" " %s\n" -"以 '%c' 开头的行将被过滤。\n" +"以 '%s' 开头的行将被过滤。\n" #: builtin/branch.c msgid "Generic options" @@ -3861,10 +3879,12 @@ msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n" #: builtin/bugreport.c msgid "" -"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +"git bugreport [(-o | --output-directory) <path>]\n" +" [(-s | --suffix) <format> | --no-suffix]\n" " [--diagnose[=<mode>]]" msgstr "" -"git bugreport [-o|--output-directory <文件>] [(-s|--suffix) <格式>]\n" +"git bugreport [-o | --output-directory <文件>]\n" +" [(-s | --suffix) <格式> | --no-suffix]\n" " [--diagnose[=<模式>]" #: builtin/bugreport.c @@ -4466,6 +4486,12 @@ msgstr "'%s'、'%s' 或 '%s' 不能在检出一个树时使用" msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" +#: builtin/checkout.c builtin/grep.c builtin/merge-tree.c builtin/reset.c +#: merge-ort.c reset.c sequencer.c tree-walk.c +#, c-format +msgid "unable to read tree (%s)" +msgstr "无法读取树（%s）" + #: builtin/checkout.c msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" @@ -4488,7 +4514,7 @@ msgstr "不能对 '%s' 执行 reflog 操作：%s\n" msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c +#: builtin/checkout.c builtin/clone.c msgid "unable to update HEAD" msgstr "不能更新 HEAD" @@ -4733,6 +4759,11 @@ msgid "missing branch or commit argument" msgstr "缺少分支或提交参数" #: builtin/checkout.c +#, c-format +msgid "unknown conflict style '%s'" +msgstr "未知的冲突风格 '%s'" + +#: builtin/checkout.c msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方合并" @@ -4757,8 +4788,8 @@ msgid "new-branch" msgstr "新分支" #: builtin/checkout.c -msgid "new unparented branch" -msgstr "新的没有父提交的分支" +msgid "new unborn branch" +msgstr "新的未诞生的分支" #: builtin/checkout.c builtin/merge.c msgid "update ignored files (default)" @@ -4824,7 +4855,7 @@ msgstr "" msgid "you must specify path(s) to restore" msgstr "您必须指定要恢复的路径" -#: builtin/checkout.c builtin/clone.c builtin/remote.c +#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c #: builtin/submodule--helper.c builtin/worktree.c msgid "branch" msgstr "分支" @@ -5052,22 +5083,8 @@ msgid "remove only ignored files" msgstr "只删除忽略的文件" #: builtin/clean.c -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 -msgid "" -"clean.requireForce defaults to true and neither -i, -n, nor -f given; " -"refusing to clean" -msgstr "" -"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" - -#: builtin/clean.c -msgid "-x and -X cannot be used together" -msgstr "-x 和 -X 不能同时使用" +msgid "clean.requireForce is true and -f not given: refusing to clean" +msgstr "clean.requireForce 设置为 true 且未提供 -f 选项：拒绝执行清理动作" #: builtin/clone.c msgid "git clone [<options>] [--] <repo> [<dir>]" @@ -5086,8 +5103,8 @@ msgid "create a bare repository" msgstr "创建一个纯仓库" #: builtin/clone.c -msgid "create a mirror repository (implies bare)" -msgstr "创建一个镜像仓库（也是纯仓库）" +msgid "create a mirror repository (implies --bare)" +msgstr "创建一个镜像仓库（隐含 --bare）" #: builtin/clone.c msgid "to clone from a local repository" @@ -5160,6 +5177,7 @@ msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" #: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c +#: builtin/replay.c msgid "revision" msgstr "版本" @@ -5187,6 +5205,10 @@ msgstr "git目录" msgid "separate git dir from working tree" msgstr "git目录和工作区分离" +#: builtin/clone.c builtin/init-db.c +msgid "specify the reference format to use" +msgstr "指定要使用的引用格式" + #: builtin/clone.c msgid "key=value" msgstr "key=value" @@ -5336,11 +5358,10 @@ msgstr "太多参数。" msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" -#: 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 builtin/init-db.c setup.c +#, c-format +msgid "unknown ref storage format '%s'" +msgstr "未知的引用存储格式 '%s'" #: builtin/clone.c #, c-format @@ -5485,6 +5506,11 @@ msgid "padding space between columns" msgstr "两列之间的填充空间" #: builtin/column.c +#, c-format +msgid "%s must be non-negative" +msgstr "%s 必须为非负整数" + +#: builtin/column.c msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" @@ -5501,7 +5527,7 @@ msgid "" "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters <n>] [--" "[no-]progress]\n" -" <split options>" +" <split-options>" msgstr "" "git commit-graph write [--object-dir <目录>] [--append]\n" " [--split[=<策略>]] [--reachable | --stdin-packs | --" @@ -5520,17 +5546,17 @@ msgstr "保存图形的对象目录" #: builtin/commit-graph.c msgid "if the commit-graph is split, only verify the tip file" -msgstr "如果提交图形被拆分，只验证头一个文件" +msgstr "如果提交图被拆分，只验证头一个文件" #: builtin/commit-graph.c #, c-format msgid "Could not open commit-graph '%s'" -msgstr "无法打开提交图形 '%s'" +msgstr "无法打开提交图 '%s'" #: builtin/commit-graph.c #, c-format msgid "could not open commit-graph chain '%s'" -msgstr "无法打开提交图形链 '%s'" +msgstr "无法打开提交图链 '%s'" #: builtin/commit-graph.c #, c-format @@ -5574,15 +5600,15 @@ msgstr "启用变更路径的计算" #: builtin/commit-graph.c msgid "allow writing an incremental commit-graph file" -msgstr "允许写一个增量提交图形文件" +msgstr "允许写一个增量提交图文件" #: builtin/commit-graph.c msgid "maximum number of commits in a non-base split commit-graph" -msgstr "在非基本拆分提交图形中的最大提交数" +msgstr "在非基本拆分提交图中的最大提交数" #: builtin/commit-graph.c msgid "maximum ratio between two levels of a split commit-graph" -msgstr "一个拆分提交图形的两个级别之间的最大比率" +msgstr "一个拆分提交图的两个级别之间的最大比率" #: builtin/commit-graph.c msgid "only expire files older than a given date-time" @@ -5817,7 +5843,7 @@ msgid "" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c builtin/merge-tree.c +#: builtin/commit.c #, c-format msgid "could not lookup commit '%s'" msgstr "不能查询提交 '%s'" @@ -5862,35 +5888,35 @@ msgstr "不能写提交模版" #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be ignored.\n" -msgstr "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略。\n" +"with '%s' will be ignored.\n" +msgstr "请为您的变更输入提交说明。以 '%s' 开始的行将被忽略。\n" #: builtin/commit.c #, 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" +"with '%s' will be ignored, and an empty message aborts the commit.\n" msgstr "" -"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" +"请为您的变更输入提交说明。以 '%s' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" #: builtin/commit.c #, 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" +"with '%s' will be kept; you may remove them yourself if you want to.\n" msgstr "" -"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n" +"请为您的变更输入提交说明。以 '%s' 开始的行将被保留，如果您愿意\n" "也可以删除它们。\n" #: builtin/commit.c #, 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" +"with '%s' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n" +"请为您的变更输入提交说明。以 '%s' 开始的行将被保留，如果您愿意\n" "也可以删除它们。一个空的提交说明将会终止提交。\n" #: builtin/commit.c @@ -6119,7 +6145,7 @@ msgstr "日期" msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c builtin/merge-tree.c parse-options.h ref-filter.h +#: builtin/commit.c parse-options.h ref-filter.h msgid "commit" msgstr "提交" @@ -6444,6 +6470,10 @@ msgid "with --get, use default value when missing entry" msgstr "使用 --get 参数，当缺少设置时使用默认值" #: builtin/config.c +msgid "human-readable comment string (# will be prepended as needed)" +msgstr "人类可读的注释字符串（# 将根据需要添加到前面）" + +#: builtin/config.c #, c-format msgid "wrong number of arguments, should be %d" msgstr "错误的参数个数，应该为 %d 个" @@ -6556,6 +6586,10 @@ msgid "--default is only applicable to --get" msgstr "--default 仅适用于 --get" #: builtin/config.c +msgid "--comment is only applicable to add/set/replace operations" +msgstr "--comment 仅适用于 add/set/replace 操作" + +#: builtin/config.c msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value 仅适用于有 '值模式'" @@ -6821,7 +6855,7 @@ msgstr "--merge-base 仅适用于两个提交" #: builtin/diff.c #, c-format msgid "'%s': not a regular file or symlink" -msgstr "'%s'：不是一个正规文件或符号链接" +msgstr "'%s'：不是一个普通文件或符号链接" #: builtin/diff.c msgid "no merge given, only parents." @@ -7601,6 +7635,10 @@ msgid "read reference patterns from stdin" msgstr "从标准输入读取引用的模式" #: builtin/for-each-ref.c +msgid "also include HEAD ref and pseudorefs" +msgstr "还包括 HEAD 引用和伪引用" + +#: builtin/for-each-ref.c msgid "unknown arguments supplied with --stdin" msgstr "为 --stdin 提供了未知的命令参数" @@ -8375,8 +8413,8 @@ msgstr "没有线程支持，忽略 %s" #: builtin/grep.c #, c-format -msgid "unable to read tree (%s)" -msgstr "无法读取树（%s）" +msgid "unable to read tree %s" +msgstr "无法读取树 %s" #: builtin/grep.c #, c-format @@ -8901,11 +8939,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" @@ -9083,11 +9116,13 @@ msgstr "在打包对象中 fsck 检查出错" msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" " [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [--ref-format=<format>]\n" " [-b <branch-name> | --initial-branch=<branch-name>]\n" " [--shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>]\n" " [--separate-git-dir <git 目录>] [--object-format=<格式>]\n" +" [--ref-format=<格式>]\n" " [-b <分支名> | --initial-branch=<分支名>]\n" " [--shared[=<权限>]] [<目录>]" @@ -9140,13 +9175,46 @@ msgstr "--separate-git-dir 不能用于纯仓库" #: builtin/interpret-trailers.c msgid "" "git interpret-trailers [--in-place] [--trim-empty]\n" -" [(--trailer (<key>|<keyAlias>)[(=|:)<value>])...]\n" +" [(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n" " [--parse] [<file>...]" msgstr "" "git interpret-trailers [--in-place] [--trim-empty]\n" " [(--trailer (<键|键别名>)[(=|:)<值>])...]\n" " [--parse] [<文件>...]" +#: builtin/interpret-trailers.c wrapper.c +#, c-format +msgid "could not stat %s" +msgstr "不能对 %s 调用 stat" + +#: builtin/interpret-trailers.c +#, c-format +msgid "file %s is not a regular file" +msgstr "文件 %s 不是一个普通文件" + +#: builtin/interpret-trailers.c +#, c-format +msgid "file %s is not writable by user" +msgstr "文件 %s 用户不可写" + +#: builtin/interpret-trailers.c +msgid "could not open temporary file" +msgstr "不能打开临时文件" + +#: builtin/interpret-trailers.c +#, c-format +msgid "could not read input file '%s'" +msgstr "不能读取输入文件 '%s'" + +#: builtin/interpret-trailers.c builtin/mktag.c imap-send.c +msgid "could not read from stdin" +msgstr "不能自标准输入读取" + +#: builtin/interpret-trailers.c +#, c-format +msgid "could not rename temporary file to %s" +msgstr "不能重命名临时文件为 %s" + #: builtin/interpret-trailers.c msgid "edit files in place" msgstr "在原位编辑文件" @@ -9246,7 +9314,7 @@ msgid "" "<file>" msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变" -#: builtin/log.c builtin/shortlog.c bundle.c +#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" @@ -9645,21 +9713,6 @@ msgid "could not get object info about '%s'" msgstr "无法获得关于 '%s' 的对象信息" #: 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 [<选项>] [<文件>...]" @@ -9751,7 +9804,7 @@ msgstr "显示相对于顶级目录的文件名" msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" -#: builtin/ls-files.c +#: builtin/ls-files.c builtin/merge-tree.c msgid "tree-ish" msgstr "树对象" @@ -9830,21 +9883,6 @@ msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<选项>] <树对象> [<路径>...]" #: builtin/ls-tree.c -#, c-format -msgid "bad ls-tree format: element '%s' does not start with '('" -msgstr "坏的 ls-tree 格式：元素 '%s' 没有以 '(' 开头" - -#: builtin/ls-tree.c -#, c-format -msgid "bad ls-tree format: element '%s' does not end in ')'" -msgstr "坏的 ls-tree 格式：元素 '%s' 没有以 ')' 结尾" - -#: builtin/ls-tree.c -#, c-format -msgid "bad ls-tree format: %%%.*s" -msgstr "坏的 ls-tree 格式: %%%.*s" - -#: builtin/ls-tree.c msgid "only show trees" msgstr "只显示树" @@ -9990,6 +10028,14 @@ msgstr "" "git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初" "始文件> <文件2>" +#: builtin/merge-file.c diff.c +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"选项 diff-algorithm 接受参数 \"myers\"、\"minimal\"、\"patience\" 和 " +"\"histogram\"" + #: builtin/merge-file.c msgid "send results to standard output" msgstr "将结果发送到标准输出" @@ -10018,6 +10064,14 @@ msgstr "如果冲突，使用他们的版本" msgid "for conflicts, use a union version" msgstr "如果冲突，使用联合版本" +#: builtin/merge-file.c diff.c +msgid "<algorithm>" +msgstr "<算法>" + +#: builtin/merge-file.c diff.c +msgid "choose a diff algorithm" +msgstr "选择一个差异算法" + #: builtin/merge-file.c msgid "for conflicts, use this marker size" msgstr "如果冲突，使用指定长度的标记" @@ -10070,6 +10124,11 @@ msgstr "无法解析引用 '%s'" msgid "Merging %s with %s\n" msgstr "合并 %s 和 %s\n" +#: builtin/merge-tree.c +#, c-format +msgid "could not parse as tree '%s'" +msgstr "无法解析为树对象 '%s'" + #: builtin/merge-tree.c builtin/merge.c msgid "not something we can merge" msgstr "不是可以合并的东西" @@ -10135,10 +10194,6 @@ msgstr "--trivial-merge 与其他所有选项不兼容" msgid "unknown strategy option: -X%s" msgstr "未知的策略选项：-X%s" -#: builtin/merge-tree.c -msgid "--merge-base is incompatible with --stdin" -msgstr "--merge-base 与 --stdin 不兼容" - #: builtin/merge-tree.c builtin/notes.c #, c-format msgid "malformed input line: '%s'." @@ -10296,7 +10351,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 "不能写入索引。" @@ -10304,7 +10359,7 @@ msgstr "不能写入索引。" msgid "Not handling anything other than two heads merge." msgstr "未处理两个头合并之外的任何操作。" -#: builtin/merge.c t/helper/test-fast-rebase.c +#: builtin/merge.c #, c-format msgid "unable to write %s" msgstr "不能写 %s" @@ -10336,9 +10391,9 @@ msgstr "空的提交说明会终止提交。\n" #: builtin/merge.c #, c-format msgid "" -"Lines starting with '%c' will be ignored, and an empty message aborts\n" +"Lines starting with '%s' will be ignored, and an empty message aborts\n" "the commit.\n" -msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n" +msgstr "以 '%s' 开始的行将被忽略，而空的提交说明将终止提交。\n" #: builtin/merge.c msgid "Empty commit message." @@ -10531,10 +10586,6 @@ msgstr "不能读取被标记的对象 '%s'" msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "对象 '%s' 被标记为 '%s'，然而是一个 '%s' 类型" -#: builtin/mktag.c imap-send.c trailer.c -msgid "could not read from stdin" -msgstr "不能自标准输入读取" - #: builtin/mktag.c msgid "tag on stdin did not pass our strict fsck check" msgstr "标准输入上的标签未通过我们严格的 fsck 检查" @@ -10867,11 +10918,6 @@ msgid "Write/edit the notes for the following object:" msgstr "为下面的对象写/编辑说明：" #: builtin/notes.c -#, c-format -msgid "unable to start 'show' for object '%s'" -msgstr "不能为对象 '%s' 开始 'show'" - -#: builtin/notes.c msgid "could not read 'show' output" msgstr "不能读取 'show' 的输出" @@ -11292,6 +11338,11 @@ msgstr "不一致的差异计数" #: builtin/pack-objects.c #, c-format +msgid "invalid pack.allowPackReuse value: '%s'" +msgstr "无效的 pack.allowPackReuse 值：'%s'" + +#: builtin/pack-objects.c +#, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" "hash> <uri>' (got '%s')" @@ -11614,10 +11665,10 @@ msgstr "枚举对象中" #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" +"reused %<PRIu32> (from %<PRIuMAX>)" msgstr "" "总共 %<PRIu32>（差异 %<PRIu32>），复用 %<PRIu32>（差异 %<PRIu32>），包复用 " -"%<PRIu32>" +"%<PRIu32>（来自 %<PRIuMAX> 个包）" #: builtin/pack-redundant.c msgid "" @@ -11638,10 +11689,11 @@ msgstr "拒绝在未指定 --i-still-use-this 选项时运行" #: builtin/pack-refs.c msgid "" -"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude " +"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " "<pattern>]" msgstr "" -"git pack-refs [--all] [--no-prune] [--include <模式>] [--exclude <模式>]" +"git pack-refs [--all] [--no-prune] [--auto] [--include <模式>] [--exclude <模" +"式>]" #: builtin/pack-refs.c msgid "pack everything" @@ -11652,6 +11704,10 @@ msgid "prune loose refs (default)" msgstr "清除松散的引用（默认）" #: builtin/pack-refs.c +msgid "auto-pack refs as needed" +msgstr "按需对引用自动打包" + +#: builtin/pack-refs.c msgid "references to include" msgstr "需包含的引用" @@ -12412,19 +12468,6 @@ msgid "could not remove '%s'" msgstr "无法删除 '%s'" #: builtin/rebase.c -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 <冲突的文件>\" 标记\n" -"冲突已解决，然后执行 \"git rebase --continue\"。您也可以执行\n" -"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" -"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。" - -#: builtin/rebase.c #, c-format msgid "" "\n" @@ -12457,11 +12500,15 @@ msgid "apply options and merge options cannot be used together" msgstr "应用选项和合并选项不能同时使用" #: builtin/rebase.c +msgid "--empty=ask is deprecated; use '--empty=stop' instead." +msgstr "--empty=ask 已弃用；请使用 '--empty=stop'。" + +#: builtin/rebase.c #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " -"\"ask\"." -msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"ask\"。" +"\"stop\"." +msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"stop\"。" #: builtin/rebase.c msgid "" @@ -12603,7 +12650,7 @@ msgstr "让用户编辑要变基的提交列表" msgid "(REMOVED) was: try to recreate merges instead of ignoring them" msgstr "（已删除）曾是：尝试重建合并提交而非忽略它们" -#: builtin/rebase.c +#: builtin/rebase.c builtin/revert.c msgid "how to handle commits that become empty" msgstr "如何处理成为空提交的提交" @@ -12684,14 +12731,14 @@ msgstr "" "取而代之请使用 'merges'" #: builtin/rebase.c -msgid "No rebase in progress?" -msgstr "没有正在进行的变基？" +msgid "no rebase in progress" +msgstr "没有正在进行的变基" #: builtin/rebase.c msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: builtin/rebase.c t/helper/test-fast-rebase.c +#: builtin/rebase.c msgid "Cannot read HEAD" msgstr "不能读取 HEAD" @@ -12737,12 +12784,6 @@ msgstr "开关 `C' 期望一个数字值" #: builtin/rebase.c msgid "" -"apply options are incompatible with rebase.autoSquash. Consider adding --no-" -"autosquash" -msgstr "应用的选项与 rebase.autoSquash 不兼容。考虑加上 --no-autosquash" - -#: builtin/rebase.c -msgid "" "apply options are incompatible with rebase.rebaseMerges. Consider adding --" "no-rebase-merges" msgstr "应用的选项与 rebase.rebaseMerges 不兼容。考虑加上 --no-rebase-merges" @@ -12908,6 +12949,10 @@ msgid "git reflog [show] [<log-options>] [<ref>]" msgstr "git reflog [show] [<log 选项>] [<引用>]" #: builtin/reflog.c +msgid "git reflog list" +msgstr "git reflog list" + +#: builtin/reflog.c msgid "" "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" " [--rewrite] [--updateref] [--stale-fix]\n" @@ -12936,6 +12981,11 @@ msgstr "git reflog exists <引用>" msgid "invalid timestamp '%s' given to '--%s'" msgstr "给 '--%2$s' 的时间戳 '%1$s' 无效" +#: builtin/reflog.c sequencer.c +#, c-format +msgid "%s does not accept arguments: '%s'" +msgstr "%s 不接受参数：'%s'" + #: builtin/reflog.c msgid "do not actually prune any entries" msgstr "不要实际清除任何条目" @@ -13095,8 +13145,8 @@ msgstr "" #: builtin/remote.c #, c-format -msgid "unknown mirror argument: %s" -msgstr "未知的镜像参数：%s" +msgid "unknown --mirror argument: %s" +msgstr "未知的 --mirror 参数：%s" #: builtin/remote.c msgid "fetch the remote branches" @@ -13224,8 +13274,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 @@ -13547,6 +13597,10 @@ msgid "could not start pack-objects to repack promisor objects" msgstr "无法开始 pack-objects 来重新打包 promisor 对象" #: builtin/repack.c +msgid "failed to feed promisor objects to pack-objects" +msgstr "无法将承诺者对象提供给 pack-objects" + +#: builtin/repack.c msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。" @@ -13956,6 +14010,87 @@ msgstr "--convert-graft-file 不带参数" msgid "only one pattern can be given with -l" msgstr "只能为 -l 提供一个模式" +#: builtin/replay.c +msgid "need some commits to replay" +msgstr "需要一些提交来重放" + +#: builtin/replay.c +msgid "--onto and --advance are incompatible" +msgstr "--onto 和 --advance 不兼容" + +#: builtin/replay.c +msgid "all positive revisions given must be references" +msgstr "提供的所有正向版本必须为引用" + +#: builtin/replay.c +msgid "argument to --advance must be a reference" +msgstr "--advance 的参数必须是引用" + +#: builtin/replay.c +msgid "" +"cannot advance target with multiple sources because ordering would be ill-" +"defined" +msgstr "不能使用多个源推进目标，因为无法明确如何排序" + +#: builtin/replay.c +msgid "" +"cannot implicitly determine whether this is an --advance or --onto operation" +msgstr "不能隐式地确定这是 --advance 还是 --onto 的操作" + +#: builtin/replay.c +msgid "" +"cannot advance target with multiple source branches because ordering would " +"be ill-defined" +msgstr "不能使用多个源分支推进目标，因为无法明确如何排序" + +#: builtin/replay.c +msgid "cannot implicitly determine correct base for --onto" +msgstr "不能隐式地确定 --onto 正确的基线" + +#: builtin/replay.c +msgid "" +"(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance " +"<branch>) <revision-range>..." +msgstr "" +"（试验中！）git replay ([--contained] --onto <新基线> | --advance <分支>) <版" +"本范围>..." + +#: builtin/replay.c +msgid "make replay advance given branch" +msgstr "重放时演进给定的分支" + +#: builtin/replay.c +msgid "replay onto given commit" +msgstr "重放到给定提交" + +#: builtin/replay.c +msgid "advance all branches contained in revision-range" +msgstr "演进版本范围中包含的所有分支" + +#: builtin/replay.c +msgid "option --onto or --advance is mandatory" +msgstr "选项 --onto 或 --advance 必须指定其一" + +#: builtin/replay.c +#, c-format +msgid "" +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' " +"will be forced" +msgstr "" +"一些版本遍历选项将被覆盖，如 'struct rev_info' 中的 '%s' 位将被强制设定" + +#: builtin/replay.c +msgid "error preparing revisions" +msgstr "准备版本时错误" + +#: builtin/replay.c +msgid "replaying down to root commit is not supported yet!" +msgstr "目前还不支持重放到根提交！" + +#: builtin/replay.c +msgid "replaying merge commits is not supported yet!" +msgstr "目前还不支持重放到合并提交！" + #: builtin/rerere.c msgid "" "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" @@ -14211,22 +14346,19 @@ msgid "--prefix requires an argument" msgstr "--prefix 需要一个参数" #: builtin/rev-parse.c +msgid "no object format specified" +msgstr "未指定对象格式" + +#: builtin/rev-parse.c +#, c-format +msgid "unsupported object format: %s" +msgstr "不支持的对象格式：'%s'" + +#: builtin/rev-parse.c #, c-format msgid "unknown mode for --abbrev-ref: %s" msgstr "未知的 --abbrev-ref 模式：%s" -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --branches" -msgstr "--exclude-hidden 不能与 --branches 一起使用" - -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --tags" -msgstr "--exclude-hidden 不能与 --tags 一起使用" - -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --remotes" -msgstr "--exclude-hidden 不能与 --remotes 一起使用" - #: builtin/rev-parse.c setup.c msgid "this operation must be run in a work tree" msgstr "该操作必须在一个工作区中运行" @@ -14326,8 +14458,8 @@ msgid "allow commits with empty messages" msgstr "允许提交说明为空" #: builtin/revert.c -msgid "keep redundant, empty commits" -msgstr "保持多余的、空的提交" +msgid "deprecated: use --empty=keep instead" +msgstr "已弃用：取而代之使用 --empty=keep" #: builtin/revert.c msgid "use the 'reference' format to refer to commits" @@ -14730,11 +14862,6 @@ msgstr "不打印结果到标准输出（例如与 --verify 参数共用）" msgid "show refs from stdin that aren't in local repository" msgstr "显示从标准输入中读入的不在本地仓库中的引用" -#: builtin/show-ref.c -#, c-format -msgid "only one of '%s', '%s' or '%s' can be given" -msgstr "选项 '%s'、'%s' 或 '%s' 只能使用其一" - #: builtin/sparse-checkout.c msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" @@ -14783,7 +14910,7 @@ msgstr "初始化稀疏检出为锥形模式" msgid "toggle the use of a sparse index" msgstr "切换稀疏索引的使用" -#: builtin/sparse-checkout.c commit-graph.c midx.c sequencer.c +#: builtin/sparse-checkout.c commit-graph.c midx-write.c sequencer.c #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" @@ -15947,12 +16074,12 @@ msgid "" "\n" "Write a message for tag:\n" " %s\n" -"Lines starting with '%c' will be ignored.\n" +"Lines starting with '%s' will be ignored.\n" msgstr "" "\n" "输入一个标签说明：\n" " %s\n" -"以 '%c' 开头的行将被忽略。\n" +"以 '%s' 开头的行将被忽略。\n" #: builtin/tag.c #, c-format @@ -15960,13 +16087,13 @@ msgid "" "\n" "Write a message for tag:\n" " %s\n" -"Lines starting with '%c' will be kept; you may remove them yourself if you " +"Lines starting with '%s' will be kept; you may remove them yourself if you " "want to.\n" msgstr "" "\n" "输入一个标签说明：\n" " %s\n" -"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n" +"以 '%s' 开头的行将被保留，如果您愿意也可以删除它们。\n" #: builtin/tag.c msgid "unable to sign the tag" @@ -16075,6 +16202,10 @@ msgid "print only tags of the object" msgstr "只打印指向该对象的标签" #: builtin/tag.c +msgid "could not start 'git column'" +msgstr "无法启动 'git column'" + +#: builtin/tag.c #, c-format msgid "the '%s' option is only allowed in list mode" msgstr "'%s' 选项只允许用在列表显示模式" @@ -16379,12 +16510,12 @@ msgid "fsmonitor disabled" msgstr "fsmonitor 被禁用" #: builtin/update-ref.c -msgid "git update-ref [<options>] -d <refname> [<old-val>]" -msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" +msgid "git update-ref [<options>] -d <refname> [<old-oid>]" +msgstr "git update-ref [<选项>] -d <引用名> [<旧对象>]" #: builtin/update-ref.c -msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" -msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" +msgid "git update-ref [<options>] <refname> <new-oid> [<old-oid>]" +msgstr "git update-ref [<选项>] <引用名> <新对象> [<旧对象>]" #: builtin/update-ref.c msgid "git update-ref [<options>] --stdin [-z]" @@ -16509,30 +16640,30 @@ msgstr "没有可用的源分支，将基于 '--orphan' 选项进行推断" #: builtin/worktree.c #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan -b %s %s\n" msgstr "" -"如果你打算为此仓库创建一个包含新的孤立分支\n" -"（没有提交的分支）的工作区，你可以使用选项\n" -"--orphan 来执行此操作：\n" +"如果你打算为此仓库创建一个包含新的未诞生的\n" +"分支（没有提交的分支）的工作区，你可以使用\n" +"选项 --orphan 来执行此操作：\n" "\n" " git worktree add --orphan -b %s %s\n" #: builtin/worktree.c #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan %s\n" msgstr "" -"如果你打算为此仓库创建一个包含新的孤立分支\n" -"（没有提交的分支）的工作区，你可以使用选项\n" -"--orphan 来执行此操作：\n" +"如果你打算为此仓库创建一个包含新的未诞生的\n" +"分支（没有提交的分支）的工作区，你可以使用\n" +"选项 --orphan 来执行此操作：\n" "\n" " git worktree add --orphan %s\n" @@ -16603,6 +16734,11 @@ msgstr "初始化" #: builtin/worktree.c #, c-format +msgid "could not find created worktree '%s'" +msgstr "无法找到已创建的工作树 '%s'" + +#: builtin/worktree.c +#, c-format msgid "Preparing worktree (new branch '%s')" msgstr "准备工作区（新分支 '%s'）" @@ -16646,11 +16782,6 @@ msgstr "" "请先使用 'add -f' 来覆盖或拉取一个远程仓库" #: builtin/worktree.c -#, c-format -msgid "'%s' and '%s' cannot be used together" -msgstr "'%s' 和 '%s' 不能同时使用" - -#: builtin/worktree.c msgid "checkout <branch> even if already checked out in other worktree" msgstr "检出 <分支>，即使已经被检出到其它工作区" @@ -16663,8 +16794,8 @@ msgid "create or reset a branch" msgstr "创建或重置一个分支" #: builtin/worktree.c -msgid "create unborn/orphaned branch" -msgstr "创建一个尚未诞生的/孤立的分支" +msgid "create unborn branch" +msgstr "创建一个尚未诞生的分支" #: builtin/worktree.c msgid "populate the new working tree" @@ -16693,12 +16824,8 @@ msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用" #: builtin/worktree.c #, c-format -msgid "options '%s', and '%s' cannot be used together" -msgstr "选项 '%s' 与 '%s' 不能同时使用" - -#: builtin/worktree.c -msgid "<commit-ish>" -msgstr "<提交号>" +msgid "option '%s' and commit-ish cannot be used together" +msgstr "选项 '%s' 和提交号不能同时使用" #: builtin/worktree.c msgid "added with --lock" @@ -17489,6 +17616,10 @@ msgid "Create, list, delete refs to replace objects" msgstr "创建、列出、删除对象替换引用" #: command-list.h +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" +msgstr "试验中：基于一个新基线重放提交，同样适用于纯仓库" + +#: command-list.h msgid "Generates a summary of pending changes" msgstr "生成待定更改的摘要" @@ -17803,39 +17934,82 @@ msgstr "一个管理大型 Git 仓库的工具" #: commit-graph.c msgid "commit-graph file is too small" -msgstr "提交图形文件太小" +msgstr "提交图文件太小" + +#: commit-graph.c +msgid "commit-graph oid fanout chunk is wrong size" +msgstr "提交图中对象 ID 的扇出块大小错误" + +#: commit-graph.c +msgid "commit-graph fanout values out of order" +msgstr "提交图的扇出值失序" + +#: commit-graph.c +msgid "commit-graph OID lookup chunk is the wrong size" +msgstr "提交图的对象 ID 查询块大小错误" + +#: commit-graph.c +msgid "commit-graph commit data chunk is wrong size" +msgstr "提交图的提交数据块大小错误" + +#: commit-graph.c +msgid "commit-graph generations chunk is wrong size" +msgstr "提交图的世代块大小错误" + +#: commit-graph.c +msgid "commit-graph changed-path index chunk is too small" +msgstr "提交图的变更路径的索引块太小" + +#: commit-graph.c +#, c-format +msgid "" +"ignoring too-small changed-path chunk (%<PRIuMAX> < %<PRIuMAX>) in commit-" +"graph file" +msgstr "忽略提交图文件中过小的更改路径块（%<PRIuMAX> < %<PRIuMAX>）" #: commit-graph.c #, c-format msgid "commit-graph signature %X does not match signature %X" -msgstr "提交图形签名 %X 和签名 %X 不匹配" +msgstr "提交图签名 %X 和签名 %X 不匹配" #: commit-graph.c #, c-format msgid "commit-graph version %X does not match version %X" -msgstr "提交图形版本 %X 和版本 %X 不匹配" +msgstr "提交图版本 %X 和版本 %X 不匹配" #: commit-graph.c #, c-format msgid "commit-graph hash version %X does not match version %X" -msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" +msgstr "提交图哈希版本 %X 和版本 %X 不匹配" #: commit-graph.c #, c-format msgid "commit-graph file is too small to hold %u chunks" -msgstr "提交图形文件太小，容不下 %u 个块" +msgstr "提交图文件太小，容不下 %u 个块" + +#: commit-graph.c +msgid "commit-graph required OID fanout chunk missing or corrupted" +msgstr "提交图所需的对象 ID 扇出块缺失或损坏" + +#: commit-graph.c +msgid "commit-graph required OID lookup chunk missing or corrupted" +msgstr "提交图所需的对象 ID 查询块缺失或损坏" + +#: commit-graph.c +msgid "commit-graph required commit data chunk missing or corrupted" +msgstr "提交图所需的提交数据块缺失或损坏" #: commit-graph.c msgid "commit-graph has no base graphs chunk" -msgstr "提交图形没有基础图形块" +msgstr "提交图没有基础图形块" #: commit-graph.c msgid "commit-graph base graphs chunk is too small" -msgstr "提交图形的基础图形块过小" +msgstr "提交图的基础图形块过小" #: commit-graph.c msgid "commit-graph chain does not match" -msgstr "提交图形链不匹配" +msgstr "提交图链不匹配" #: commit-graph.c #, c-format @@ -17843,17 +18017,21 @@ msgid "commit count in base graph too high: %<PRIuMAX>" msgstr "基础图形中的提交数量过高：%<PRIuMAX>" #: commit-graph.c +msgid "commit-graph chain file too small" +msgstr "提交图链文件太小" + +#: commit-graph.c #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" -msgstr "无效的提交图形链：行 '%s' 不是一个哈希值" +msgstr "无效的提交图链：行 '%s' 不是一个哈希值" #: commit-graph.c msgid "unable to find all commit-graph files" -msgstr "无法找到所有提交图形文件" +msgstr "无法找到所有提交图文件" #: commit-graph.c msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "无效的提交位置。提交图形可能已损坏" +msgstr "无效的提交位置。提交图可能已损坏" #: commit-graph.c #, c-format @@ -17869,6 +18047,10 @@ msgid "commit-graph overflow generation data is too small" msgstr "提交图溢出世代数据过小" #: commit-graph.c +msgid "commit-graph extra-edges pointer out of bounds" +msgstr "提交图额外边的指针越界" + +#: commit-graph.c msgid "Loading known commits in commit graph" msgstr "正在加载提交图中的已知提交" @@ -17943,26 +18125,26 @@ msgstr[1] "正在用 %d 步写出提交图" #: commit-graph.c msgid "unable to open commit-graph chain file" -msgstr "无法打开提交图形链文件" +msgstr "无法打开提交图链文件" #: commit-graph.c msgid "failed to rename base commit-graph file" -msgstr "无法重命名基础提交图形文件" +msgstr "无法重命名基础提交图文件" #: commit-graph.c msgid "failed to rename temporary commit-graph file" -msgstr "无法重命名临时提交图形文件" +msgstr "无法重命名临时提交图文件" #: commit-graph.c #, c-format msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits" msgstr "" -"无法合并提交图形，总共已累加提交数：%<PRIuMAX>，当前待累加提交数：%<PRIuMAX>" +"无法合并提交图，总共已累加提交数：%<PRIuMAX>，当前待累加提交数：%<PRIuMAX>" #: commit-graph.c #, c-format msgid "cannot merge graph %s, too many commits: %<PRIuMAX>" -msgstr "无法合并提交图形 %s, 提交过多：%<PRIuMAX>" +msgstr "无法合并提交图 %s, 提交过多：%<PRIuMAX>" #: commit-graph.c msgid "Scanning merged commits" @@ -17970,7 +18152,7 @@ msgstr "正在扫描合并提交" #: commit-graph.c msgid "Merging commit-graph" -msgstr "正在合并提交图形" +msgstr "正在合并提交图" #: commit-graph.c msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" @@ -17987,64 +18169,69 @@ msgstr "提交图文件的校验码错误，可能已经损坏" #: commit-graph.c #, c-format msgid "commit-graph has incorrect OID order: %s then %s" -msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s" +msgstr "提交图的对象 ID 顺序不正确：%s 然后 %s" #: commit-graph.c #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" -msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u" +msgstr "提交图有不正确的扇出值：fanout[%d] = %u != %u" #: commit-graph.c #, c-format msgid "failed to parse commit %s from commit-graph" -msgstr "无法从提交图形中解析提交 %s" +msgstr "无法从提交图中解析提交 %s" #: commit-graph.c #, c-format msgid "failed to parse commit %s from object database for commit-graph" -msgstr "无法从提交图形的对象库中解析提交 %s" +msgstr "无法从提交图的对象库中解析提交 %s" #: commit-graph.c #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" +msgstr "提交图中的提交 %s 的根树对象 ID 是 %s != %s" #: commit-graph.c #, c-format msgid "commit-graph parent list for commit %s is too long" -msgstr "提交 %s 的提交图形父提交列表太长了" +msgstr "提交 %s 的提交图父提交列表太长了" #: commit-graph.c #, c-format msgid "commit-graph parent for %s is %s != %s" -msgstr "%s 的提交图形父提交是 %s != %s" +msgstr "%s 的提交图父提交是 %s != %s" #: commit-graph.c #, c-format msgid "commit-graph parent list for commit %s terminates early" -msgstr "提交 %s 的提交图形父提交列表过早终止" +msgstr "提交 %s 的提交图父提交列表过早终止" #: commit-graph.c #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" -msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>" +msgstr "提交图中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>" #: commit-graph.c #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" -msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" +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 msgid "Verifying commits in commit graph" msgstr "正在校验提交图中的提交" +#: commit-reach.c sequencer.c +#, c-format +msgid "could not parse commit %s" +msgstr "不能解析提交 %s" + #: commit.c #, c-format msgid "%s %s is not a commit!" @@ -18073,7 +18260,7 @@ msgstr "" #: commit.c #, c-format msgid "commit %s exists in commit-graph but not in the object database" -msgstr "提交 %s 存在于提交图形中，但不存在于对象数据库中" +msgstr "提交 %s 存在于提交图中，但不存在于对象数据库中" #: commit.c #, c-format @@ -18572,8 +18759,14 @@ msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" #: config.c -msgid "core.commentChar should only be one ASCII character" -msgstr "core.commentChar 应该是一个 ASCII 编码的字符" +#, c-format +msgid "%s cannot contain newline" +msgstr "%s 不能包含换行符" + +#: config.c +#, c-format +msgid "%s must have at least one character" +msgstr "%s 必须至少有一个字符" #: config.c #, c-format @@ -18663,6 +18856,11 @@ msgstr "无法写入新的配置文件 %s" #: config.c #, c-format +msgid "no multi-line comment allowed: '%s'" +msgstr "不允许多行注释：'%s'" + +#: config.c +#, c-format msgid "could not lock config file %s" msgstr "不能锁定配置文件 %s" @@ -19255,6 +19453,11 @@ msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模 msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" +#: diff.c transport.c +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "配置 '%s' 未知的取值：%s" + #: diff.c #, c-format msgid "" @@ -19349,13 +19552,6 @@ msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的无效模式 '%s' " #: diff.c -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" - -#: diff.c #, c-format msgid "invalid argument to %s" msgstr "%s 的参数无效" @@ -19412,8 +19608,8 @@ msgid "output only the last line of --stat" msgstr "只输出 --stat 的最后一行" #: diff.c -msgid "<param1,param2>..." -msgstr "<参数1,参数2>..." +msgid "<param1>,<param2>..." +msgstr "<参数1>,<参数2>..." #: diff.c msgid "" @@ -19425,8 +19621,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,<param1>,<param2>..." +msgstr "是 --dirstat=files,<参数1>,<参数2>... 的同义词" #: diff.c msgid "warn if changes introduce conflict markers or whitespace errors" @@ -19649,14 +19845,6 @@ msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 算法生成差异" #: diff.c -msgid "<algorithm>" -msgstr "<算法>" - -#: diff.c -msgid "choose a diff algorithm" -msgstr "选择一个差异算法" - -#: diff.c msgid "<text>" msgstr "<文本>" @@ -20849,6 +21037,16 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "不能创建 '%s.lock'：%s" +#: loose.c +#, c-format +msgid "could not write loose object index %s" +msgstr "不能写入松散对象索引 %s" + +#: loose.c +#, c-format +msgid "failed to write loose object index %s\n" +msgstr "无法写入松散对象索引 %s\n" + #: ls-refs.c #, c-format msgid "unexpected line: '%s'" @@ -20862,6 +21060,11 @@ msgstr "在 ls-refs 参数后应该有一个 flush 包" msgid "quoted CRLF detected" msgstr "检测到被引用的 CRLF" +#: mem-pool.c strbuf.c wrapper.c +#, c-format +msgid "unable to format message: %s" +msgstr "无法格式化消息：%s" + #: merge-ort.c merge-recursive.c #, c-format msgid "Failed to merge submodule %s (not checked out)" @@ -20879,6 +21082,11 @@ msgstr "无法合并子模组 %s（提交不存在）" #: merge-ort.c merge-recursive.c #, c-format +msgid "Failed to merge submodule %s (repository corrupt)" +msgstr "无法合并子模组 %s（仓库损坏）" + +#: merge-ort.c merge-recursive.c +#, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "无法合并子模组 %s （提交未跟随合并基线）" @@ -21407,11 +21615,115 @@ msgstr "不能解析对象 '%s'" msgid "failed to read the cache" msgstr "无法读取缓存" +#: midx-write.c +#, c-format +msgid "failed to add packfile '%s'" +msgstr "无法添加包文件 '%s'" + +#: midx-write.c +#, c-format +msgid "failed to open pack-index '%s'" +msgstr "无法打开包索引 '%s'" + +#: midx-write.c +#, c-format +msgid "failed to locate object %d in packfile" +msgstr "无法在包文件中定位对象 %d" + +#: midx-write.c +msgid "cannot store reverse index file" +msgstr "无法存储反向索引文件" + +#: midx-write.c +#, c-format +msgid "could not parse line: %s" +msgstr "不能解析行：%s" + +#: midx-write.c +#, c-format +msgid "malformed line: %s" +msgstr "格式错误的行：%s" + +#: midx-write.c +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "忽略已存在的多包索引，校验码不匹配" + +#: midx-write.c +msgid "could not load pack" +msgstr "不能载入包" + +#: midx-write.c +#, c-format +msgid "could not open index for %s" +msgstr "不能打开 %s 的索引" + +#: midx-write.c +msgid "Adding packfiles to multi-pack-index" +msgstr "添加包文件到多包索引" + +#: midx-write.c +#, c-format +msgid "unknown preferred pack: '%s'" +msgstr "未知的首选包：'%s'" + +#: midx-write.c +#, c-format +msgid "cannot select preferred pack %s with no objects" +msgstr "不能选择没有对象的首选包 %s" + +#: midx-write.c +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "没有看到要丢弃的包文件 %s" + +#: midx-write.c +#, c-format +msgid "preferred pack '%s' is expired" +msgstr "首选包 '%s' 已过期" + +#: midx-write.c +msgid "no pack files to index." +msgstr "没有要索引的包文件。" + +#: midx-write.c +msgid "refusing to write multi-pack .bitmap without any objects" +msgstr "拒绝写入没有任何对象的多包位图" + +#: midx-write.c +msgid "could not write multi-pack bitmap" +msgstr "无法写入多包位图" + +#: midx-write.c +msgid "could not write multi-pack-index" +msgstr "无法写入多包索引" + +#: midx-write.c +msgid "Counting referenced objects" +msgstr "正在对引用对象计数" + +#: midx-write.c +msgid "Finding and deleting unreferenced packfiles" +msgstr "正在查找和删除未引用的包文件" + +#: midx-write.c +msgid "could not start pack-objects" +msgstr "不能开始 pack-objects" + +#: midx-write.c +msgid "could not finish pack-objects" +msgstr "不能结束 pack-objects" + #: midx.c msgid "multi-pack-index OID fanout is of the wrong size" msgstr "多包索引的对象 ID 扇出表大小错误" #: midx.c +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" +msgstr "对象 ID 扇出失序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" + +#: midx.c msgid "multi-pack-index OID lookup chunk is the wrong size" msgstr "多包索引的对象 ID 查询块大小错误" @@ -21470,94 +21782,21 @@ msgid "bad pack-int-id: %u (%u total packs)" msgstr "错的 pack-int-id：%u（共有 %u 个包）" #: midx.c -msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" -msgstr "多包索引存储一个64位偏移，但是 off_t 太小" - -#: midx.c -msgid "multi-pack-index large offset out of bounds" -msgstr "多包索引大偏移区越界" - -#: midx.c -#, c-format -msgid "failed to add packfile '%s'" -msgstr "无法添加包文件 '%s'" - -#: midx.c -#, c-format -msgid "failed to open pack-index '%s'" -msgstr "无法打开包索引 '%s'" - -#: midx.c -#, c-format -msgid "failed to locate object %d in packfile" -msgstr "无法在包文件中定位对象 %d" - -#: midx.c -msgid "cannot store reverse index file" -msgstr "无法存储反向索引文件" - -#: midx.c -#, c-format -msgid "could not parse line: %s" -msgstr "不能解析行：%s" - -#: midx.c -#, c-format -msgid "malformed line: %s" -msgstr "格式错误的行：%s" - -#: midx.c -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "忽略已存在的多包索引，校验码不匹配" - -#: midx.c -msgid "could not load pack" -msgstr "不能载入包" +msgid "MIDX does not contain the BTMP chunk" +msgstr "多包索引中未包含 BTMP 块" #: midx.c #, c-format -msgid "could not open index for %s" -msgstr "不能打开 %s 的索引" - -#: midx.c -msgid "Adding packfiles to multi-pack-index" -msgstr "添加包文件到多包索引" - -#: midx.c -#, c-format -msgid "unknown preferred pack: '%s'" -msgstr "未知的首选包：'%s'" - -#: midx.c -#, c-format -msgid "cannot select preferred pack %s with no objects" -msgstr "不能选择没有对象的首选包 %s" - -#: midx.c -#, c-format -msgid "did not see pack-file %s to drop" -msgstr "没有看到要丢弃的包文件 %s" - -#: midx.c -#, c-format -msgid "preferred pack '%s' is expired" -msgstr "首选包 '%s' 已过期" - -#: midx.c -msgid "no pack files to index." -msgstr "没有要索引的包文件。" - -#: midx.c -msgid "refusing to write multi-pack .bitmap without any objects" -msgstr "拒绝写入没有任何对象的多包位图 .bitmap" +msgid "could not load bitmapped pack %<PRIu32>" +msgstr "不能打开已被位图索引的包 %<PRIu32>" #: midx.c -msgid "could not write multi-pack bitmap" -msgstr "无法写入多包位图" +msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" +msgstr "多包索引存储一个64位偏移，但是 off_t 太小" #: midx.c -msgid "could not write multi-pack-index" -msgstr "无法写入多包索引" +msgid "multi-pack-index large offset out of bounds" +msgstr "多包索引大偏移区越界" #: midx.c #, c-format @@ -21577,12 +21816,6 @@ msgid "Looking for referenced packfiles" msgstr "正在查找引用的包文件" #: midx.c -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" - -#: midx.c msgid "the midx contains no oid" msgstr "midx 不包含 oid" @@ -21618,22 +21851,6 @@ msgstr "无法为包文件 %s 加载包索引" msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>" -#: midx.c -msgid "Counting referenced objects" -msgstr "正在对引用对象计数" - -#: midx.c -msgid "Finding and deleting unreferenced packfiles" -msgstr "正在查找和删除未引用的包文件" - -#: midx.c -msgid "could not start pack-objects" -msgstr "不能开始 pack-objects" - -#: midx.c -msgid "could not finish pack-objects" -msgstr "不能结束 pack-objects" - #: name-hash.c #, c-format msgid "unable to create lazy_dir thread: %s" @@ -21688,6 +21905,30 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" +#: object-file-convert.c +msgid "failed to decode tree entry" +msgstr "无法解码树对象" + +#: object-file-convert.c +#, c-format +msgid "failed to map tree entry for %s" +msgstr "无法为 %s 映射树对象" + +#: object-file-convert.c +#, c-format +msgid "bad %s in commit" +msgstr "提交中有错误的 %s" + +#: object-file-convert.c +#, c-format +msgid "unable to map %s %s in commit object" +msgstr "无法将 %s %s 映射到提交对象中" + +#: object-file-convert.c +#, c-format +msgid "Failed to convert object from %s to %s" +msgstr "无法将对象从 %s 转换为 %s" + #: object-file.c #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" @@ -21816,6 +22057,11 @@ msgstr "打包对象 %s（保存在 %s）已损坏" #: object-file.c #, c-format +msgid "missing mapping of %s to %s" +msgstr "缺少 %s 到 %s 的映射" + +#: object-file.c +#, c-format msgid "unable to write file %s" msgstr "无法写文件 %s" @@ -21883,6 +22129,11 @@ msgstr "不能读取对象 %s" #: object-file.c #, c-format +msgid "cannot map object %s to %s" +msgstr "无法将对象 %s 映射到 %s" + +#: object-file.c +#, c-format msgid "object fails fsck: %s" msgstr "对象 fsck 失败：%s" @@ -22211,6 +22462,10 @@ msgstr "多包位图缺少必需的反向索引" msgid "could not open pack %s" msgstr "不能打开包 %s" +#: pack-bitmap.c t/helper/test-read-midx.c +msgid "could not determine MIDX preferred pack" +msgstr "不能确定多包索引的首选包" + #: pack-bitmap.c #, c-format msgid "preferred pack (%s) is invalid" @@ -22236,6 +22491,15 @@ msgstr "损坏的 EWAH 位图：提交 \"%s\" 位图的文件头被截断" #: pack-bitmap.c #, c-format +msgid "unable to load pack: '%s', disabling pack-reuse" +msgstr "无法打开包：'%s'，禁用包重用" + +#: pack-bitmap.c +msgid "unable to compute preferred pack, disabling pack-reuse" +msgstr "无法计算首选包，禁用包重用" + +#: pack-bitmap.c +#, c-format msgid "object '%s' not found in type bitmaps" msgstr "对象 %s 为在类型位图中找到" @@ -22349,6 +22613,10 @@ msgstr "位于 %<PRIu64> 的无效的反向索引：%<PRIu32> != %<PRIu32>" msgid "multi-pack-index reverse-index chunk is the wrong size" msgstr "多包索引的反向索引块大小错误" +#: pack-revindex.c +msgid "could not determine preferred pack" +msgstr "无法确定首选包" + #: pack-write.c msgid "cannot both write and verify reverse index" msgstr "无法同时写入和校验反向索引" @@ -22429,11 +22697,6 @@ msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" #: parse-options.c #, c-format -msgid "%s is incompatible with %s" -msgstr "%s 与 %s 不兼容" - -#: parse-options.c -#, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）" @@ -22823,11 +23086,6 @@ msgstr "无法在索引中添加 '%s'" #: read-cache.c #, c-format -msgid "unable to stat '%s'" -msgstr "无法对 %s 执行 stat" - -#: read-cache.c -#, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起来既是文件又是目录" @@ -23500,21 +23758,94 @@ msgstr "'%s' 已存在，无法创建 '%s'" msgid "cannot process '%s' and '%s' at the same time" msgstr "无法同时处理 '%s' 和 '%s'" -#: refs/files-backend.c -#, c-format -msgid "could not remove reference %s" -msgstr "无法删除引用 %s" - -#: refs/files-backend.c refs/packed-backend.c +#: refs.c #, c-format msgid "could not delete reference %s: %s" msgstr "无法删除引用 %s：%s" -#: refs/files-backend.c refs/packed-backend.c +#: refs.c #, c-format msgid "could not delete references: %s" msgstr "无法删除引用：%s" +#: refs/reftable-backend.c +#, c-format +msgid "refname is dangerous: %s" +msgstr "危险的引用名称：%s" + +#: refs/reftable-backend.c +#, c-format +msgid "trying to write ref '%s' with nonexistent object %s" +msgstr "试图用不存在的对象 %2$s 写入引用 '%1$s'" + +#: refs/reftable-backend.c +#, c-format +msgid "trying to write non-commit object %s to branch '%s'" +msgstr "尝试将非提交对象 %s 写入分支 '%s'" + +#: refs/reftable-backend.c +#, c-format +msgid "" +"multiple updates for 'HEAD' (including one via its referent '%s') are not " +"allowed" +msgstr "不允许对 'HEAD' 进行多次更新（包括通过其引用 '%s' 进行的更新）" + +#: refs/reftable-backend.c +#, c-format +msgid "cannot lock ref '%s': unable to resolve reference '%s'" +msgstr "无法锁定引用 '%s'：无法解析引用 '%s'" + +#: refs/reftable-backend.c +#, c-format +msgid "cannot lock ref '%s': error reading reference" +msgstr "无法锁定引用 '%s'：读取引用时出错" + +#: refs/reftable-backend.c +#, c-format +msgid "" +"multiple updates for '%s' (including one via symref '%s') are not allowed" +msgstr "不允许对 '%s' 进行多次更新（包括通过符号引用 '%s' 更新）" + +#: refs/reftable-backend.c +#, c-format +msgid "cannot lock ref '%s': reference already exists" +msgstr "无法锁定引用 '%s'：引用已存在" + +#: refs/reftable-backend.c +#, c-format +msgid "cannot lock ref '%s': reference is missing but expected %s" +msgstr "无法锁定 '%s' 引用：引用丢失，但预期为 %s" + +#: refs/reftable-backend.c +#, c-format +msgid "cannot lock ref '%s': is at %s but expected %s" +msgstr "无法锁定 '%s' 引用：位于 %s，但预期为 %s" + +#: refs/reftable-backend.c +#, c-format +msgid "reftable: transaction prepare: %s" +msgstr "reftable: 事务准备：%s" + +#: refs/reftable-backend.c +#, c-format +msgid "reftable: transaction failure: %s" +msgstr "reftable: 事务失败：%s" + +#: refs/reftable-backend.c +#, c-format +msgid "unable to compact stack: %s" +msgstr "无法压缩栈：%s" + +#: refs/reftable-backend.c +#, c-format +msgid "refname %s not found" +msgstr "引用名称 %s 未找到" + +#: refs/reftable-backend.c +#, c-format +msgid "refname %s is a symbolic ref, copying it is not supported" +msgstr "引用名 %s 是一个符号引用，不支持复制" + #: refspec.c #, c-format msgid "invalid refspec '%s'" @@ -23527,6 +23858,11 @@ msgstr "在 push-option 取值中无效的引号：'%s'" #: remote-curl.c #, c-format +msgid "unknown value for object-format: %s" +msgstr "对象格式的未知取值：%s" + +#: remote-curl.c +#, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs 无效：这是 git 仓库么？" @@ -24062,8 +24398,21 @@ msgstr "resolve-undo 记录 `%s`，现缺失" #: revision.c #, c-format -msgid "could not get commit for ancestry-path argument %s" -msgstr "无法获得 ancestry-path 参数 %s 的提交" +msgid "%s exists but is a symbolic ref" +msgstr "%s 存在但是一个符号引用" + +#: revision.c +msgid "" +"--merge requires one of the pseudorefs MERGE_HEAD, CHERRY_PICK_HEAD, " +"REVERT_HEAD or REBASE_HEAD" +msgstr "" +"--merge 选项需要指定 MERGE_HEAD、CHERRY_PICK_HEAD、REVERT_HEAD 或 " +"REBASE_HEAD 中的一个伪引用" + +#: 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" @@ -24424,6 +24773,19 @@ msgstr "未知动作：%d" #: sequencer.c 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 <冲突的文件>\" 标记\n" +"冲突已解决，然后执行 \"git rebase --continue\"。您也可以执行\n" +"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" +"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。" + +#: sequencer.c +msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" @@ -24665,18 +25027,13 @@ msgstr "无效的作者身份 '%s'" msgid "corrupt author: missing date information" msgstr "损坏的作者：缺失日期信息" -#: sequencer.c t/helper/test-fast-rebase.c +#: sequencer.c #, c-format msgid "could not update %s" msgstr "不能更新 %s" #: sequencer.c #, c-format -msgid "could not parse commit %s" -msgstr "不能解析提交 %s" - -#: sequencer.c -#, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" @@ -24807,11 +25164,6 @@ msgstr "无效命令 '%.*s'" #: sequencer.c #, c-format -msgid "%s does not accept arguments: '%s'" -msgstr "%s 不接受参数：'%s'" - -#: sequencer.c -#, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的参数" @@ -25156,6 +25508,10 @@ msgid "Autostash exists; creating a new stash entry." msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。" #: sequencer.c +msgid "autostash reference is a symref" +msgstr "自动贮藏的引用是一个符号引用" + +#: sequencer.c msgid "could not detach HEAD" msgstr "不能分离头指针" @@ -25357,6 +25713,11 @@ msgstr "无法使用无效配置来创建工作区" #: setup.c #, c-format +msgid "'%s' already specified as '%s'" +msgstr "'%s' 已指定为 '%s'" + +#: setup.c +#, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 仓库版本 <= %d，却得到 %d" @@ -25531,6 +25892,11 @@ msgstr "无效的初始分支名：'%s'" #: setup.c #, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init：已忽略 --initial-branch=%s" + +#: setup.c +#, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" @@ -25544,14 +25910,14 @@ msgid "attempt to reinitialize repository with different hash" msgstr "尝试用不同的哈希算法重新初始化仓库" #: setup.c -#, c-format -msgid "%s already exists" -msgstr "%s 已经存在" +msgid "" +"attempt to reinitialize repository with different reference storage format" +msgstr "尝试使用不同的引用存储格式重新初始化仓库" #: setup.c #, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "re-init：已忽略 --initial-branch=%s" +msgid "%s already exists" +msgstr "%s 已经存在" #: setup.c #, c-format @@ -25582,6 +25948,24 @@ msgstr "索引条目是一个目录，但不是稀疏的 (%08x)" msgid "cannot use split index with a sparse index" msgstr "拆分索引无法与稀疏索引一起使用" +#. TRANSLATORS: The first %s is a command like "ls-tree". +#: strbuf.c +#, c-format +msgid "bad %s format: element '%s' does not start with '('" +msgstr "坏的 %s 格式：元素 '%s' 没有以 '(' 开头" + +#. TRANSLATORS: The first %s is a command like "ls-tree". +#: strbuf.c +#, c-format +msgid "bad %s format: element '%s' does not end in ')'" +msgstr "坏的 %s 格式：元素 '%s' 没有以 ')' 结尾" + +#. TRANSLATORS: %s is a command like "ls-tree". +#: strbuf.c +#, c-format +msgid "bad %s format: %%%.*s" +msgstr "坏的 %s 格式: %%%.*s" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte #: strbuf.c #, c-format @@ -25869,14 +26253,6 @@ msgstr "在每次迭代前清除缓存树" msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "缓存树中无效化的条目数量（默认 0）" -#: t/helper/test-fast-rebase.c -msgid "unhandled options" -msgstr "未处理的选项" - -#: t/helper/test-fast-rebase.c -msgid "error preparing revisions" -msgstr "准备版本时错误" - #: t/helper/test-reach.c #, c-format msgid "commit %s is not marked reachable" @@ -25981,35 +26357,6 @@ msgstr "键 '%2$s' 的未知取值 '%1$s'" msgid "empty trailer token in trailer '%.*s'" msgstr "尾注 '%.*s' 的键为空" -#: trailer.c -#, c-format -msgid "could not read input file '%s'" -msgstr "不能读取输入文件 '%s'" - -#: trailer.c wrapper.c -#, c-format -msgid "could not stat %s" -msgstr "不能对 %s 调用 stat" - -#: trailer.c -#, c-format -msgid "file %s is not a regular file" -msgstr "文件 %s 不是一个正规文件" - -#: trailer.c -#, c-format -msgid "file %s is not writable by user" -msgstr "文件 %s 用户不可写" - -#: trailer.c -msgid "could not open temporary file" -msgstr "不能打开临时文件" - -#: trailer.c -#, c-format -msgid "could not rename temporary file to %s" -msgstr "不能重命名临时文件为 %s" - #: transport-helper.c msgid "full write to remote helper failed" msgstr "完整写入远程助手失败" @@ -26070,10 +26417,6 @@ msgstr "协议不支持设置远程服务路径" msgid "invalid remote service path" msgstr "无效的远程服务路径" -#: transport-helper.c transport.c -msgid "operation not supported by protocol" -msgstr "协议不支持该操作" - #: transport-helper.c #, c-format msgid "can't connect to subservice %s" @@ -26133,8 +26476,8 @@ msgstr "remote-heper 不支持推送，需要引用规格" #: transport-helper.c #, c-format -msgid "helper %s does not support 'force'" -msgstr "助手 %s 不支持 'force'" +msgid "helper %s does not support '--force'" +msgstr "助手 %s 不支持 '--force'" #: transport-helper.c msgid "couldn't run fast-export" @@ -26239,11 +26582,6 @@ msgstr "协议 v2 的支持尚未实现" #: transport.c #, c-format -msgid "unknown value for config '%s': %s" -msgstr "配置 '%s' 的取值未知：%s" - -#: transport.c -#, c-format msgid "transport '%s' not allowed" msgstr "传输 '%s' 不允许" @@ -26301,6 +26639,10 @@ msgstr "协议不支持 bundle-uri 操作" msgid "could not retrieve server-advertised bundle-uri list" msgstr "无法获取服务器公布的 bundle-uri 列表" +#: transport.c +msgid "operation not supported by protocol" +msgstr "协议不支持该操作" + #: tree-walk.c msgid "too-short tree object" msgstr "太短的树对象" @@ -26610,6 +26952,11 @@ msgid "invalid '..' path segment" msgstr "无效的 '..' 路径片段" #: usage.c +#, c-format +msgid "error: unable to format message: %s\n" +msgstr "错误：无法格式化消息：%s\n" + +#: usage.c msgid "usage: " msgstr "用法：" @@ -27329,6 +27676,11 @@ msgstr "另外，您的索引中包含未提交的变更。" msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的变更。" +#: xdiff-interface.c +#, c-format +msgid "unknown style '%s' given for '%s'" +msgstr "'%2$s' 的未知风格取值 '%1$s'" + #: git-merge-octopus.sh git-merge-resolve.sh msgid "" "Error: Your local changes to the following files would be overwritten by " |