diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 1752 |
1 files changed, 1121 insertions, 631 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 2b88f9b781..86402725b2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -14,6 +14,7 @@ # - 依云 <lilydjwg AT gmail.com> # - Yichao Yu <yyc1992 AT gmail.com> # - Zhuang Ya <zhuangya AT me.com> +# - Teng Long <dyroneteng AT gmail.com> # # Git glossary for Chinese translators # @@ -22,11 +23,13 @@ # 3-way merge | 三方合并 # abbreviate | 简写（的 SHA-1 值） # alternate object database | 备用对象库 +# attribute source | 属性来源 # amend | 修补 # ancestor | 祖先，祖先提交 # annotated tag | 附注标签 # bare repository | 纯仓库 # bisect | 二分查找 +# bitmap | 位图 # blob object | 数据对象 # bloom filter | 布隆过滤器 # branch | 分支 @@ -74,6 +77,7 @@ # index entry | 索引条目 # loose object | 松散对象 # loose refs | 松散引用 +# magic | 神奇前缀（路径规格支持的一种前缀表达式） # master | master（默认分支名） # merge | 合并 # object | 对象 @@ -83,6 +87,7 @@ # object type | 对象类型 # octopus | 章鱼式合并（两分支以上的合并） # origin | origin（默认的远程名称） +# orphan | 孤立（一般指孤立分支，即没有任何提交的分支） # pack | 包 # pack index | 包索引 # packfile | 包文件 @@ -102,6 +107,7 @@ # rebase | 变基 # ref | 引用 # reflog | 引用日志 +# refmap | 引用映射 # refspec | 引用规格 # remote | 远程，远程仓库 # remote-tracking branch | 远程跟踪分支 @@ -145,10 +151,10 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2023-03-07 23:37+0000\n" -"PO-Revision-Date: 2023-03-07 23:40+0000\n" -"Last-Translator: Fangyi Zhou <me@fangyi.io>\n" -"Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n" +"POT-Creation-Date: 2023-11-10 10:49+0800\n" +"PO-Revision-Date: 2023-11-10 17:13+0800\n" +"Last-Translator: Teng Long <dyroneteng@gmail.com>\n" +"Language-Team: GitHub <https://github.com/dyrone/git/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -888,9 +894,8 @@ msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退，因为您有未合并的文件。" #: advice.c -#, c-format -msgid "It is not possible to %s because you have unmerged files." -msgstr "无法 %s，因为您有未合并的文件。" +msgid "Rebasing is not possible because you have unmerged files." +msgstr "无法变基，因为您有未合并的文件。" #: advice.c msgid "" @@ -917,6 +922,24 @@ msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" #: advice.c +msgid "" +"Diverging branches can't be fast-forwarded, you need to either:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"or:\n" +"\n" +"\tgit rebase\n" +msgstr "" +"无法在偏离的分支上进行快进操作，您需要:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"或者：\n" +"\n" +"\tgit rebase\n" + +#: advice.c msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" @@ -1022,14 +1045,15 @@ msgstr "未能识别的空白字符选项 '%s'" msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: apply.c archive.c builtin/add.c builtin/branch.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/submodule--helper.c -#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c +#: 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/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c +#: range-diff.c revision.c #, c-format msgid "options '%s' and '%s' cannot be used together" msgstr "选项 '%s' 和 '%s' 不能同时使用" @@ -1040,6 +1064,14 @@ msgid "'%s' outside a repository" msgstr "'%s' 在仓库之外" #: apply.c +msgid "failed to read patch" +msgstr "无法读取补丁" + +#: apply.c +msgid "patch too large" +msgstr "补丁过大" + +#: apply.c #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" @@ -1444,6 +1476,11 @@ msgstr "截短 .rej 文件名为 %.*s.rej" msgid "cannot open %s" msgstr "不能打开 %s" +#: apply.c rerere.c +#, c-format +msgid "cannot unlink '%s'" +msgstr "不能删除 '%s'" + #: apply.c #, c-format msgid "Hunk #%d applied cleanly." @@ -1493,7 +1530,7 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修复空白错误后，应用了 %d 行。" msgstr[1] "修复空白错误后，应用了 %d 行。" -#: apply.c builtin/add.c builtin/mv.c builtin/rm.c +#: apply.c builtin/mv.c builtin/rm.c msgid "Unable to write new index file" msgstr "无法写入新索引文件" @@ -1681,6 +1718,11 @@ msgstr "git archive --remote <仓库> [--exec <命令>] --list" msgid "cannot read '%s'" msgstr "不能读取 '%s'" +#: archive.c +#, c-format +msgid "pathspec '%s' matches files outside the current directory" +msgstr "路径规格 '%s' 匹配了当前目录外的文件'" + #: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" @@ -1702,10 +1744,6 @@ msgid "not a tree object: %s" msgstr "不是一个树对象：%s" #: archive.c -msgid "current working directory is untracked" -msgstr "当前工作目录未被跟踪" - -#: archive.c #, c-format msgid "File not found: %s" msgstr "文件未找到：%s" @@ -1873,6 +1911,10 @@ msgstr "忽略过大的 gitattributes 文件 '%s'" msgid "ignoring overly large gitattributes blob '%s'" msgstr "忽略过大的 gitattributes 数据对象 '%s'" +#: attr.c +msgid "bad --attr-source or GIT_ATTR_SOURCE" +msgstr "错误的 --attr-source 或 GIT_ATTR_SOURCE" + #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" @@ -1997,16 +2039,12 @@ msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" #: blame.c -msgid "cannot use --contents with final commit object name" -msgstr "不能将 --contents 和最终的提交对象名共用" - -#: blame.c 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 ref-filter.c -#: remote.c sequencer.c submodule.c +#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c remote.c +#: sequencer.c submodule.c msgid "revision walk setup failed" msgstr "版本遍历初始化失败" @@ -2130,8 +2168,8 @@ msgstr "一个名为 '%s' 的分支已经存在" #: branch.c #, c-format -msgid "cannot force update the branch '%s' checked out at '%s'" -msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'" +msgid "cannot force update the branch '%s' used by worktree at '%s'" +msgstr "无法强制更新被工作区 '%2$s' 所使用的分支 '%1$s'" #: branch.c #, c-format @@ -2197,13 +2235,8 @@ msgstr "子模组 '%s'：不能创建分支 '%s'" #: branch.c #, c-format -msgid "'%s' is already checked out at '%s'" -msgstr "'%s' 已经检出到 '%s'" - -#: branch.c -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "工作区 %s 的 HEAD 指向没有被更新" +msgid "'%s' is already used by worktree at '%s'" +msgstr "'%s' 已经被工作区 '%s' 使用" #: builtin/add.c msgid "git add [<options>] [--] <pathspec>..." @@ -2215,20 +2248,6 @@ msgid "cannot chmod %cx '%s'" msgstr "不能 chmod %cx '%s'" #: builtin/add.c -#, c-format -msgid "unexpected diff status %c" -msgstr "意外的差异状态 %c" - -#: builtin/add.c builtin/commit.c -msgid "updating files failed" -msgstr "更新文件失败" - -#: builtin/add.c -#, c-format -msgid "remove '%s'\n" -msgstr "删除 '%s'\n" - -#: builtin/add.c msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" @@ -2240,30 +2259,26 @@ msgstr "" "设置 add.interactive.useBuiltin 已经被移除！\n" "查看 'git help config' 中的相关条目以获取更多信息。" -#: builtin/add.c builtin/rev-parse.c -msgid "Could not read the index" -msgstr "不能读取索引" - #: builtin/add.c -msgid "Could not write patch" -msgstr "不能生成补丁" +msgid "could not read the index" +msgstr "不能读取索引" #: builtin/add.c msgid "editing patch failed" msgstr "编辑补丁失败" -#: builtin/add.c +#: builtin/add.c read-cache.c #, c-format -msgid "Could not stat '%s'" +msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" #: builtin/add.c -msgid "Empty patch. Aborted." -msgstr "空补丁。异常终止。" +msgid "empty patch. aborted" +msgstr "空补丁。异常终止" #: builtin/add.c #, c-format -msgid "Could not apply '%s'" +msgid "could not apply '%s'" msgstr "不能应用 '%s'" #: builtin/add.c @@ -2422,6 +2437,11 @@ msgstr "" msgid "index file corrupt" msgstr "索引文件损坏" +#: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c +#: builtin/commit.c builtin/stash.c merge.c rerere.c +msgid "unable to write new index file" +msgstr "无法写新的索引文件" + #: builtin/am.c builtin/mailinfo.c mailinfo.c #, c-format msgid "bad action '%s' for '%s'" @@ -2472,7 +2492,7 @@ msgstr "fseek 失败" msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" -#: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c +#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" @@ -2671,11 +2691,6 @@ msgstr "" "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" "您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" -#: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c -#: rerere.c -msgid "unable to write new index file" -msgstr "无法写新的索引文件" - #: builtin/am.c builtin/reset.c #, c-format msgid "Could not parse object '%s'." @@ -2697,11 +2712,6 @@ msgid "failed to read '%s'" msgstr "无法读取 '%s'" #: builtin/am.c -#, c-format -msgid "options '%s=%s' and '%s=%s' cannot be used together" -msgstr "选项 '%s=%s' 和 '%s=%s' 不能同时使用" - -#: builtin/am.c msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" @@ -2755,10 +2765,6 @@ msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" #: builtin/am.c -msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" -msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" - -#: builtin/am.c msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" @@ -2908,11 +2914,9 @@ msgstr "git archive：应有一个 flush 包" #: builtin/bisect.c msgid "" -"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-" +"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>...]" @@ -2931,8 +2935,8 @@ msgid "git bisect replay <logfile>" msgstr "git bisect replay <日志文件>" #: builtin/bisect.c -msgid "git bisect run <cmd>..." -msgstr "git bisect run <命令>..." +msgid "git bisect run <cmd> [<arg>...]" +msgstr "git bisect run <命令> [<参数>...]" #: builtin/bisect.c #, c-format @@ -3447,37 +3451,37 @@ msgstr "git branch [<选项>] [-r | -a] [--format]" #, c-format msgid "" "deleting branch '%s' that has been merged to\n" -" '%s', but not yet merged to HEAD." +" '%s', but not yet merged to HEAD" msgstr "" "将要删除的分支 '%s' 已经被合并到\n" -" '%s'，但未合并到 HEAD。" +" '%s'，但未合并到 HEAD" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 #: builtin/branch.c #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" -" '%s', even though it is merged to HEAD." +" '%s', even though it is merged to HEAD" msgstr "" -"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" -" 然而却尚未被合并到分支 '%s' 。" +"并未删除分支 '%s'，虽然它已经合并到 HEAD，\n" +" 然而却尚未被合并到分支 '%s'" #: builtin/branch.c #, c-format -msgid "Couldn't look up commit object for '%s'" +msgid "couldn't look up commit object for '%s'" 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'." +"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'。" +"如果您确认要删除它，执行 'git branch -D %s'" #: builtin/branch.c -msgid "Update of config-file failed" +msgid "update of config-file failed" msgstr "更新配置文件失败" #: builtin/branch.c @@ -3486,18 +3490,27 @@ msgstr "不能将 -a 和 -d 同时使用" #: builtin/branch.c #, c-format -msgid "Cannot delete branch '%s' checked out at '%s'" -msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" +msgid "cannot delete branch '%s' used by worktree at '%s'" +msgstr "无法强制更新被工作区 '%2$s' 所使用的分支 '%1$s'" + +#: builtin/branch.c +#, c-format +msgid "remote-tracking branch '%s' not found" +msgstr "未能找到远程跟踪分支 '%s'" #: builtin/branch.c #, c-format -msgid "remote-tracking branch '%s' not found." -msgstr "未能找到远程跟踪分支 '%s'。" +msgid "" +"branch '%s' not found.\n" +"Did you forget --remote?" +msgstr "" +"分支 '%s' 未找到。\n" +"是否忘记指定 --remote 选项？" #: builtin/branch.c #, c-format -msgid "branch '%s' not found." -msgstr "分支 '%s' 未发现。" +msgid "branch '%s' not found" +msgstr "分支 '%s' 未发现" #: builtin/branch.c #, c-format @@ -3524,58 +3537,63 @@ msgstr "HEAD (%s) 指向 refs/heads/ 之外" #: builtin/branch.c #, c-format -msgid "Branch %s is being rebased at %s" +msgid "branch %s is being rebased at %s" msgstr "分支 %s 正被变基到 %s" #: builtin/branch.c #, c-format -msgid "Branch %s is being bisected at %s" +msgid "branch %s is being bisected at %s" msgstr "分支 %s 正被二分查找于 %s" #: builtin/branch.c #, c-format -msgid "Invalid branch name: '%s'" +msgid "HEAD of working tree %s is not updated" +msgstr "工作区 %s 的 HEAD 指向没有被更新" + +#: builtin/branch.c +#, c-format +msgid "invalid branch name: '%s'" msgstr "无效的分支名：'%s'" #: builtin/branch.c #, c-format -msgid "No commit on branch '%s' yet." -msgstr "分支 '%s' 尚无提交。" +msgid "no commit on branch '%s' yet" +msgstr "分支 '%s' 尚无提交" #: builtin/branch.c #, c-format -msgid "No branch named '%s'." -msgstr "没有分支 '%s'。" +msgid "no branch named '%s'" +msgstr "没有分支 '%s'" #: builtin/branch.c -msgid "Branch rename failed" +msgid "branch rename failed" msgstr "分支重命名失败" #: builtin/branch.c -msgid "Branch copy failed" +msgid "branch copy failed" msgstr "分支拷贝失败" #: builtin/branch.c #, c-format -msgid "Created a copy of a misnamed branch '%s'" +msgid "created a copy of a misnamed branch '%s'" msgstr "已为错误命名的分支 '%s' 创建了一个副本" #: builtin/branch.c #, c-format -msgid "Renamed a misnamed branch '%s' away" +msgid "renamed a misnamed branch '%s' away" msgstr "已将错误命名的分支 '%s' 重命名" #: builtin/branch.c #, c-format -msgid "Branch renamed to %s, but HEAD is not updated!" -msgstr "分支重命名为 %s，但 HEAD 没有更新！" +msgid "branch renamed to %s, but HEAD is not updated" +msgstr "分支重命名为 %s，但 HEAD 没有更新" #: builtin/branch.c -msgid "Branch is renamed, but update of config-file failed" +msgid "branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新配置文件失败" #: builtin/branch.c -msgid "Branch is copied, but update of config-file failed" +msgid "branch is copied, but update of config-file failed" msgstr "分支已拷贝，但更新配置文件失败" #: builtin/branch.c @@ -3661,6 +3679,10 @@ msgstr "移动/重命名一个分支，以及它的引用日志" msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支，即使目标已存在" +#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c +msgid "do not output a newline after empty formatted refs" +msgstr "在格式化引用结果为空之后，不输出换行符" + #: builtin/branch.c msgid "copy a branch and its reflog" msgstr "拷贝一个分支和它的引用日志" @@ -3722,9 +3744,9 @@ msgstr "在子模组中递归" msgid "format to use for the output" msgstr "输出格式" -#: builtin/branch.c builtin/submodule--helper.c submodule.c -msgid "Failed to resolve HEAD as a valid ref." -msgstr "无法将 HEAD 解析为有效引用。" +#: builtin/branch.c +msgid "failed to resolve HEAD as a valid ref" +msgstr "无法将 HEAD 解析为有效引用" #: builtin/branch.c builtin/clone.c msgid "HEAD not found below refs/heads!" @@ -3746,7 +3768,7 @@ msgid "branch name required" msgstr "必须提供分支名" #: builtin/branch.c -msgid "Cannot give description to detached HEAD" +msgid "cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" #: builtin/branch.c @@ -3754,12 +3776,12 @@ msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" #: builtin/branch.c -msgid "cannot copy the current branch while not on any." -msgstr "不处于任何分支上，无法拷贝当前分支。" +msgid "cannot copy the current branch while not on any" +msgstr "不处于任何分支上，无法拷贝当前分支" #: builtin/branch.c -msgid "cannot rename the current branch while not on any." -msgstr "不处于任何分支上，无法重命名当前分支。" +msgid "cannot rename the current branch while not on any" +msgstr "不处于任何分支上，无法重命名当前分支" #: builtin/branch.c msgid "too many branches for a copy operation" @@ -3776,8 +3798,8 @@ msgstr "为设置新上游提供了太多的参数" #: builtin/branch.c #, c-format msgid "" -"could not set upstream of HEAD to %s when it does not point to any branch." -msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。" +"could not set upstream of HEAD to %s when it does not point to any branch" +msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支" #: builtin/branch.c #, c-format @@ -3794,17 +3816,17 @@ msgid "too many arguments to unset upstream" msgstr "为取消上游设置操作提供了太多的参数" #: builtin/branch.c -msgid "could not unset upstream of HEAD when it does not point to any branch." +msgid "could not unset upstream of HEAD when it does not point to any branch" msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" #: builtin/branch.c #, c-format -msgid "Branch '%s' has no upstream information" +msgid "branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" #: builtin/branch.c msgid "" -"The -a, and -r, options to 'git branch' do not take a branch name.\n" +"the -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" msgstr "" "'git branch' 的 -a 和 -r 选项不带一个分支名。\n" @@ -3813,9 +3835,8 @@ msgstr "" #: builtin/branch.c msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " -"'--set-upstream-to' instead." -msgstr "" -"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" +"'--set-upstream-to' instead" +msgstr "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'" #: builtin/bugreport.c msgid "git version:\n" @@ -3898,6 +3919,11 @@ msgstr "指定错误报告文件的目标位置" msgid "specify a strftime format suffix for the filename(s)" msgstr "指定文件的 strftime 格式后缀" +#: builtin/bugreport.c +#, c-format +msgid "unknown argument `%s'" +msgstr "未知参数 `%s'" + #: builtin/bugreport.c builtin/diagnose.c #, c-format msgid "could not create leading directories for '%s'" @@ -3928,12 +3954,10 @@ msgstr "在 '%s' 创建了新报告。\n" #: builtin/bundle.c msgid "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<version>] <file> <git-rev-list-args>" msgstr "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<版本>] <文件> <git-rev-list-参数>" #: builtin/bundle.c @@ -3960,13 +3984,13 @@ msgstr "不显示进度表" msgid "show progress meter" msgstr "显示进度表" -#: builtin/bundle.c builtin/pack-objects.c -msgid "show progress meter during object writing phase" -msgstr "在对象写入阶段显示进度表" +#: builtin/bundle.c +msgid "historical; same as --progress" +msgstr "老的参数；等同于 --progress" -#: builtin/bundle.c builtin/pack-objects.c -msgid "similar to --all-progress when progress meter is shown" -msgstr "当进度表显示时类似于 --all-progress" +#: builtin/bundle.c +msgid "historical; does nothing" +msgstr "老的参数；无作用" #: builtin/bundle.c msgid "specify bundle format version" @@ -4039,23 +4063,23 @@ msgstr "git cat-file (-t | -s) [--allow-unknown-type] <对象>" #: builtin/cat-file.c msgid "" +"git cat-file (--textconv | --filters)\n" +" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]" +msgstr "" +"git cat-file (--textconv | --filters)\n" +" [<版本>:<路径|树对象> | --path=<路径|树对象> <版本>]" + +#: builtin/cat-file.c +msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters] [-z]" +" [--textconv | --filters] [-Z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters] [-z]" - -#: builtin/cat-file.c -msgid "" -"git cat-file (--textconv | --filters)\n" -" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]" -msgstr "" -"git cat-file (--textconv | --filters)\n" -" [<版本>:<路径|树对象> | --path=<路径|树对象> <版本>]" +" [--textconv | --filters] [-Z]" #: builtin/cat-file.c msgid "Check object existence or emit object contents" @@ -4106,6 +4130,10 @@ msgid "stdin is NUL-terminated" msgstr "标准输入以 NUL 字符分隔" #: builtin/cat-file.c +msgid "stdin and stdout is NUL-terminated" +msgstr "标准输入和标准输出以 NUL 字符分隔" + +#: builtin/cat-file.c msgid "read commands from stdin" msgstr "从标准输入读取命令" @@ -4430,6 +4458,11 @@ msgstr "'%s' 或 '%s' 不能和 %s 一起使用" #: builtin/checkout.c #, c-format +msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree" +msgstr "'%s'、'%s' 或 '%s' 不能在检出一个树时使用" + +#: builtin/checkout.c +#, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" @@ -5001,7 +5034,8 @@ msgid "remove whole directories" msgstr "删除整个目录" #: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c -#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c +#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c +#: ref-filter.h msgid "pattern" msgstr "模式" @@ -5113,7 +5147,7 @@ msgstr "检出 <分支> 而不是远程 HEAD" msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c +#: builtin/clone.c builtin/fetch.c builtin/pull.c msgid "depth" msgstr "深度" @@ -5171,14 +5205,6 @@ msgstr "server-specific" msgid "option to transmit" msgstr "传输选项" -#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c -msgid "use IPv4 addresses only" -msgstr "只使用 IPv4 地址" - -#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c -msgid "use IPv6 addresses only" -msgstr "只使用 IPv6 地址" - #: builtin/clone.c msgid "apply partial clone filters to submodules" msgstr "对子模组使用部分克隆过滤器" @@ -5216,6 +5242,11 @@ msgstr "%s 存在且不是一个目录" #: builtin/clone.c #, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "'%s' 为符号链接，拒绝用 --local 克隆" + +#: builtin/clone.c +#, c-format msgid "failed to start iterator over '%s'" msgstr "无法在 '%s' 上启动迭代器" @@ -5498,6 +5529,11 @@ msgstr "无法打开提交图形 '%s'" #: builtin/commit-graph.c #, c-format +msgid "could not open commit-graph chain '%s'" +msgstr "无法打开提交图形链 '%s'" + +#: builtin/commit-graph.c +#, c-format msgid "unrecognized --split argument, %s" msgstr "未能识别的 --split 参数，%s" @@ -5708,6 +5744,10 @@ msgstr "" " git cherry-pick --skip\n" "\n" +#: builtin/commit.c read-cache.c +msgid "updating files failed" +msgstr "更新文件失败" + #: builtin/commit.c msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" @@ -5733,10 +5773,6 @@ msgid "Failed to update main cache tree" msgstr "不能更新树的主缓存" #: builtin/commit.c -msgid "unable to write new_index file" -msgstr "无法写 new_index 文件" - -#: builtin/commit.c msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" @@ -5783,8 +5819,8 @@ msgstr "无法选择一个未被当前提交说明使用的注释字符" #: builtin/commit.c builtin/merge-tree.c #, c-format -msgid "could not lookup commit %s" -msgstr "不能查询提交 %s" +msgid "could not lookup commit '%s'" +msgstr "不能查询提交 '%s'" #: builtin/commit.c builtin/shortlog.c #, c-format @@ -6001,7 +6037,7 @@ msgstr "计算完整的领先/落后值" msgid "version" msgstr "版本" -#: builtin/commit.c builtin/push.c builtin/worktree.c +#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c msgid "machine-readable output" msgstr "机器可读的输出" @@ -6224,10 +6260,10 @@ msgstr "因提交说明的正文为空而终止提交。\n" #: builtin/commit.c msgid "" "repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full and quota is\n" +"new index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" -"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满或\n" +"仓库已更新，但无法写入索引文件。检查是否磁盘已满或\n" "磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。" #: builtin/config.c @@ -7076,147 +7112,17 @@ msgstr "git fetch --all [<选项>]" msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能为负数" -#: builtin/fetch.c builtin/pull.c -msgid "fetch from all remotes" -msgstr "从所有的远程抓取" - -#: builtin/fetch.c builtin/pull.c -msgid "set upstream for git pull/fetch" -msgstr "为 git pull/fetch 设置上游" - -#: builtin/fetch.c builtin/pull.c -msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" - -#: builtin/fetch.c -msgid "use atomic transaction to update references" -msgstr "使用原子事务更新引用" - -#: builtin/fetch.c builtin/pull.c -msgid "path to upload pack on remote end" -msgstr "上传包到远程的路径" - -#: builtin/fetch.c -msgid "force overwrite of local reference" -msgstr "强制覆盖本地引用" - -#: builtin/fetch.c -msgid "fetch from multiple remotes" -msgstr "从多个远程抓取" - -#: builtin/fetch.c builtin/pull.c -msgid "fetch all tags and associated objects" -msgstr "抓取所有的标签和关联对象" - -#: builtin/fetch.c -msgid "do not fetch all tags (--no-tags)" -msgstr "不抓取任何标签(--no-tags)" - -#: builtin/fetch.c -msgid "number of submodules fetched in parallel" -msgstr "子模组获取的并发数" - -#: builtin/fetch.c -msgid "modify the refspec to place all refs within refs/prefetch/" -msgstr "修改引用规格以将所有引用放入 refs/prefetch/" - -#: builtin/fetch.c builtin/pull.c -msgid "prune remote-tracking branches no longer on remote" -msgstr "清除远程已经不存在的分支的跟踪分支" - -#: builtin/fetch.c -msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "清除远程不存在的本地标签，并且替换变更标签" - -# 译者：可选值，不能翻译 -#: builtin/fetch.c builtin/pull.c -msgid "on-demand" -msgstr "on-demand" - -#: builtin/fetch.c -msgid "control recursive fetching of submodules" -msgstr "控制子模组的递归抓取" - -#: builtin/fetch.c -msgid "write fetched references to the FETCH_HEAD file" -msgstr "将获取到的引用写入 FETCH_HEAD 文件" - -#: builtin/fetch.c builtin/pull.c -msgid "keep downloaded pack" -msgstr "保持下载包" - -#: builtin/fetch.c -msgid "allow updating of HEAD ref" -msgstr "允许更新 HEAD 引用" - -#: builtin/fetch.c builtin/pull.c -msgid "deepen history of shallow clone" -msgstr "深化浅克隆的历史" - -#: builtin/fetch.c builtin/pull.c -msgid "deepen history of shallow repository based on time" -msgstr "基于时间来深化浅克隆的历史" - -#: builtin/fetch.c builtin/pull.c -msgid "convert to a complete repository" -msgstr "转换为一个完整的仓库" - -#: builtin/fetch.c -msgid "re-fetch without negotiating common commits" -msgstr "不协商共有提交重新获取" - -#: builtin/fetch.c -msgid "prepend this to submodule path output" -msgstr "在子模组路径输出的前面加上此目录" - -#: builtin/fetch.c -msgid "" -"default for recursive fetching of submodules (lower priority than config " -"files)" -msgstr "递归获取子模组的缺省值（比配置文件优先级低）" - -#: builtin/fetch.c builtin/pull.c -msgid "accept refs that update .git/shallow" -msgstr "接受更新 .git/shallow 的引用" - -#: builtin/fetch.c builtin/pull.c -msgid "refmap" -msgstr "引用映射" - -#: builtin/fetch.c builtin/pull.c -msgid "specify fetch refmap" -msgstr "指定获取操作的引用映射" - -#: builtin/fetch.c builtin/pull.c -msgid "report that we have only objects reachable from this object" -msgstr "报告我们只拥有从该对象开始可达的对象" - -#: builtin/fetch.c -msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "不获取包文件；而是打印协商的祖先提交" - -#: builtin/fetch.c -msgid "run 'maintenance --auto' after fetching" -msgstr "获取后执行 'maintenance --auto'" - -#: builtin/fetch.c builtin/pull.c -msgid "check for forced-updates on all updated branches" -msgstr "在所有更新分支上检查强制更新" - -#: builtin/fetch.c -msgid "write the commit-graph after fetching" -msgstr "抓取后写提交图" - -#: builtin/fetch.c -msgid "accept refspecs from stdin" -msgstr "从标准输入获取引用规格" - #: builtin/fetch.c msgid "couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" #: builtin/fetch.c #, c-format +msgid "From %.*s\n" +msgstr "来自 %.*s\n" + +#: builtin/fetch.c +#, c-format msgid "object %s not found" msgstr "对象 %s 未发现" @@ -7302,11 +7208,6 @@ msgstr "拒绝 %s 因为浅克隆的根不允许被更新" #: builtin/fetch.c #, c-format -msgid "From %.*s\n" -msgstr "来自 %.*s\n" - -#: builtin/fetch.c -#, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" @@ -7415,6 +7316,141 @@ msgstr "未指定远程仓库；请指定一个用于获取新版本的 URL 或 msgid "you need to specify a tag name" msgstr "您需要指定一个标签名称" +#: builtin/fetch.c builtin/pull.c +msgid "fetch from all remotes" +msgstr "从所有远程抓取" + +#: builtin/fetch.c builtin/pull.c +msgid "set upstream for git pull/fetch" +msgstr "为 git pull/fetch 设置上游" + +#: builtin/fetch.c builtin/pull.c +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" + +#: builtin/fetch.c +msgid "use atomic transaction to update references" +msgstr "使用原子事务更新引用" + +#: builtin/fetch.c builtin/pull.c +msgid "path to upload pack on remote end" +msgstr "上传包到远程的路径" + +#: builtin/fetch.c +msgid "force overwrite of local reference" +msgstr "强制覆盖本地引用" + +#: builtin/fetch.c +msgid "fetch from multiple remotes" +msgstr "从多个远程抓取" + +#: builtin/fetch.c builtin/pull.c +msgid "fetch all tags and associated objects" +msgstr "抓取所有的标签和关联对象" + +#: builtin/fetch.c +msgid "do not fetch all tags (--no-tags)" +msgstr "不抓取任何标签（--no-tags）" + +#: builtin/fetch.c +msgid "number of submodules fetched in parallel" +msgstr "获取子模组的并发数" + +#: builtin/fetch.c +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "修改引用规格以将所有引用放入 refs/prefetch/" + +#: builtin/fetch.c builtin/pull.c +msgid "prune remote-tracking branches no longer on remote" +msgstr "清除远程已经不存在的分支的跟踪分支" + +#: builtin/fetch.c +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "清除远程不存在的本地标签，并且替换变更标签" + +# 译者：可选值，不能翻译 +#: builtin/fetch.c builtin/pull.c +msgid "on-demand" +msgstr "on-demand" + +#: builtin/fetch.c +msgid "control recursive fetching of submodules" +msgstr "控制子模组的递归抓取" + +#: builtin/fetch.c +msgid "write fetched references to the FETCH_HEAD file" +msgstr "将获取到的引用写入 FETCH_HEAD 文件" + +#: builtin/fetch.c builtin/pull.c +msgid "keep downloaded pack" +msgstr "保持已下载的包" + +#: builtin/fetch.c +msgid "allow updating of HEAD ref" +msgstr "允许更新 HEAD 引用" + +#: builtin/fetch.c builtin/pull.c +msgid "deepen history of shallow clone" +msgstr "深化浅克隆的历史" + +#: builtin/fetch.c builtin/pull.c +msgid "deepen history of shallow repository based on time" +msgstr "基于时间来深化浅克隆的历史" + +#: builtin/fetch.c builtin/pull.c +msgid "convert to a complete repository" +msgstr "转换为一个完整的仓库" + +#: builtin/fetch.c +msgid "re-fetch without negotiating common commits" +msgstr "重新获取而不协商共同提交" + +#: builtin/fetch.c +msgid "prepend this to submodule path output" +msgstr "在子模组路径输出的前面加上此目录" + +#: builtin/fetch.c +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "递归获取子模组的缺省值（比配置文件优先级低）" + +#: builtin/fetch.c builtin/pull.c +msgid "accept refs that update .git/shallow" +msgstr "接受更新 .git/shallow 的引用" + +#: builtin/fetch.c builtin/pull.c +msgid "refmap" +msgstr "引用映射" + +#: builtin/fetch.c builtin/pull.c +msgid "specify fetch refmap" +msgstr "指定获取操作的引用映射" + +#: builtin/fetch.c builtin/pull.c +msgid "report that we have only objects reachable from this object" +msgstr "报告我们只拥有从该对象开始可达的对象" + +#: builtin/fetch.c +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "不获取包文件；而是打印协商的祖先提交" + +#: builtin/fetch.c +msgid "run 'maintenance --auto' after fetching" +msgstr "获取后执行 'maintenance --auto'" + +#: builtin/fetch.c builtin/pull.c +msgid "check for forced-updates on all updated branches" +msgstr "在所有更新分支上检查强制更新" + +#: builtin/fetch.c +msgid "write the commit-graph after fetching" +msgstr "抓取后写提交图" + +#: builtin/fetch.c +msgid "accept refspecs from stdin" +msgstr "从标准输入获取引用规格" + #: builtin/fetch.c msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only 需要一个或多个 --negotiation-tip=*" @@ -7560,6 +7596,14 @@ msgstr "只打印包含该提交的引用" msgid "print only refs which don't contain the commit" msgstr "只打印不包含该提交的引用" +#: builtin/for-each-ref.c +msgid "read reference patterns from stdin" +msgstr "从标准输入读取引用的模式" + +#: builtin/for-each-ref.c +msgid "unknown arguments supplied with --stdin" +msgstr "为 --stdin 提供了未知的命令参数" + #: builtin/for-each-repo.c msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<配置> [--] <命令参数>" @@ -7576,6 +7620,11 @@ msgstr "存储着仓库路径列表的配置项键名" msgid "missing --config=<config>" msgstr "缺少 --config=<配置>" +#: builtin/for-each-repo.c +#, c-format +msgid "got bad config --config=%s" +msgstr "发现错误的配置行 --config=%s" + #: builtin/fsck.c msgid "unknown" msgstr "未知" @@ -7761,13 +7810,14 @@ msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一个尚未诞生的分支（%s）" #: builtin/fsck.c -msgid "Checking cache tree" -msgstr "正在检查缓存树" +#, c-format +msgid "Checking cache tree of %s" +msgstr "正在检查缓存树 %s" #: builtin/fsck.c #, c-format -msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "%s：cache-tree 中无效的 sha1 指针" +msgid "%s: invalid sha1 pointer in cache-tree of %s" +msgstr "%s：cache-tree %s 中存在无效的 sha1 指针" #: builtin/fsck.c msgid "non-tree in cache-tree" @@ -7775,8 +7825,18 @@ msgstr "cache-tree 中非树对象" #: builtin/fsck.c #, c-format -msgid "%s: invalid sha1 pointer in resolve-undo" -msgstr "%s：resolve-undo 中无效的 sha1 指针" +msgid "%s: invalid sha1 pointer in resolve-undo of %s" +msgstr "%s：resolve-undo %s 中存在无效的 sha1 指针" + +#: builtin/fsck.c +#, c-format +msgid "unable to load rev-index for pack '%s'" +msgstr "无法为包文件 %s 加载反向索引" + +#: builtin/fsck.c +#, c-format +msgid "invalid rev-index for pack '%s'" +msgstr "包文件 '%s' 的反向索引文件无效" #: builtin/fsck.c msgid "" @@ -7983,7 +8043,7 @@ msgstr "对 %s 调用 fstat 失败：%s" msgid "failed to parse '%s' value '%s'" msgstr "无法解析 '%s' 值 '%s'" -#: builtin/gc.c builtin/init-db.c +#: builtin/gc.c setup.c #, c-format msgid "cannot stat '%s'" msgstr "不能对 '%s' 调用 stat" @@ -8010,6 +8070,10 @@ msgstr "清除未引用的对象" msgid "pack unreferenced objects separately" msgstr "分开打包未引用的对象" +#: builtin/gc.c builtin/repack.c +msgid "with --cruft, limit the size of new cruft packs" +msgstr "使用 --cruft，限制新 cruft 包的总大小" + #: builtin/gc.c msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" @@ -8225,14 +8289,6 @@ msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'" msgid "'crontab' died" msgstr "'crontab' 终止" -#: builtin/gc.c -msgid "failed to start systemctl" -msgstr "无法启动 systemctl" - -#: builtin/gc.c -msgid "failed to run systemctl" -msgstr "无法运行 systemctl" - #: builtin/gc.c builtin/worktree.c #, c-format msgid "failed to delete '%s'" @@ -8244,6 +8300,14 @@ msgid "failed to flush '%s'" msgstr "无法刷新 '%s'" #: builtin/gc.c +msgid "failed to start systemctl" +msgstr "无法启动 systemctl" + +#: builtin/gc.c +msgid "failed to run systemctl" +msgstr "无法运行 systemctl" + +#: builtin/gc.c #, c-format msgid "unrecognized --scheduler argument '%s'" msgstr "无法识别的 --scheduler 参数 '%s'" @@ -8274,6 +8338,10 @@ msgid "scheduler to trigger git maintenance run" msgstr "触发 git maintenance 执行的调度器" #: builtin/gc.c +msgid "failed to set up maintenance schedule" +msgstr "无法设置维护计划" + +#: builtin/gc.c msgid "failed to add repo to global config" msgstr "无法将仓库添加到全局配置" @@ -8369,8 +8437,8 @@ msgid "search in subdirectories (default)" msgstr "在子目录中寻找（默认）" #: builtin/grep.c -msgid "descend at most <depth> levels" -msgstr "最多以指定的深度向下寻找" +msgid "descend at most <n> levels" +msgstr "最多向下寻找 <n> 层" #: builtin/grep.c msgid "use extended POSIX regular expressions" @@ -8994,7 +9062,7 @@ msgstr "无法返回当前工作目录" msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c builtin/init-db.c +#: builtin/index-pack.c builtin/init-db.c setup.c #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的哈希算法 '%s'" @@ -9012,95 +9080,6 @@ msgid "fsck error in pack objects" msgstr "在打包对象中 fsck 检查出错" #: builtin/init-db.c -#, c-format -msgid "cannot stat template '%s'" -msgstr "不能对模版 '%s' 调用 stat" - -#: builtin/init-db.c -#, c-format -msgid "cannot opendir '%s'" -msgstr "不能打开目录 '%s'" - -#: builtin/init-db.c -#, c-format -msgid "cannot readlink '%s'" -msgstr "不能读取链接 '%s'" - -#: builtin/init-db.c -#, c-format -msgid "cannot symlink '%s' '%s'" -msgstr "不能自 '%s' 到 '%s' 创建符号链接" - -#: builtin/init-db.c -#, c-format -msgid "cannot copy '%s' to '%s'" -msgstr "不能拷贝 '%s' 至 '%s'" - -#: builtin/init-db.c -#, c-format -msgid "ignoring template %s" -msgstr "忽略模版 %s" - -#: builtin/init-db.c -#, c-format -msgid "templates not found in %s" -msgstr "没有在 %s 中找到模版" - -#: builtin/init-db.c -#, c-format -msgid "not copying templates from '%s': %s" -msgstr "没有从 '%s' 复制模版：%s" - -#: builtin/init-db.c -#, c-format -msgid "invalid initial branch name: '%s'" -msgstr "无效的初始分支名：'%s'" - -#: builtin/init-db.c -#, c-format -msgid "unable to handle file type %d" -msgstr "不能处理 %d 类型的文件" - -#: builtin/init-db.c -#, c-format -msgid "unable to move %s to %s" -msgstr "不能移动 %s 至 %s" - -#: builtin/init-db.c -msgid "attempt to reinitialize repository with different hash" -msgstr "尝试用不同的哈希算法重新初始化仓库" - -#: builtin/init-db.c -#, c-format -msgid "%s already exists" -msgstr "%s 已经存在" - -#: builtin/init-db.c -#, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "re-init：已忽略 --initial-branch=%s" - -#: builtin/init-db.c -#, c-format -msgid "Reinitialized existing shared Git repository in %s%s\n" -msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" - -#: builtin/init-db.c -#, c-format -msgid "Reinitialized existing Git repository in %s%s\n" -msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n" - -#: builtin/init-db.c -#, c-format -msgid "Initialized empty shared Git repository in %s%s\n" -msgstr "已初始化空的共享 Git 仓库于 %s%s\n" - -#: builtin/init-db.c -#, c-format -msgid "Initialized empty Git repository in %s%s\n" -msgstr "已初始化空的 Git 仓库于 %s%s\n" - -#: builtin/init-db.c msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" " [--separate-git-dir <git-dir>] [--object-format=<format>]\n" @@ -9161,11 +9140,11 @@ msgstr "--separate-git-dir 不能用于纯仓库" #: builtin/interpret-trailers.c msgid "" "git interpret-trailers [--in-place] [--trim-empty]\n" -" [(--trailer <token>[(=|:)<value>])...]\n" +" [(--trailer (<key>|<keyAlias>)[(=|:)<value>])...]\n" " [--parse] [<file>...]" msgstr "" "git interpret-trailers [--in-place] [--trim-empty]\n" -" [(--trailer <键>[(=|:)<值>])...]\n" +" [(--trailer (<键|键别名>)[(=|:)<值>])...]\n" " [--parse] [<文件>...]" #: builtin/interpret-trailers.c @@ -9177,6 +9156,10 @@ msgid "trim empty trailers" msgstr "删除空的尾注" #: builtin/interpret-trailers.c +msgid "placement" +msgstr "安置" + +#: builtin/interpret-trailers.c msgid "where to place the new trailer" msgstr "在哪里放置新的尾注" @@ -9193,20 +9176,20 @@ msgid "output only the trailers" msgstr "只输出尾注" #: builtin/interpret-trailers.c -msgid "do not apply config rules" -msgstr "不要应用配置规则" +msgid "do not apply trailer.* configuration variables" +msgstr "不应用 trailer.* 配置变量" #: builtin/interpret-trailers.c -msgid "join whitespace-continued values" -msgstr "连接空白折行的值" +msgid "reformat multiline trailer values as single-line values" +msgstr "将多行尾注值重新格式化为单行值" #: builtin/interpret-trailers.c -msgid "set parsing options" -msgstr "设置解析选项" +msgid "alias for --only-trailers --only-input --unfold" +msgstr "--only-trailers --only-input --unfold 的别名" #: builtin/interpret-trailers.c -msgid "do not treat --- specially" -msgstr "不要对 --- 特殊处理" +msgid "do not treat \"---\" as the end of input" +msgstr "不要将 \"---\" 视为输入的结束" #: builtin/interpret-trailers.c msgid "trailer(s) to add" @@ -9319,6 +9302,11 @@ msgid "not a range" msgstr "不是一个范围" #: builtin/log.c +#, c-format +msgid "unable to read branch description file '%s'" +msgstr "无法读取分支描述文件 '%s'" + +#: builtin/log.c msgid "cover letter needs email format" msgstr "附函需要邮件地址格式" @@ -9445,6 +9433,10 @@ msgid "generate parts of a cover letter based on a branch's description" msgstr "基于一个分支描述生成部分附函" #: builtin/log.c +msgid "use branch description from file" +msgstr "使用来自文件的分支描述" + +#: builtin/log.c msgid "use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" @@ -9647,6 +9639,11 @@ msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" +#: builtin/ls-files.c builtin/ls-tree.c +#, c-format +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 '('" @@ -9834,11 +9831,6 @@ msgstr "git ls-tree [<选项>] <树对象> [<路径>...]" #: builtin/ls-tree.c #, c-format -msgid "could not get object info about '%s'" -msgstr "无法获得关于 '%s' 的对象信息" - -#: builtin/ls-tree.c -#, c-format msgid "bad ls-tree format: element '%s' does not start with '('" msgstr "坏的 ls-tree 格式：元素 '%s' 没有以 '(' 开头" @@ -10003,6 +9995,10 @@ msgid "send results to standard output" msgstr "将结果发送到标准输出" #: builtin/merge-file.c +msgid "use object IDs instead of filenames" +msgstr "使用对象 ID 替换文件名" + +#: builtin/merge-file.c msgid "use a diff3 based merge" msgstr "使用基于 diff3 的合并" @@ -10034,6 +10030,15 @@ msgstr "不要警告冲突" msgid "set labels for file1/orig-file/file2" msgstr "为 文件1/初始文件/文件2 设置标签" +#: builtin/merge-file.c +#, c-format +msgid "object '%s' does not exist" +msgstr "对象 '%s' 不存在" + +#: builtin/merge-file.c +msgid "Could not write object file" +msgstr "不能写入对象文件" + #: builtin/merge-recursive.c #, c-format msgid "unknown option %s" @@ -10113,10 +10118,23 @@ msgstr "实施多个合并，每输入行一个" msgid "specify a merge-base for the merge" msgstr "指定用于合并的合并基线" +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c +msgid "option=value" +msgstr "option=value" + +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c +msgid "option for selected merge strategy" +msgstr "所选的合并策略的选项" + #: builtin/merge-tree.c msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge 与其他所有选项不兼容" +#: builtin/merge-tree.c builtin/merge.c +#, c-format +msgid "unknown strategy option: -X%s" +msgstr "未知的策略选项：-X%s" + #: builtin/merge-tree.c msgid "--merge-base is incompatible with --stdin" msgstr "--merge-base 与 --stdin 不兼容" @@ -10208,14 +10226,6 @@ msgstr "策略" msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c builtin/pull.c -msgid "option=value" -msgstr "option=value" - -#: builtin/merge.c builtin/pull.c -msgid "option for selected merge strategy" -msgstr "所选的合并策略的选项" - #: builtin/merge.c msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" @@ -10294,11 +10304,6 @@ msgstr "不能写入索引。" msgid "Not handling anything other than two heads merge." msgstr "未处理两个头合并之外的任何操作。" -#: builtin/merge.c -#, c-format -msgid "unknown strategy option: -X%s" -msgstr "未知的策略选项：-X%s" - #: builtin/merge.c t/helper/test-fast-rebase.c #, c-format msgid "unable to write %s" @@ -10371,7 +10376,7 @@ msgstr "对于 %s 没有来自 %s 的远程跟踪分支" msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" -#: builtin/merge.c read-cache.c strbuf.c wrapper.c +#: builtin/merge.c editor.c read-cache.c wrapper.c #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" @@ -10657,8 +10662,8 @@ msgid "can not move directory into itself" msgstr "不能将目录移动到自身" #: builtin/mv.c -msgid "cannot move directory over file" -msgstr "不能将目录移动到文件" +msgid "destination already exists" +msgstr "目标已存在" #: builtin/mv.c msgid "source directory is empty" @@ -10762,11 +10767,13 @@ msgstr "git notes [--ref <注解引用>] [list [<对象>]]" #: builtin/notes.c msgid "" -"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " -"| (-c | -C) <object>] [<object>]" +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--" +"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c " +"| -C) <object>] [<object>]" msgstr "" -"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " -"| (-c | -C) <对象>] [<对象>]" +"git notes [--ref <注解引用>] add [-f] [--allow-empty] [--[no-]separator|--" +"separator=<分段符>] [--[no-]stripspace] [-m <说明> | -F <文件> | (-c | -C) <" +"对象>] [<对象>]" #: builtin/notes.c msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" @@ -10774,11 +10781,13 @@ msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" #: builtin/notes.c msgid "" -"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " -"(-c | -C) <object>] [<object>]" +"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--" +"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c " +"| -C) <object>] [<object>]" msgstr "" -"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " -"(-c | -C) <对象>] [<对象>]" +"git notes [--ref <注解引用>] append [--allow-empty] [--[no-]separator|--" +"separator=<分段符>] [--[no-]stripspace] [-m <说明> | -F <文件> | (-c | -C) <" +"对象>] [<对象>]" #: builtin/notes.c msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" @@ -10947,6 +10956,18 @@ msgid "replace existing notes" msgstr "替换已存在的注解" #: builtin/notes.c +msgid "<paragraph-break>" +msgstr "<分段符>" + +#: builtin/notes.c +msgid "insert <paragraph-break> between paragraphs" +msgstr "在段落之间插入<分段符>" + +#: builtin/notes.c +msgid "remove unnecessary whitespace" +msgstr "删除不必要的空白字符" + +#: builtin/notes.c #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11204,7 +11225,7 @@ msgstr "无法写入位图索引" msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" -#: builtin/pack-objects.c +#: builtin/pack-objects.c builtin/repack.c msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" @@ -11371,6 +11392,14 @@ msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" #: builtin/pack-objects.c +msgid "show progress meter during object writing phase" +msgstr "在对象写入阶段显示进度表" + +#: builtin/pack-objects.c +msgid "similar to --all-progress when progress meter is shown" +msgstr "当进度表显示时类似于 --all-progress" + +#: builtin/pack-objects.c msgid "<version>[,<offset>]" msgstr "<版本>[,<偏移>]" @@ -11562,10 +11591,6 @@ msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用于创建一个可索引包" #: builtin/pack-objects.c -msgid "cannot use --filter without --stdout" -msgstr "不能在没有 --stdout 的情况下使用 --filter" - -#: builtin/pack-objects.c msgid "cannot use --filter with --stdin-packs" msgstr "不能同时使用 --filter 和 --stdin-packs" @@ -11582,10 +11607,6 @@ msgid "cannot use --stdin-packs with --cruft" msgstr "不能将 --stdin-packs 和 --cruft 同时使用" #: builtin/pack-objects.c -msgid "cannot use --max-pack-size with --cruft" -msgstr "不能将 --max-pack-size 和 --cruft 同时使用" - -#: builtin/pack-objects.c msgid "Enumerating objects" msgstr "枚举对象中" @@ -11611,9 +11632,16 @@ msgstr "" "并通过发送邮件到 <git@vger.kernel.org> 让我们知道您仍旧\n" "使用它。 谢谢。\n" +#: builtin/pack-redundant.c +msgid "refusing to run without --i-still-use-this" +msgstr "拒绝在未指定 --i-still-use-this 选项时运行" + #: builtin/pack-refs.c -msgid "git pack-refs [--all] [--no-prune]" -msgstr "git pack-refs [--all] [--no-prune]" +msgid "" +"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude " +"<pattern>]" +msgstr "" +"git pack-refs [--all] [--no-prune] [--include <模式>] [--exclude <模式>]" #: builtin/pack-refs.c msgid "pack everything" @@ -11623,6 +11651,14 @@ msgstr "打包一切" msgid "prune loose refs (default)" msgstr "清除松散的引用（默认）" +#: builtin/pack-refs.c +msgid "references to include" +msgstr "需包含的引用" + +#: builtin/pack-refs.c +msgid "references to exclude" +msgstr "需排除的引用" + #: builtin/patch-id.c msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--stable | --unstable | --verbatim]" @@ -11699,6 +11735,14 @@ msgstr "强制覆盖本地分支" msgid "number of submodules pulled in parallel" msgstr "并发拉取的子模组的数量" +#: builtin/pull.c parse-options.h +msgid "use IPv4 addresses only" +msgstr "只使用 IPv4 地址" + +#: builtin/pull.c parse-options.h +msgid "use IPv6 addresses only" +msgstr "只使用 IPv6 地址" + #: builtin/pull.c msgid "" "There is no candidate for rebasing against among the refs that you just " @@ -11812,9 +11856,9 @@ msgstr "更新尚未诞生的分支，变更添加至索引。" msgid "pull with rebase" msgstr "变基式拉取" -#: builtin/pull.c -msgid "please commit or stash them." -msgstr "请提交或贮藏它们。" +#: builtin/pull.c builtin/rebase.c +msgid "Please commit or stash them." +msgstr "请提交或贮藏修改。" #: builtin/pull.c #, c-format @@ -11980,36 +12024,36 @@ msgstr "" #: builtin/push.c msgid "" "Updates were rejected because the tip of your current branch is behind\n" -"its remote counterpart. Integrate the remote changes (e.g.\n" -"'git pull ...') before pushing again.\n" +"its remote counterpart. If you want to integrate the remote changes,\n" +"use 'git pull' before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n" -"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n" -"'git push --help' 中的 'Note about fast-forwards' 小节。" +"如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n" +"详见 'git push --help' 中的 'Note about fast-forwards' 小节。" #: builtin/push.c msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" -"counterpart. Check out this branch and integrate the remote changes\n" -"(e.g. 'git pull ...') before pushing again.\n" +"counterpart. If you want to integrate the remote changes, use 'git pull'\n" +"before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n" -"检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n" -"'git push --help' 中的 'Note about fast-forwards' 小节。" +"如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n" +"详见 'git push --help' 中的 'Note about fast-forwards' 小节。" #: builtin/push.c msgid "" -"Updates were rejected because the remote contains work that you do\n" -"not have locally. This is usually caused by another repository pushing\n" -"to the same ref. You may want to first integrate the remote changes\n" -"(e.g., 'git pull ...') before pushing again.\n" +"Updates were rejected because the remote contains work that you do not\n" +"have locally. This is usually caused by another repository pushing to\n" +"the same ref. If you want to integrate the remote changes, use\n" +"'git pull' before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒绝，因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" -"一个仓库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n" -"（如 'git pull ...'）。\n" +"一个仓库已向该引用进行了推送。如果您希望先与远程变更合并，请在推送\n" +"前执行 'git pull'。\n" "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" #: builtin/push.c @@ -12027,13 +12071,14 @@ msgstr "" #: builtin/push.c msgid "" -"Updates were rejected because the tip of the remote-tracking\n" -"branch has been updated since the last checkout. You may want\n" -"to integrate those changes locally (e.g., 'git pull ...')\n" -"before forcing an update.\n" +"Updates were rejected because the tip of the remote-tracking branch has\n" +"been updated since the last checkout. If you want to integrate the\n" +"remote changes, use 'git pull' before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒绝，因为远程跟踪分支的最新提交自从上次检出之后已被更新。\n" -"在强制更新前，您可能想将这些变更整合到本地（如 'git pull ...'）。\n" +"如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n" +"详见 'git push --help' 中的 'Note about fast-forwards' 小节。" #: builtin/push.c #, c-format @@ -12061,9 +12106,9 @@ msgstr "'%s' 的值无效" msgid "repository" msgstr "仓库" -#: builtin/push.c builtin/send-pack.c -msgid "push all refs" -msgstr "推送所有引用" +#: builtin/push.c +msgid "push all branches" +msgstr "推送所有分支" #: builtin/push.c builtin/send-pack.c msgid "mirror all refs" @@ -12074,8 +12119,8 @@ msgid "delete refs" msgstr "删除引用" #: builtin/push.c -msgid "push tags (can't be used with --all or --mirror)" -msgstr "推送标签（不能使用 --all or --mirror）" +msgid "push tags (can't be used with --all or --branches or --mirror)" +msgstr "推送标签（不能使用 --all or --branches or --mirror）" #: builtin/push.c builtin/send-pack.c msgid "force updates" @@ -12399,6 +12444,11 @@ msgstr "" #: builtin/rebase.c #, c-format +msgid "Unknown rebase-merges mode: %s" +msgstr "未知的变基合并模式：%s" + +#: builtin/rebase.c +#, c-format msgid "could not switch to %s" msgstr "无法切换到 %s" @@ -12414,6 +12464,16 @@ msgid "" msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"ask\"。" #: builtin/rebase.c +msgid "" +"--rebase-merges with an empty string argument is deprecated and will stop " +"working in a future version of Git. Use --rebase-merges without an argument " +"instead, which does the same thing." +msgstr "" +"为 --rebase-merges 指定空值参数的方式已经被废弃并且在 Git 未来\n" +"的版本中将不再支持。 支持使用无参数 --rebase-merges 的方式进行替\n" +"代，它们具有相同的作用。" + +#: builtin/rebase.c #, c-format msgid "" "%s\n" @@ -12676,19 +12736,16 @@ msgid "switch `C' expects a numerical value" msgstr "开关 `C' 期望一个数字值" #: builtin/rebase.c -#, c-format -msgid "Unknown mode: %s" -msgstr "未知模式：%s" - -#: builtin/rebase.c -msgid "--strategy requires --merge or --interactive" -msgstr "--strategy 需要 --merge 或 --interactive" +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.autosquash. Consider adding --no-" -"autosquash" -msgstr "应用的选项与 rebase.autosquash 不兼容。考虑加上 --no-autosquash" +"apply options are incompatible with rebase.rebaseMerges. Consider adding --" +"no-rebase-merges" +msgstr "应用的选项与 rebase.rebaseMerges 不兼容。考虑加上 --no-rebase-merges" #: builtin/rebase.c msgid "" @@ -12744,10 +12801,6 @@ msgid "Does not point to a valid commit '%s'" msgstr "没有指向一个有效的提交 '%s'" #: builtin/rebase.c -msgid "Please commit or stash them." -msgstr "请提交或贮藏修改。" - -#: builtin/rebase.c msgid "HEAD is up to date." msgstr "HEAD 是最新的。" @@ -13050,12 +13103,10 @@ msgid "fetch the remote branches" msgstr "抓取远程的分支" #: builtin/remote.c -msgid "import all tags and associated objects when fetching" -msgstr "抓取时导入所有的标签和关联对象" - -#: builtin/remote.c -msgid "or do not fetch any tag at all (--no-tags)" -msgstr "或不抓取任何标签（--no-tags）" +msgid "" +"import all tags and associated objects when fetching\n" +"or do not fetch any tag at all (--no-tags)" +msgstr "抓取时导入所有的标签和关联对象，或不抓取任何标签（--no-tags）" #: builtin/remote.c msgid "branch(es) to track" @@ -13533,6 +13584,11 @@ msgid "could not remove stale bitmap: %s" msgstr "无法删除过期的位图： %s" #: builtin/repack.c +#, c-format +msgid "pack prefix %s does not begin with objdir %s" +msgstr "包前缀 %s 没有以对象目录 %s 开始" + +#: builtin/repack.c msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件中" @@ -13549,8 +13605,8 @@ msgid "approxidate" msgstr "近似日期" #: builtin/repack.c -msgid "with -C, expire objects older than this" -msgstr "使用 -C，使早于给定时间的对象过期" +msgid "with --cruft, expire objects older than this" +msgstr "使用 --cruft，使早于给定时间的对象过期" #: builtin/repack.c msgid "remove redundant packs, and run git-prune-packed" @@ -13633,17 +13689,21 @@ msgid "pack prefix to store a pack containing pruned objects" msgstr "储存被清除的对象的包的前缀" #: builtin/repack.c +msgid "pack prefix to store a pack containing filtered out objects" +msgstr "储存被过滤的对象的包的前缀" + +#: builtin/repack.c msgid "cannot delete packs in a precious-objects repo" msgstr "不能删除珍品仓库中的打包文件" #: builtin/repack.c -msgid "Nothing new to pack." -msgstr "没有新的要打包。" +#, c-format +msgid "option '%s' can only be used along with '%s'" +msgstr "选项 '%s' 只能和 '%s' 搭配使用" #: builtin/repack.c -#, c-format -msgid "pack prefix %s does not begin with objdir %s" -msgstr "包前缀 %s 没有以对象目录 .%s 开始" +msgid "Nothing new to pack." +msgstr "没有新的要打包。" #: builtin/repack.c #, c-format @@ -14172,6 +14232,10 @@ msgid "this operation must be run in a work tree" msgstr "该操作必须在一个工作区中运行" #: builtin/rev-parse.c +msgid "Could not read the index" +msgstr "不能读取索引" + +#: builtin/rev-parse.c #, c-format msgid "unknown mode for --show-object-format: %s" msgstr "未知的 --show-object-format 模式：%s" @@ -14382,6 +14446,10 @@ msgid "remote name" msgstr "远程名称" #: builtin/send-pack.c +msgid "push all refs" +msgstr "推送所有引用" + +#: builtin/send-pack.c msgid "use stateless RPC protocol" msgstr "使用无状态的 RPC 协议" @@ -14592,19 +14660,41 @@ msgstr "未知的哈希算法" #: builtin/show-ref.c msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +"git show-ref [--head] [-d | --dereference]\n" " [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" " [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +"git show-ref [--head] [-d | --dereference]\n" " [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" " [--heads] [--] [<模式>...]" #: builtin/show-ref.c +msgid "" +"git show-ref --verify [-q | --quiet] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]]\n" +" [--] [<ref>...]" +msgstr "" +"git show-ref --verify [-q | --quiet] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]]\n" +" [--] [<引用>...]" + +#: builtin/show-ref.c msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<模式>]" #: builtin/show-ref.c +msgid "git show-ref --exists <ref>" +msgstr "git show-ref --exists <引用>" + +#: builtin/show-ref.c +msgid "reference does not exist" +msgstr "引用不存在" + +#: builtin/show-ref.c +msgid "failed to look up reference" +msgstr "无法找到引用" + +#: builtin/show-ref.c msgid "only show tags (can be combined with heads)" msgstr "只显示标签（可以和头共用）" @@ -14613,6 +14703,10 @@ msgid "only show heads (can be combined with tags)" msgstr "只显示头（可以和标签共用）" #: builtin/show-ref.c +msgid "check for reference existence without resolving" +msgstr "检查引用是否存在但不解析" + +#: builtin/show-ref.c msgid "stricter reference checking, requires exact ref path" msgstr "更严格的引用检测，需要精确的引用路径" @@ -14636,11 +14730,18 @@ 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) [<options>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<options>]" msgstr "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<选项>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check\n" +"-rules) [<选项>]" #: builtin/sparse-checkout.c msgid "this worktree is not sparse" @@ -14780,6 +14881,26 @@ msgstr "必须在稀疏检出中重应用稀疏模式" msgid "error while refreshing working directory" msgstr "刷新工作目录时出错" +#: builtin/sparse-checkout.c +msgid "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <file>]" +msgstr "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <文件>]" + +#: builtin/sparse-checkout.c +msgid "terminate input and output files by a NUL character" +msgstr "输入和输出的文件使用 NUL 字符终结" + +#: builtin/sparse-checkout.c +msgid "when used with --rules-file interpret patterns as cone mode patterns" +msgstr "通过 --rules-file 选项传递的模型将被作为锥形（稀疏检出模型）进行解析" + +#: builtin/sparse-checkout.c +msgid "use patterns in <file> instead of the current ones." +msgstr "从 <文件> 参数中读取模式，而不是从标准输入" + #: builtin/stash.c msgid "git stash list [<log-options>]" msgstr "git stash list [<日志选项>]" @@ -15415,6 +15536,11 @@ msgstr "略过子模组 '%s'" #: builtin/submodule--helper.c #, c-format +msgid "cannot clone submodule '%s' without a URL" +msgstr "无法在不提供 URL 时克隆子模组 '%s'" + +#: builtin/submodule--helper.c +#, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "克隆 '%s' 失败。按计划重试" @@ -15571,6 +15697,10 @@ msgstr "" "shallow] [--reference <仓库>] [--recursive] [--[no-]single-branch] [--] [<路" "径>...]" +#: builtin/submodule--helper.c submodule.c +msgid "Failed to resolve HEAD as a valid ref." +msgstr "无法将 HEAD 解析为有效引用。" + #: builtin/submodule--helper.c msgid "git submodule absorbgitdirs [<options>] [<path>...]" msgstr "git submodule absorbgitdirs [<选项>] [<路径>...]" @@ -16147,6 +16277,10 @@ msgid "write index in this format" msgstr "以这种格式写入索引区" #: builtin/update-index.c +msgid "report on-disk index format version" +msgstr "报告磁盘索引格式的版本" + +#: builtin/update-index.c msgid "enable or disable split index" msgstr "启用或禁用索引拆分" @@ -16179,6 +16313,16 @@ msgid "clear fsmonitor valid bit" msgstr "清除 fsmonitor 有效位" #: builtin/update-index.c +#, c-format +msgid "%d\n" +msgstr "%d\n" + +#: builtin/update-index.c +#, c-format +msgid "index-version: was %d, set to %d" +msgstr "索引版本：从 %d 设置为 %d" + +#: builtin/update-index.c msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -16325,10 +16469,10 @@ msgstr "打印标签内容" #: builtin/worktree.c msgid "" "git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" -" [-b <new-branch>] <path> [<commit-ish>]" +" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]" msgstr "" "git worktree add [-f] [--detach] [--checkout] [--lock [--reason <字符串>]]\n" -" [-b <新分支>] <路径> [<提交号>]" +" [--orphan] [(-b | -B) <新分支>] <路径> [<提交号>]" #: builtin/worktree.c msgid "git worktree list [-v | --porcelain [-z]]" @@ -16359,6 +16503,40 @@ msgid "git worktree unlock <worktree>" msgstr "git worktree unlock <工作区>" #: builtin/worktree.c +msgid "No possible source branch, inferring '--orphan'" +msgstr "没有可用的源分支，将基于 '--orphan' 选项进行推断" + +#: builtin/worktree.c +#, c-format +msgid "" +"If you meant to create a worktree containing a new orphan 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" +" 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" +"(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" +" git worktree add --orphan %s\n" + +#: builtin/worktree.c #, c-format msgid "Removing %s/%s: %s" msgstr "删除 %s/%s: %s" @@ -16440,10 +16618,39 @@ msgstr "准备工作区（检出 '%s'）" #: builtin/worktree.c #, c-format +msgid "unreachable: invalid reference: %s" +msgstr "不可达：无效引用：%s" + +#: builtin/worktree.c +#, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "准备工作区（分离头指针 %s）" #: builtin/worktree.c +#, c-format +msgid "" +"HEAD points to an invalid (or orphaned) reference.\n" +"HEAD path: '%s'\n" +"HEAD contents: '%s'" +msgstr "" +"HEAD 指向了一个无用的（或孤立的）引用。\n" +"HEAD 路径： '%s'\n" +"HEAD 内容： '%s'" + +#: builtin/worktree.c +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" +"请先使用 '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 "检出 <分支>，即使已经被检出到其它工作区" @@ -16456,6 +16663,10 @@ msgid "create or reset a branch" msgstr "创建或重置一个分支" #: builtin/worktree.c +msgid "create unborn/orphaned branch" +msgstr "创建一个尚未诞生的/孤立的分支" + +#: builtin/worktree.c msgid "populate the new working tree" msgstr "生成新的工作区" @@ -16481,6 +16692,15 @@ msgid "options '%s', '%s', and '%s' cannot be used together" 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 "<提交号>" + +#: builtin/worktree.c msgid "added with --lock" msgstr "由 --lock 添加" @@ -16761,6 +16981,16 @@ msgstr[0] "这个归档包需要这个引用：" msgstr[1] "这个归档包需要 %<PRIuMAX> 个引用：" #: bundle.c +#, c-format +msgid "The bundle uses this hash algorithm: %s" +msgstr "该归档包使用的哈希算法：%s" + +#: bundle.c +#, c-format +msgid "The bundle uses this filter: %s" +msgstr "归档包使用了过滤器：%s" + +#: bundle.c msgid "unable to dup bundle descriptor" msgstr "无法复制归档包描述符" @@ -16806,6 +17036,11 @@ msgstr "终止块 ID 比预期更早出现" #: chunk-format.c #, c-format +msgid "chunk id %<PRIx32> not %d-byte aligned" +msgstr "块 id %<PRIx32> 未 %d 字节对齐" + +#: chunk-format.c +#, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" msgstr "不正确的块偏移 %<PRIx64> 和 %<PRIx64>" @@ -16873,8 +17108,8 @@ msgid "Move objects and refs by archive" msgstr "通过归档移动对象和引用" #: command-list.h -msgid "Provide content or type and size information for repository objects" -msgstr "提供仓库对象的内容、类型或大小" +msgid "Provide contents or details of repository objects" +msgstr "提供仓库对象的内容或详情" #: command-list.h msgid "Display gitattributes information" @@ -17057,8 +17292,8 @@ msgid "A portable graphical interface to Git" msgstr "一个便携的 Git 图形客户端" #: command-list.h -msgid "Compute object ID and optionally creates a blob from a file" -msgstr "从一个文件计算对象 ID，并可以创建 blob 数据对象" +msgid "Compute object ID and optionally create an object from a file" +msgstr "从一个文件计算对象 ID，并支持可选地创建一个对象" #: command-list.h msgid "Display help information about Git" @@ -17415,7 +17650,7 @@ msgid "Display version information about Git" msgstr "显示关于 Git 的版本信息" #: command-list.h -msgid "Show logs with difference each commit introduces" +msgid "Show logs with differences each commit introduces" msgstr "显示每一个提交引入的差异日志" #: command-list.h @@ -17595,11 +17830,20 @@ msgid "commit-graph has no base graphs chunk" msgstr "提交图形没有基础图形块" #: commit-graph.c +msgid "commit-graph base graphs chunk is too small" +msgstr "提交图形的基础图形块过小" + +#: commit-graph.c msgid "commit-graph chain does not match" msgstr "提交图形链不匹配" #: commit-graph.c #, c-format +msgid "commit count in base graph too high: %<PRIuMAX>" +msgstr "基础图形中的提交数量过高：%<PRIuMAX>" + +#: commit-graph.c +#, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "无效的提交图形链：行 '%s' 不是一个哈希值" @@ -17621,6 +17865,10 @@ msgid "commit-graph requires overflow generation data but has none" msgstr "提交图需要溢出世代数据，但是没有" #: commit-graph.c +msgid "commit-graph overflow generation data is too small" +msgstr "提交图溢出世代数据过小" + +#: commit-graph.c msgid "Loading known commits in commit graph" msgstr "正在加载提交图中的已知提交" @@ -17706,6 +17954,17 @@ msgid "failed to rename temporary commit-graph file" msgstr "无法重命名临时提交图形文件" #: commit-graph.c +#, c-format +msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits" +msgstr "" +"无法合并提交图形，总共已累加提交数：%<PRIuMAX>，当前待累加提交数：%<PRIuMAX>" + +#: commit-graph.c +#, c-format +msgid "cannot merge graph %s, too many commits: %<PRIuMAX>" +msgstr "无法合并提交图形 %s, 提交过多：%<PRIuMAX>" + +#: commit-graph.c msgid "Scanning merged commits" msgstr "正在扫描合并提交" @@ -17741,10 +18000,6 @@ msgid "failed to parse commit %s from commit-graph" msgstr "无法从提交图形中解析提交 %s" #: commit-graph.c -msgid "Verifying commits in commit graph" -msgstr "正在校验提交图中的提交" - -#: commit-graph.c #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "无法从提交图形的对象库中解析提交 %s" @@ -17771,25 +18026,24 @@ msgstr "提交 %s 的提交图形父提交列表过早终止" #: commit-graph.c #, c-format -msgid "" -"commit-graph has generation number zero for commit %s, but non-zero elsewhere" -msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零" +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" +msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>" #: commit-graph.c #, c-format -msgid "" -"commit-graph has non-zero generation number for commit %s, but zero elsewhere" -msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零" +msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" +msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" #: commit-graph.c #, c-format -msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" -msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>" +msgid "" +"commit-graph has both zero and non-zero generations (e.g., commits '%s' and " +"'%s')" +msgstr "提交图形具有零和非零的世代（例如：提交 '%s' 和 '%s'）" #: commit-graph.c -#, c-format -msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" -msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" +msgid "Verifying commits in commit graph" +msgstr "正在校验提交图中的提交" #: commit.c #, c-format @@ -17818,6 +18072,11 @@ msgstr "" #: commit.c #, c-format +msgid "commit %s exists in commit-graph but not in the object database" +msgstr "提交 %s 存在于提交图形中，但不存在于对象数据库中" + +#: commit.c +#, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" @@ -18313,8 +18572,8 @@ msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" #: config.c -msgid "core.commentChar should only be one character" -msgstr "core.commentChar 应该是一个字符" +msgid "core.commentChar should only be one ASCII character" +msgstr "core.commentChar 应该是一个 ASCII 编码的字符" #: config.c #, c-format @@ -18360,11 +18619,6 @@ msgid "unable to resolve config blob '%s'" msgstr "不能解析配置对象 '%s'" #: config.c -#, c-format -msgid "failed to parse %s" -msgstr "无法解析 %s" - -#: config.c msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" @@ -18454,6 +18708,11 @@ msgstr "无效的小节名称：%s" #: config.c #, c-format +msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>" +msgstr "拒绝支持内容过长的行，位于文件 '%s' 中的第 %<PRIuMAX> 行" + +#: config.c +#, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺失" @@ -18927,10 +19186,6 @@ msgid "--merge-base does not work with ranges" msgstr "--merge-base 不适用于范围" #: diff-lib.c -msgid "--merge-base only works with commits" -msgstr "--merge-base 仅适用于提交" - -#: diff-lib.c msgid "unable to get HEAD" msgstr "不能解析 HEAD" @@ -18943,6 +19198,14 @@ msgid "multiple merge bases found" msgstr "找到了多条合并基线" #: diff-no-index.c +msgid "cannot compare stdin to a directory" +msgstr "无法将标准输入和目录进行比较" + +#: diff-no-index.c +msgid "cannot compare a named pipe to a directory" +msgstr "无法将命名管道和目录进行比较" + +#: diff-no-index.c msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<选项>] <路径> <路径>" @@ -19006,6 +19269,15 @@ msgstr "" msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" +#: diff.c +msgid "--follow requires exactly one pathspec" +msgstr "--follow 明确要求只跟一个路径规格" + +#: diff.c +#, c-format +msgid "pathspec magic not supported by --follow: %s" +msgstr "指定 --follow: %s 的同时，不支持在路径规格中使用神奇前缀" + #: diff.c parse-options.c #, c-format msgid "options '%s', '%s', '%s', and '%s' cannot be used together" @@ -19023,10 +19295,6 @@ msgid "" msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 和 '%5$s' 一起使用 '%3$s'" #: diff.c -msgid "--follow requires exactly one pathspec" -msgstr "--follow 明确要求只跟一个路径规格" - -#: diff.c #, c-format msgid "invalid --stat value: %s" msgstr "无效的 --stat 值：%s" @@ -19263,6 +19531,10 @@ msgid "do not show any source or destination prefix" msgstr "不显示任何源和目标前缀" #: diff.c +msgid "use default prefixes a/ and b/" +msgstr "使用 a/ 和 b/ 作为默认前缀" + +#: diff.c msgid "show context between diff hunks up to the specified number of lines" msgstr "显示指定行数的差异块间的上下文" @@ -19631,6 +19903,16 @@ msgstr "不能从 '%s' 迁移 git 目录到 '%s'" msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示：等待您的编辑器关闭文件...%c" +#: editor.c sequencer.c wrapper.c +#, c-format +msgid "could not write to '%s'" +msgstr "不能写入 '%s'" + +#: editor.c +#, c-format +msgid "could not edit '%s'" +msgstr "不能编辑 '%s'" + #: entry.c msgid "Filtering content" msgstr "过滤内容" @@ -19999,6 +20281,11 @@ msgstr "没有为 --config-env 提供配置名称\n" #: git.c #, c-format +msgid "no attribute source given for --attr-source\n" +msgstr "没有为 --attr-source 提供属性来源\n" + +#: git.c +#, c-format msgid "unknown option: %s\n" msgstr "未知选项：%s\n" @@ -20621,12 +20908,12 @@ msgstr "" "%s" #: merge-ort.c merge-recursive.c -msgid "Failed to execute internal merge" +msgid "failed to execute internal merge" msgstr "无法执行内部合并" #: merge-ort.c merge-recursive.c #, c-format -msgid "Unable to add %s to database" +msgid "unable to add %s to database" msgstr "不能添加 %s 至对象库" #: merge-ort.c merge-recursive.c @@ -21122,7 +21409,15 @@ msgstr "无法读取缓存" #: midx.c msgid "multi-pack-index OID fanout is of the wrong size" -msgstr "多包索引的对象ID扇出表大小错误" +msgstr "多包索引的对象 ID 扇出表大小错误" + +#: midx.c +msgid "multi-pack-index OID lookup chunk is the wrong size" +msgstr "多包索引的对象 ID 查询块大小错误" + +#: midx.c +msgid "multi-pack-index object offset chunk is the wrong size" +msgstr "多包索引的对象 ID 偏移块大小错误" #: midx.c #, c-format @@ -21145,20 +21440,24 @@ msgid "multi-pack-index hash version %u does not match version %u" msgstr "多包索引哈希版本 %u 和版本 %u 不匹配" #: midx.c -msgid "multi-pack-index missing required pack-name chunk" -msgstr "多包索引缺少必需的包名块" +msgid "multi-pack-index required pack-name chunk missing or corrupted" +msgstr "多包索引必需的包名块缺失或损坏" + +#: midx.c +msgid "multi-pack-index required OID fanout chunk missing or corrupted" +msgstr "多包索引必需的对象 ID 扇出块缺失或损坏" #: midx.c -msgid "multi-pack-index missing required OID fanout chunk" -msgstr "多包索引缺少必需的对象 ID 扇出块" +msgid "multi-pack-index required OID lookup chunk missing or corrupted" +msgstr "多包索引必需的对象 ID 查询块缺失或损坏" #: midx.c -msgid "multi-pack-index missing required OID lookup chunk" -msgstr "多包索引缺少必需的对象 ID 查询块" +msgid "multi-pack-index required object offsets chunk missing or corrupted" +msgstr "多包索引必需的对象偏移块缺少或损坏" #: midx.c -msgid "multi-pack-index missing required object offsets chunk" -msgstr "多包索引缺少必需的对象偏移块" +msgid "multi-pack-index pack-name chunk is too short" +msgstr "多包索引包名块过短" #: midx.c #, c-format @@ -21175,6 +21474,10 @@ 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'" @@ -21978,6 +22281,11 @@ msgstr "无法在包 '%2$s' 偏移 %3$<PRIuMAX> 中找到 '%1$s'" msgid "unable to get disk usage of '%s'" msgstr "无法得到 '%s' 的磁盘使用量" +#: pack-bitmap.c +#, c-format +msgid "bitmap file '%s' has invalid checksum" +msgstr "位图文件 '%s' 有无效的校验码" + #: pack-mtimes.c #, c-format msgid "mtimes file %s is too small" @@ -22028,6 +22336,19 @@ msgstr "反向索引文件 %s 不支持的版本 %<PRIu32>" msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>" +#: pack-revindex.c +msgid "invalid checksum" +msgstr "无效的校验码 %s" + +#: pack-revindex.c +#, c-format +msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>" +msgstr "位于 %<PRIu64> 的无效的反向索引：%<PRIu32> != %<PRIu32>" + +#: pack-revindex.c +msgid "multi-pack-index reverse-index chunk is the wrong size" +msgstr "多包索引的反向索引块大小错误" + #: pack-write.c msgid "cannot both write and verify reverse index" msgstr "无法同时写入和校验反向索引" @@ -22093,16 +22414,6 @@ msgstr "%s 需要一个值" #: parse-options.c #, c-format -msgid "%s is incompatible with %s" -msgstr "%s 与 %s 不兼容" - -#: parse-options.c -#, c-format -msgid "%s : incompatible with something else" -msgstr "%s：和其它的不兼容" - -#: parse-options.c -#, c-format msgid "%s takes no value" msgstr "%s 不取值" @@ -22118,6 +22429,11 @@ 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）" @@ -22201,6 +22517,11 @@ msgstr " %s" msgid "-NUM" msgstr "-数字" +#: parse-options.c +#, c-format +msgid "opposite of --no-%s" +msgstr "与 --no-%s 相反" + #: parse-options.h msgid "expiry-date" msgstr "到期时间" @@ -22238,6 +22559,16 @@ msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔" +#: parse.c +#, c-format +msgid "bad boolean environment value '%s' for '%s'" +msgstr "对于 '%2$s' 的错误的布尔环境取值 '%1$s'" + +#: parse.c +#, c-format +msgid "failed to parse %s" +msgstr "无法解析 %s" + #: path.c #, c-format msgid "Could not make %s writable by group" @@ -22296,6 +22627,11 @@ msgstr "%s：'literal' 和 'glob' 不兼容" #: pathspec.c #, c-format +msgid "'%s' is outside the directory tree" +msgstr "'%s' 位于目录树之外" + +#: pathspec.c +#, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "%s：'%s' 在位于 '%s' 的仓库之外" @@ -22452,6 +22788,15 @@ msgstr "无法生成 diff" msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日志" +#: reachable.c +#, c-format +msgid "invalid extra cruft tip: '%s'" +msgstr "无效的额外废弃提交版本：'%s'" + +#: reachable.c +msgid "unable to enumerate additional recent objects" +msgstr "无法枚举额外的近期对象" + #: read-cache.c #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" @@ -22616,11 +22961,6 @@ msgstr "无法转换为稀疏索引" #: read-cache.c #, c-format -msgid "could not stat '%s'" -msgstr "不能对 '%s' 调用 stat" - -#: read-cache.c -#, c-format msgid "unable to open git dir: %s" msgstr "不能打开 git 目录：%s" @@ -22639,6 +22979,16 @@ msgstr "不能修复 '%s' 的权限位" msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暂存区 #0" +#: read-cache.c +#, c-format +msgid "unexpected diff status %c" +msgstr "意外的差异状态 %c" + +#: read-cache.c +#, c-format +msgid "remove '%s'\n" +msgstr "删除 '%s'\n" + #: rebase-interactive.c msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -22854,6 +23204,26 @@ msgstr "期望一个正数 contents:lines=%s" #: ref-filter.c #, c-format +msgid "argument expected for %s" +msgstr "预期参数 %s" + +#: ref-filter.c +#, c-format +msgid "positive value expected %s=%s" +msgstr "预期正数参数值 %s=%s" + +#: ref-filter.c +#, c-format +msgid "cannot fully parse %s=%s" +msgstr "不能完整解析 %s=%s" + +#: ref-filter.c +#, c-format +msgid "value expected %s=" +msgstr "预期值 %s=" + +#: ref-filter.c +#, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数" @@ -22884,6 +23254,11 @@ msgstr "元素 %%(align) 需要一个正数的宽度" #: ref-filter.c #, c-format +msgid "expected format: %%(ahead-behind:<committish>)" +msgstr "期望的格式：%%(ahead-behind:<提交号>)" + +#: ref-filter.c +#, c-format msgid "malformed field name: %.*s" msgstr "格式错误的字段名：%.*s" @@ -22939,6 +23314,10 @@ msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "--format=%.*s 不能和 --python、--shell、--tcl 同时使用" #: ref-filter.c +msgid "failed to run 'describe'" +msgstr "无法运行 'describe'" + +#: ref-filter.c #, c-format msgid "(no branch, rebasing %s)" msgstr "（非分支，正变基 %s）" @@ -23015,6 +23394,10 @@ msgstr "key" msgid "field name to sort on" msgstr "排序的字段名" +#: ref-filter.h +msgid "exclude refs which match pattern" +msgstr "排除与 <模式> 相匹配的引用" + #: reflog.c #, c-format msgid "not a reflog: %s" @@ -23544,8 +23927,9 @@ msgstr[1] "" # 译者：注意保持前导空格 #: remote.c -msgid " (use \"git pull\" to merge the remote branch into yours)\n" -msgstr " （使用 \"git pull\" 来合并远程分支）\n" +msgid "" +" (use \"git pull\" if you want to integrate the remote branch with yours)\n" +msgstr " （如果您想将远程分支与您的更改合并，请使用 \"git pull\"）\n" #: remote.c #, c-format @@ -23637,11 +24021,6 @@ msgstr "没有为 '%s' 记忆的解决方案" #: rerere.c #, c-format -msgid "cannot unlink '%s'" -msgstr "不能删除 '%s'" - -#: rerere.c -#, c-format msgid "Updated preimage for '%s'" msgstr "已为 '%s' 更新 preimage" @@ -23691,6 +24070,11 @@ msgid "--unpacked=<packfile> no longer supported" msgstr "不再支持 --unpacked=<packfile>" #: revision.c +#, c-format +msgid "invalid option '%s' in --stdin mode" +msgstr "在 --stdin 模式下的无效选项：'%s'" + +#: revision.c msgid "your current branch appears to be broken" msgstr "您的当前分支好像被损坏" @@ -23801,8 +24185,16 @@ msgid "only download metadata for the branch that will be checked out" msgstr "只下载要检出的分支的元信息" #: scalar.c -msgid "scalar clone [<options>] [--] <repo> [<dir>]" -msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]" +msgid "create repository within 'src' directory" +msgstr "在 'src' 目录中创建仓库" + +#: scalar.c +msgid "" +"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n" +"\t[--[no-]src] <url> [<enlistment>]" +msgstr "" +"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n" +"\t[--[no-]src] <url> [<登记>]" #: scalar.c #, c-format @@ -23868,13 +24260,32 @@ msgstr "无法删除过期的 scalar.repo '%s'" #: scalar.c #, c-format -msgid "removing stale scalar.repo '%s'" -msgstr "正在删除过期的 scalar.repo '%s'" +msgid "removed stale scalar.repo '%s'" +msgstr "已删除过期的 scalar.repo '%s'" + +#: scalar.c +#, c-format +msgid "repository at '%s' has different owner" +msgstr "位于 '%s' 处的仓库有不同的所有者" + +#: scalar.c +#, c-format +msgid "repository at '%s' has a format issue" +msgstr "位于 '%s' 处的仓库存在格式问题" + +#: scalar.c +#, c-format +msgid "repository not found in '%s'" +msgstr "在 '%s' 中找不到仓库" #: scalar.c #, c-format -msgid "git repository gone in '%s'" -msgstr "在 '%s' 的 git 仓库已消失" +msgid "" +"to unregister this repository from Scalar, run\n" +"\tgit config --global --unset --fixed-value scalar.repo \"%s\"" +msgstr "" +"若希望从 Scalar 注销该仓库，执行\n" +"\tgit config --global --unset --fixed-value scalar.repo \"%s\"" #: scalar.c msgid "" @@ -24052,11 +24463,6 @@ msgstr "" msgid "could not lock '%s'" msgstr "不能锁定 '%s'" -#: sequencer.c strbuf.c wrapper.c -#, c-format -msgid "could not write to '%s'" -msgstr "不能写入 '%s'" - #: sequencer.c #, c-format msgid "could not write eol to '%s'" @@ -24356,11 +24762,6 @@ msgstr "%s：不能解析父提交 %s" #: sequencer.c #, c-format -msgid "could not rename '%s' to '%s'" -msgstr "不能将 '%s' 重命名为 '%s'" - -#: sequencer.c -#, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" @@ -24495,10 +24896,6 @@ msgid "could not create sequencer directory '%s'" msgstr "不能创建序列目录 '%s'" #: sequencer.c -msgid "could not lock HEAD" -msgstr "不能锁定 HEAD" - -#: sequencer.c msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" @@ -24612,21 +25009,21 @@ msgstr "" "\n" #: sequencer.c -msgid "and made changes to the index and/or the working tree\n" -msgstr "并且修改索引和/或工作区\n" +msgid "and made changes to the index and/or the working tree.\n" +msgstr "并且修改索引和/或工作区。\n" #: sequencer.c #, c-format msgid "" "execution succeeded: %s\n" -"but left changes to the index and/or the working tree\n" +"but left changes to the index and/or the working tree.\n" "Commit or stash your changes, and then run\n" "\n" " git rebase --continue\n" "\n" msgstr "" "执行成功：%s\n" -"但是在索引和/或工作区中存在变更\n" +"但是在索引和/或工作区中存在变更。\n" "提交或贮藏修改，然后运行\n" "\n" " git rebase --continue\n" @@ -24794,13 +25191,13 @@ msgstr "" #: sequencer.c #, c-format -msgid "Rebasing (%d/%d)%s" -msgstr "正在变基（%d/%d）%s" +msgid "Stopped at %s... %.*s\n" +msgstr "停止在 %s... %.*s\n" #: sequencer.c #, c-format -msgid "Stopped at %s... %.*s\n" -msgstr "停止在 %s... %.*s\n" +msgid "Rebasing (%d/%d)%s" +msgstr "正在变基（%d/%d）%s" #: sequencer.c #, c-format @@ -25087,6 +25484,95 @@ msgstr "fork 失败" msgid "setsid failed" msgstr "setsid 失败" +#: setup.c +#, c-format +msgid "cannot stat template '%s'" +msgstr "不能对模版 '%s' 调用 stat" + +#: setup.c +#, c-format +msgid "cannot opendir '%s'" +msgstr "不能打开目录 '%s'" + +#: setup.c +#, c-format +msgid "cannot readlink '%s'" +msgstr "不能读取链接 '%s'" + +#: setup.c +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "不能自 '%s' 到 '%s' 创建符号链接" + +#: setup.c +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "不能拷贝 '%s' 至 '%s'" + +#: setup.c +#, c-format +msgid "ignoring template %s" +msgstr "忽略模版 %s" + +#: setup.c +#, c-format +msgid "templates not found in %s" +msgstr "没有在 %s 中找到模版" + +#: setup.c +#, c-format +msgid "not copying templates from '%s': %s" +msgstr "没有从 '%s' 复制模版：%s" + +#: setup.c +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "无效的初始分支名：'%s'" + +#: setup.c +#, c-format +msgid "unable to handle file type %d" +msgstr "不能处理 %d 类型的文件" + +#: setup.c +#, c-format +msgid "unable to move %s to %s" +msgstr "不能移动 %s 至 %s" + +#: setup.c +msgid "attempt to reinitialize repository with different hash" +msgstr "尝试用不同的哈希算法重新初始化仓库" + +#: setup.c +#, c-format +msgid "%s already exists" +msgstr "%s 已经存在" + +#: setup.c +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init：已忽略 --initial-branch=%s" + +#: setup.c +#, c-format +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" + +#: setup.c +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n" + +#: setup.c +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "已初始化空的共享 Git 仓库于 %s%s\n" + +#: setup.c +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "已初始化空的 Git 仓库于 %s%s\n" + #: sparse-index.c #, c-format msgid "index entry is a directory, but not sparse (%08x)" @@ -25148,11 +25634,6 @@ msgid_plural "%u bytes/s" msgstr[0] "%u 字节/秒" msgstr[1] "%u 字节/秒" -#: strbuf.c -#, c-format -msgid "could not edit '%s'" -msgstr "不能编辑 '%s'" - #: submodule-config.c #, c-format msgid "ignoring suspicious submodule name: %s" @@ -26272,6 +26753,10 @@ msgstr "不能访问 '%s'" msgid "unable to get current working directory" msgstr "不能获取当前工作目录" +#: wrapper.c +msgid "unable to get random bytes" +msgstr "无法获取随机字节" + #: wt-status.c msgid "Unmerged paths:" msgstr "未合并的路径：" @@ -27060,13 +27545,13 @@ msgstr "" #: git-send-email.perl #, perl-format -msgid "Failed to open %s: %s" -msgstr "无法打开 %s: %s" +msgid "Failed to open %s.final: %s" +msgstr "无法打开 %s.final: %s" #: git-send-email.perl #, perl-format -msgid "Failed to open %s.final: %s" -msgstr "无法打开 %s.final: %s" +msgid "Failed to open %s: %s" +msgstr "无法打开 %s: %s" #: git-send-email.perl msgid "Summary email is empty, skipping it\n" @@ -27244,8 +27729,8 @@ msgstr "(%s) 不能执行 '%s'" #: git-send-email.perl #, perl-format -msgid "(%s) Adding %s: %s from: '%s'\n" -msgstr "(%s) 添加 %s: %s 自：'%s'\n" +msgid "(%s) Malformed output from '%s'" +msgstr "(%s) 非法的输出信息，来自于: '%s'" #: git-send-email.perl #, perl-format @@ -27253,6 +27738,11 @@ msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 无法关闭管道至 '%s'" #: git-send-email.perl +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) 添加 %s: %s 自：'%s'\n" + +#: git-send-email.perl msgid "cannot send message as 7bit" msgstr "不能以 7bit 形式发送信息" |