diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 9859 |
1 files changed, 6239 insertions, 3620 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 06cc173aca..dc312227e0 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,20 +2,143 @@ # Git 软件包的简体中文翻译. # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> # This file is distributed under the same license as the Git package. -# Contributers: +# Contributors: # - Jiang Xin <worldhello.net AT gmail.com> +# - Lian Cheng <rhythm.mail AT gmail.com> +# - Ray Chen <oldsharp AT gmail.com> # - Riku <lu.riku AT gmail.com> +# - Thynson <lanxingcan AT gmail.com> +# - ws3389 <willsmith3389 AT gmail.com> +# - Wang Sheng <wangsheng2008love AT 163.com> +# - Yichao Yu <yyc1992 AT gmail.com> # - Zhuang Ya <zhuangya AT me.com> -# - Lian Cheng <rhythm.mail AT gmail.com> +# +# Git glossary for Chinese translators +# +# English | Chinese +# ---------------------------------+-------------------------------------- +# 3-way merge | 三方合并 +# abbreviate | 简写（的 SHA-1 值） +# alternate object database | 备用对象库 +# amend | 修补 +# ancestor | 祖先，祖先提交 +# annotated tag | 附注标签 +# bare repository | 纯仓库 +# bisect | 二分查找 +# blob object | 数据对象 +# branch | 分支 +# bundle | 包 +# bypass | 绕过 +# cache | 索引（的别称） +# chain | （提交）链 +# changeset | 变更集 +# checkout | 检出 +# checksum | 校验，校验和 +# cherry-picking | 拣选 +# clean | 干净（的工作区） +# clone | 克隆 +# commit | 提交 +# commit message | 提交说明 +# commit object | 提交对象 +# commit-ish (also committish) | 提交号 +# conflict | 冲突 +# core Git | 核心 Git 工具 +# DAG | 有向无环图 +# dangling object | 摇摆对象 +# detached HEAD | 分离头指针 +# directory | 目录 +# dirty | 脏（的工作区） +# dumb HTTP protocol | 哑 HTTP 协议 +# evil merge | 坏合并（合并引入了父提交没有的修改） +# fast-forward | 快进 +# fetch | 获取 +# file system | 文件系统 +# fork | 派生 +# Git archive | 仓库（对于 arch 用户） +# gitfile | gitfile（仓库链接文件） +# grafts | （提交）嫁接 +# hash | 哈希值 +# HEAD | HEAD（头指针，亦即当前分支） +# head | 头、分支 +# head ref | 分支 +# header | 头信息 +# hook | 钩子 +# hunk | 补丁片段 +# index | 索引 +# index entry | 索引条目 +# loose object | 松散对象 +# loose refs | 松散引用 +# master | master（默认分支名） +# merge | 合并 +# object | 对象 +# object database | 对象库 +# object identifier | 对象标识符 +# object name | 对象名称 +# object type | 对象类型 +# octopus | 章鱼式合并（两分支以上的合并） +# origin | origin（默认的远程名称） +# pack | 包 +# pack index | 包索引 +# packfile | 包文件 +# parent | 父提交 +# patch | 补丁 +# pathspec | 路径规格 +# pattern | 模式 +# pickaxe | 挖掘 +# plumbing | 管件（Git 底层核心命令的别称） +# porcelain | 瓷件（Git 上层封装命令的别称） +# precious-objects repo | 珍品仓库 +# prune | 清除 +# pull | 拉，拉取 +# push | 推，推送 +# reachable | 可达 +# rebase | 变基 +# ref | 引用 +# reflog | 引用日志 +# refspec | 引用规格 +# remote | 远程，远程仓库 +# remote-tracking branch | 远程跟踪分支 +# replay | 重放 +# repo | 仓库 +# repository | 仓库 +# resolve | （冲突）解决 +# revert | 还原 +# revision | 版本 +# rewind | 回退 +# SCM | 源代码管理（工具） +# SHA-1 | SHA-1（安全哈希算法1） +# shallow repository | 浅（克隆）仓库 +# signed tag | 签名标签 +# smart HTTP protocol | 智能 HTTP 协议 +# squash | 压缩 +# stage | n. 暂存区（即索引）; v. 暂存 +# stash | n. 进度保存; v. 保存进度 +# submodule | 子模组 +# symref | 符号引用 +# tag | n. 标签; v. 打标签 +# tag object | 标签对象 +# tagger | 打标签者 +# topic branch | 主题分支 +# track | 跟踪 +# tree | 树（工作区或树对象） +# tree object | 树对象 +# tree-ish (also treeish) | 树对象（或可以解析为一树对象） +# unmerged index | 未合并索引 +# unpack | 解包 +# unreachable object | 不可达对象 +# unstage | 取消暂存 +# upstream | 上游 +# upstream branch | 上游分支 +# working tree | 工作区 # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2014-04-23 12:50+0800\n" -"PO-Revision-Date: 2014-04-23 12:53+0800\n" +"POT-Creation-Date: 2016-08-27 23:21+0800\n" +"PO-Revision-Date: 2016-09-05 23:36+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" -"Language-Team: GitHub <https://github.com/gotgit/git/>\n" +"Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,109 +150,196 @@ msgstr "" msgid "hint: %.*s\n" msgstr "提示：%.*s\n" +#: advice.c:83 +msgid "Cherry-picking is not possible because you have unmerged files." +msgstr "无法拣选，因为您有未合并的文件。" + #: advice.c:85 +msgid "Committing is not possible because you have unmerged files." +msgstr "无法提交，因为您有未合并的文件。" + +#: advice.c:87 +msgid "Merging is not possible because you have unmerged files." +msgstr "无法合并，因为您有未合并的文件。" + +#: advice.c:89 +msgid "Pulling is not possible because you have unmerged files." +msgstr "无法拉取，因为您有未合并的文件。" + +#: advice.c:91 +msgid "Reverting is not possible because you have unmerged files." +msgstr "无法回退，因为您有未合并的文件。" + +#: advice.c:93 +#, c-format +msgid "It is not possible to %s because you have unmerged files." +msgstr "无法 %s，因为您有未合并的文件。" + +#: advice.c:101 +msgid "" +"Fix them up in the work tree, and then use 'git add/rm <file>'\n" +"as appropriate to mark resolution and make a commit." +msgstr "" +"请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n" +"解决方案并提交。" + +#: advice.c:109 +msgid "Exiting because of an unresolved conflict." +msgstr "因为存在未解决的冲突而退出。" + +#: advice.c:114 builtin/merge.c:1181 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" + +#: advice.c:116 +msgid "Please, commit your changes before merging." +msgstr "请在合并前先提交您的修改。" + +#: advice.c:117 +msgid "Exiting because of unfinished merge." +msgstr "因为存在未完成的合并而退出。" + +#: advice.c:123 +#, c-format msgid "" -"Fix them up in the work tree,\n" -"and then use 'git add/rm <file>' as\n" -"appropriate to mark resolution and make a commit,\n" -"or use 'git commit -a'." +"Note: checking out '%s'.\n" +"\n" +"You are in 'detached HEAD' state. You can look around, make experimental\n" +"changes and commit them, and you can discard any commits you make in this\n" +"state without impacting any branches by performing another checkout.\n" +"\n" +"If you want to create a new branch to retain commits you create, you may\n" +"do so (now or later) by using -b with the checkout command again. Example:\n" +"\n" +" git checkout -b <new-branch-name>\n" +"\n" msgstr "" -"请先在工作区改正文件，然后酌情使用\n" -"'git add/rm <file>' 标记解决方案，\n" -"或使用 'git commit -a'。" +"注意：正在检出 '%s'。\n" +"\n" +"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以通过另外\n" +"的检出分支操作丢弃在这个状态下所做的任何提交。\n" +"\n" +"如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在检出命令添加\n" +"参数 -b 来实现（现在或稍后）。例如：\n" +"\n" +" git checkout -b <new-branch-name>\n" +"\n" -#: archive.c:10 -msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [选项] <树或提交> [<路径>...]" +#: archive.c:12 +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<选项>] <树或提交> [<路径>...]" -#: archive.c:11 +#: archive.c:13 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:12 +#: archive.c:14 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]" +"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" -#: archive.c:13 +#: archive.c:15 msgid "git archive --remote <repo> [--exec <cmd>] --list" -msgstr "git archive --remote <版本库> [--exec <命令>] --list" +msgstr "git archive --remote <仓库> [--exec <命令>] --list" -#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328 +#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" -msgstr "路径规则 '%s' 未匹配任何文件" +msgstr "路径规格 '%s' 未匹配任何文件" -#: archive.c:328 +#: archive.c:429 msgid "fmt" msgstr "格式" -#: archive.c:328 +#: archive.c:429 msgid "archive format" msgstr "归档格式" -#: archive.c:329 builtin/log.c:1193 +#: archive.c:430 builtin/log.c:1422 msgid "prefix" msgstr "前缀" -#: archive.c:330 +#: archive.c:431 msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2265 -#: builtin/blame.c:2266 builtin/config.c:57 builtin/fast-export.c:680 -#: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412 -#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 +#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987 +#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100 +#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399 +#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153 msgid "file" msgstr "文件" -#: archive.c:332 builtin/archive.c:89 +#: archive.c:433 builtin/archive.c:89 msgid "write the archive to this file" msgstr "归档写入此文件" -#: archive.c:334 +#: archive.c:435 msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" -#: archive.c:335 +#: archive.c:436 msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" -#: archive.c:336 +#: archive.c:437 msgid "store only" msgstr "只存储" -#: archive.c:337 +#: archive.c:438 msgid "compress faster" msgstr "压缩速度更快" -#: archive.c:345 +#: archive.c:446 msgid "compress better" msgstr "压缩效果更好" -#: archive.c:348 +#: archive.c:449 msgid "list supported archive formats" msgstr "列出支持的归档格式" -#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:832 msgid "repo" -msgstr "版本库" +msgstr "仓库" -#: archive.c:351 builtin/archive.c:91 +#: archive.c:452 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" -msgstr "从远程版本库（<版本库>）提取归档文件" +msgstr "从远程仓库（<仓库>）提取归档文件" -#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483 msgid "command" msgstr "命令" -#: archive.c:353 builtin/archive.c:93 +#: archive.c:454 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" -#: attr.c:259 +#: archive.c:461 +msgid "Unexpected option --remote" +msgstr "未知参数 --remote" + +#: archive.c:463 +msgid "Option --exec can only be used together with --remote" +msgstr "选项 --exec 只能和 --remote 同时使用" + +#: archive.c:465 +msgid "Unexpected option --output" +msgstr "未知参数 --output" + +#: archive.c:487 +#, c-format +msgid "Unknown archive format '%s'" +msgstr "未知归档格式 '%s'" + +#: archive.c:494 +#, c-format +msgid "Argument not supported for format '%s': -%d" +msgstr "参数不支持此格式 '%s'：-%d" + +#: attr.c:263 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -137,81 +347,220 @@ msgstr "" "负值模版在 git attributes 中被忽略\n" "当字符串确实要以感叹号开始时，使用 '\\!'。" -#: branch.c:60 +#: bisect.c:441 +#, c-format +msgid "Could not open file '%s'" +msgstr "不能打开文件 '%s'" + +#: bisect.c:446 +#, c-format +msgid "Badly quoted content in file '%s': %s" +msgstr "文件 '%s' 包含错误的引用格式：%s" + +#: bisect.c:655 +#, c-format +msgid "We cannot bisect more!\n" +msgstr "我们无法进行更多的二分查找！\n" + +#: bisect.c:708 +#, c-format +msgid "Not a valid commit name %s" +msgstr "不是一个有效的提交名 %s" + +#: bisect.c:732 +#, c-format +msgid "" +"The merge base %s is bad.\n" +"This means the bug has been fixed between %s and [%s].\n" +msgstr "" +"合并基线 %s 是坏的。\n" +"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" + +#: bisect.c:737 +#, c-format +msgid "" +"The merge base %s is new.\n" +"The property has changed between %s and [%s].\n" +msgstr "" +"合并基线 %s 是新的。\n" +"介于 %s 和 [%s] 之间的属性已经被修改。\n" + +#: bisect.c:742 +#, c-format +msgid "" +"The merge base %s is %s.\n" +"This means the first '%s' commit is between %s and [%s].\n" +msgstr "" +"合并基线 %s 是 %s。\n" +"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" + +#: bisect.c:750 +#, c-format +msgid "" +"Some %s revs are not ancestor of the %s rev.\n" +"git bisect cannot work properly in this case.\n" +"Maybe you mistook %s and %s revs?\n" +msgstr "" +"一些 %s 版本不是 %s 版本的祖先。\n" +"这种情况下 git 二分查找无法正常工作。\n" +"您可能弄错了 %s 和 %s 版本？\n" + +#: bisect.c:763 +#, c-format +msgid "" +"the merge base between %s and [%s] must be skipped.\n" +"So we cannot be sure the first %s commit is between %s and %s.\n" +"We continue anyway." +msgstr "" +"介于 %s 和 [%s] 的合并基线一定被忽略了。\n" +"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" +"我们仍旧继续。" + +#: bisect.c:798 +#, c-format +msgid "Bisecting: a merge base must be tested\n" +msgstr "二分查找中：合并基线必须是经过测试的\n" + +#: bisect.c:849 +#, c-format +msgid "a %s revision is needed" +msgstr "需要一个 %s 版本" + +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#, c-format +msgid "could not create file '%s'" +msgstr "不能创建文件 '%s'" + +#: bisect.c:917 +#, c-format +msgid "could not read file '%s'" +msgstr "不能读取文件 '%s'" + +#: bisect.c:947 +msgid "reading bisect refs failed" +msgstr "读取二分查找引用失败" + +#: bisect.c:967 +#, c-format +msgid "%s was both %s and %s\n" +msgstr "%s 同时为 %s 和 %s\n" + +#: bisect.c:975 +#, c-format +msgid "" +"No testable commit found.\n" +"Maybe you started with bad path parameters?\n" +msgstr "" +"没有发现可测试的提交。\n" +"可能您在运行时使用了错误的路径参数？\n" + +#: bisect.c:994 +#, c-format +msgid "(roughly %d step)" +msgid_plural "(roughly %d steps)" +msgstr[0] "（大概 %d 步）" +msgstr[1] "（大概 %d 步）" + +#. TRANSLATORS: the last %s will be replaced with +#. "(roughly %d steps)" translation +#: bisect.c:998 +#, c-format +msgid "Bisecting: %d revision left to test after this %s\n" +msgid_plural "Bisecting: %d revisions left to test after this %s\n" +msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" +msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" + +#: branch.c:53 +#, c-format +msgid "" +"\n" +"After fixing the error cause you may try to fix up\n" +"the remote tracking information by invoking\n" +"\"git branch --set-upstream-to=%s%s%s\"." +msgstr "" +"\n" +"在修复错误后，您可以尝试修改远程跟踪分支，通过执行命令\n" +"\"git branch --set-upstream-to=%s%s%s\" 。" + +#: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "未设置分支 %s 作为它自己的上游。" -#: branch.c:83 +#: branch.c:93 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。" -#: branch.c:84 +#: branch.c:94 #, c-format msgid "Branch %s set up to track remote branch %s from %s." msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。" -#: branch.c:88 +#: branch.c:98 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。" -#: branch.c:89 +#: branch.c:99 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "分支 %s 设置为跟踪本地分支 %s。" -#: branch.c:94 +#: branch.c:104 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。" -#: branch.c:95 +#: branch.c:105 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "分支 %s 设置为跟踪远程引用 %s。" -#: branch.c:99 +#: branch.c:109 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。" -#: branch.c:100 +#: branch.c:110 #, c-format msgid "Branch %s set up to track local ref %s." msgstr "分支 %s 设置为跟踪本地引用 %s。" -#: branch.c:133 +#: branch.c:119 +msgid "Unable to write upstream branch configuration" +msgstr "无法写入上游分支配置" + +#: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "未跟踪：引用 %s 有歧义" -#: branch.c:178 +#: branch.c:185 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' 不是一个有效的分支名称。" -#: branch.c:183 +#: branch.c:190 #, c-format msgid "A branch named '%s' already exists." msgstr "一个分支名 '%s' 已经存在。" -#: branch.c:191 +#: branch.c:198 msgid "Cannot force update the current branch." msgstr "无法强制更新当前分支。" -#: branch.c:211 +#: branch.c:218 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。" -#: branch.c:213 +#: branch.c:220 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' 不存在" -#: branch.c:215 +#: branch.c:222 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -229,113 +578,122 @@ msgstr "" "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n" "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" -#: branch.c:260 +#: branch.c:266 #, c-format msgid "Not a valid object name: '%s'." msgstr "不是一个有效的对象名：'%s'。" -#: branch.c:280 +#: branch.c:286 #, c-format msgid "Ambiguous object name: '%s'." msgstr "歧义的对象名：'%s'。" -#: branch.c:285 +#: branch.c:291 #, c-format msgid "Not a valid branch point: '%s'." msgstr "无效的分支点：'%s'。" -#: branch.c:291 -msgid "Failed to lock ref for update" -msgstr "无法为更新锁定引用" +#: branch.c:345 +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "'%s' 已经检出到 '%s'" -#: branch.c:309 -msgid "Failed to write ref" -msgstr "不能写引用" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "工作区 %s 的 HEAD 指向没有被更新" -#: bundle.c:33 +#: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' 不像是一个 v2 版本的包文件" -#: bundle.c:60 +#: bundle.c:61 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:86 builtin/commit.c:706 +#: bundle.c:87 builtin/commit.c:778 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" -#: bundle.c:138 +#: bundle.c:139 msgid "Repository lacks these prerequisite commits:" -msgstr "版本库缺少这些必备的提交：" +msgstr "仓库中缺少这些必备的提交：" -#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357 -#: builtin/shortlog.c:158 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085 +#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348 +#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901 +#: builtin/merge.c:356 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "版本遍历设置失败" -#: bundle.c:184 +#: bundle.c:185 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个包中含有这个引用：" msgstr[1] "这个包中含有 %d 个引用：" -#: bundle.c:191 +#: bundle.c:192 msgid "The bundle records a complete history." msgstr "这个包记录一个完整历史。" -#: bundle.c:193 +#: bundle.c:194 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个包需要这个引用：" msgstr[1] "这个包需要 %d 个引用：" -#: bundle.c:293 +#: bundle.c:253 +msgid "Could not spawn pack-objects" +msgstr "不能生成 pack-objects 进程" + +#: bundle.c:264 +msgid "pack-objects died" +msgstr "pack-objects 终止" + +#: bundle.c:304 msgid "rev-list died" msgstr "rev-list 终止" -#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261 -#, c-format -msgid "unrecognized argument: %s" -msgstr "未能识别的参数：%s" - -#: bundle.c:334 +#: bundle.c:353 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:379 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273 +#, c-format +msgid "unrecognized argument: %s" +msgstr "未能识别的参数：%s" + +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "不能创建空包。" -#: bundle.c:395 -msgid "Could not spawn pack-objects" -msgstr "不能生成 pack-objects 进程" - -#: bundle.c:413 -msgid "pack-objects died" -msgstr "pack-objects 终止" - -#: bundle.c:416 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" -#: bundle.c:438 +#: bundle.c:491 msgid "index-pack died" msgstr "index-pack 终止" -#: commit.c:54 +#: color.c:290 +#, c-format +msgid "invalid color value: %.*s" +msgstr "无效的颜色值：%.*s" + +#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505 +#: builtin/am.c:2119 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" -#: commit.c:56 +#: commit.c:42 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s 不是一个提交!" @@ -344,67 +702,190 @@ msgstr "%s %s 不是一个提交!" msgid "memory exhausted" msgstr "内存耗尽" -#: connected.c:70 -msgid "Could not run 'git rev-list'" -msgstr "不能执行 'git rev-list'" +#: config.c:516 +#, c-format +msgid "bad config line %d in blob %s" +msgstr "数据对象 %2$s 中错误的配置行 %1$d" + +#: config.c:520 +#, c-format +msgid "bad config line %d in file %s" +msgstr "文件 %2$s 中错误的配置行 %1$d" + +#: config.c:524 +#, c-format +msgid "bad config line %d in standard input" +msgstr "标准输入中错误的配置行 %d" + +#: config.c:528 +#, c-format +msgid "bad config line %d in submodule-blob %s" +msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" + +#: config.c:532 +#, c-format +msgid "bad config line %d in command line %s" +msgstr "命令行 %2$s 中错误的配置行 %1$d" + +#: config.c:536 +#, c-format +msgid "bad config line %d in %s" +msgstr "在 %2$s 中错误的配置行 %1$d" + +#: config.c:655 +msgid "out of range" +msgstr "超出范围" + +#: config.c:655 +msgid "invalid unit" +msgstr "无效的单位" -#: connected.c:90 +#: config.c:661 #, c-format -msgid "failed write to rev-list: %s" -msgstr "无法写入 rev-list：%s" +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s" -#: connected.c:98 +#: config.c:666 #, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "无法关闭 rev-list 的标准输入：%s" +msgid "bad numeric config value '%s' for '%s' in blob %s: %s" +msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: date.c:95 +#: config.c:669 +#, c-format +msgid "bad numeric config value '%s' for '%s' in file %s: %s" +msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" + +#: config.c:672 +#, c-format +msgid "bad numeric config value '%s' for '%s' in standard input: %s" +msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s" + +#: config.c:675 +#, c-format +msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" +msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" + +#: config.c:678 +#, c-format +msgid "bad numeric config value '%s' for '%s' in command line %s: %s" +msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" + +#: config.c:681 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" + +#: config.c:768 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "无法扩展 '%s' 中的用户目录" + +#: config.c:849 config.c:860 +#, c-format +msgid "bad zlib compression level %d" +msgstr "错误的 zlib 压缩级别 %d" + +#: config.c:978 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "无效的对象创建模式：%s" + +#: config.c:1312 +msgid "unable to parse command-line config" +msgstr "无法解析命令行中的配置" + +#: config.c:1362 +msgid "unknown error occurred while reading the configuration files" +msgstr "在读取配置文件时遇到未知错误" + +#: config.c:1716 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "无法解析命令行配置中的 '%s'" + +#: config.c:1718 +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" + +#: config.c:1777 +#, c-format +msgid "%s has multiple values" +msgstr "%s 有多个取值" + +#: config.c:2311 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "不能设置 '%s' 为 '%s'" + +#: config.c:2313 +#, c-format +msgid "could not unset '%s'" +msgstr "不能取消设置 '%s'" + +#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 +msgid "Checking connectivity" +msgstr "检查连接中" + +#: connected.c:74 +msgid "Could not run 'git rev-list'" +msgstr "不能执行 'git rev-list'" + +#: connected.c:94 +msgid "failed write to rev-list" +msgstr "无法写入 rev-list" + +#: connected.c:101 +msgid "failed to close rev-list's stdin" +msgstr "无法关闭 rev-list 的标准输入" + +#: date.c:97 msgid "in the future" msgstr "在将来" -#: date.c:101 +#: date.c:103 #, c-format msgid "%lu second ago" msgid_plural "%lu seconds ago" msgstr[0] "%lu 秒钟前" msgstr[1] "%lu 秒钟前" -#: date.c:108 +#: date.c:110 #, c-format msgid "%lu minute ago" msgid_plural "%lu minutes ago" msgstr[0] "%lu 分钟前" msgstr[1] "%lu 分钟前" -#: date.c:115 +#: date.c:117 #, c-format msgid "%lu hour ago" msgid_plural "%lu hours ago" msgstr[0] "%lu 小时前" msgstr[1] "%lu 小时前" -#: date.c:122 +#: date.c:124 #, c-format msgid "%lu day ago" msgid_plural "%lu days ago" msgstr[0] "%lu 天前" msgstr[1] "%lu 天前" -#: date.c:128 +#: date.c:130 #, c-format msgid "%lu week ago" msgid_plural "%lu weeks ago" msgstr[0] "%lu 周前" msgstr[1] "%lu 周前" -#: date.c:135 +#: date.c:137 #, c-format msgid "%lu month ago" msgid_plural "%lu months ago" msgstr[0] "%lu 个月前" msgstr[1] "%lu 个月前" -#: date.c:146 +#: date.c:148 #, c-format msgid "%lu year" msgid_plural "%lu years" @@ -412,14 +893,14 @@ msgstr[0] "%lu 年" msgstr[1] "%lu 年" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:149 +#: date.c:151 #, c-format msgid "%s, %lu month ago" msgid_plural "%s, %lu months ago" msgstr[0] "%s %lu 个月前" msgstr[1] "%s %lu 个月前" -#: date.c:154 date.c:159 +#: date.c:156 date.c:161 #, c-format msgid "%lu year ago" msgid_plural "%lu years ago" @@ -431,28 +912,28 @@ msgstr[1] "%lu 年前" msgid "failed to read orderfile '%s'" msgstr "无法读取排序文件 '%s'" -#: diffcore-rename.c:517 +#: diffcore-rename.c:540 msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名检测" # 译者：注意保持前导空格 -#: diff.c:113 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n" # 译者：注意保持前导空格 -#: diff.c:118 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat 参数 '%s'\n" -#: diff.c:213 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" -#: diff.c:263 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -461,7 +942,16 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:3495 +#: diff.c:3017 +#, c-format +msgid "external diff died, stopping at %s" +msgstr "外部 diff 退出，停止在 %s" + +#: diff.c:3415 +msgid "--follow requires exactly one pathspec" +msgstr "--follow 明确要求只跟一个路径规格" + +#: diff.c:3578 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -470,62 +960,61 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:3509 +#: diff.c:3592 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" -#: gpg-interface.c:59 gpg-interface.c:131 -msgid "could not run gpg." -msgstr "不能执行 gpg。" +#: dir.c:1823 +msgid "failed to get kernel name and information" +msgstr "无法获得内核名称和信息" -#: gpg-interface.c:71 -msgid "gpg did not accept the data" -msgstr "gpg 没有接受数据" +#: dir.c:1942 +msgid "Untracked cache is disabled on this system or location." +msgstr "缓存未跟踪文件在本系统或位置中被禁用。" -#: gpg-interface.c:82 +#: gpg-interface.c:178 msgid "gpg failed to sign the data" msgstr "gpg 无法为数据签名" -#: gpg-interface.c:115 -#, c-format -msgid "could not create temporary file '%s': %s" -msgstr "不能创建临时文件 '%s'：%s" +#: gpg-interface.c:208 +msgid "could not create temporary file" +msgstr "不能创建临时文件" -#: gpg-interface.c:118 +#: gpg-interface.c:210 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "无法将分离式签名写入 '%s'：%s" +msgid "failed writing detached signature to '%s'" +msgstr "无法将分离式签名写入 '%s'" -#: grep.c:1698 +#: grep.c:1792 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1715 +#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "'%s'：%s" +msgid "failed to stat '%s'" +msgstr "无法枚举 '%s' 状态" -#: grep.c:1726 +#: grep.c:1820 #, c-format -msgid "'%s': short read %s" -msgstr "'%s'：读取不完整 %s" +msgid "'%s': short read" +msgstr "'%s'：读取不完整" -#: help.c:209 +#: help.c:205 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" -#: help.c:216 +#: help.c:212 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" -#: help.c:232 -msgid "The most commonly used git commands are:" -msgstr "最常用的 git 命令有：" +#: help.c:244 +msgid "These are common Git commands used in various situations:" +msgstr "这些是各种场合常见的 Git 命令：" -#: help.c:289 +#: help.c:309 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -534,30 +1023,30 @@ msgstr "" "'%s' 像是一个 git 命令，但却无法运行。\n" "可能是 git-%s 受损？" -#: help.c:346 +#: help.c:366 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" -#: help.c:368 +#: help.c:388 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" msgstr "" -"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" +"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n" "是 '%s'" -#: help.c:373 +#: help.c:393 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟后自动运行..." -#: help.c:380 +#: help.c:400 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:384 help.c:443 +#: help.c:404 help.c:470 msgid "" "\n" "Did you mean this?" @@ -571,92 +1060,110 @@ msgstr[1] "" "\n" "您指的是这其中的某一个么？" -#: help.c:439 +#: help.c:466 #, c-format msgid "%s: %s - %s" msgstr "%s：%s - %s" -#: merge.c:56 +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"无法创建 '%s.lock'：%s。\n" +"\n" +"似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n" +"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n" +"可能之前有一个 git 进程在这个仓库中异常退出：\n" +"手动删除这个文件再继续。" + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "不能创建 '%s.lock'：%s" + +#: merge.c:41 msgid "failed to read the cache" msgstr "无法读取缓存" -#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558 -#: builtin/clone.c:661 +#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375 +#: builtin/checkout.c:589 builtin/clone.c:732 msgid "unable to write new index file" msgstr "无法写新的索引文件" -#: merge-recursive.c:190 -#, c-format +#: merge-recursive.c:209 msgid "(bad commit)\n" msgstr "（坏提交）\n" -#: merge-recursive.c:208 +#: merge-recursive.c:231 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "为路径 '%s' addinfo_cache 失败" -#: merge-recursive.c:271 +#: merge-recursive.c:301 msgid "error building trees" msgstr "无法创建树" -#: merge-recursive.c:675 +#: merge-recursive.c:720 #, c-format msgid "failed to create path '%s'%s" msgstr "无法创建路径 '%s'%s" -#: merge-recursive.c:686 +#: merge-recursive.c:731 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" -#: merge-recursive.c:700 merge-recursive.c:721 +#: merge-recursive.c:745 merge-recursive.c:764 msgid ": perhaps a D/F conflict?" msgstr "：可能是一个目录/文件冲突？" -#: merge-recursive.c:711 +#: merge-recursive.c:754 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" -#: merge-recursive.c:751 +#: merge-recursive.c:796 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" -#: merge-recursive.c:753 +#: merge-recursive.c:798 #, c-format msgid "blob expected for %s '%s'" -msgstr "%s '%s' 应为数据（blob）对象" +msgstr "%s '%s' 应为数据对象" -#: merge-recursive.c:776 builtin/clone.c:317 +#: merge-recursive.c:822 #, c-format -msgid "failed to open '%s'" -msgstr "无法打开 '%s'" +msgid "failed to open '%s': %s" +msgstr "无法打开 '%s'：%s" -#: merge-recursive.c:784 +#: merge-recursive.c:833 #, c-format -msgid "failed to symlink '%s'" -msgstr "无法创建符号链接 '%s'" +msgid "failed to symlink '%s': %s" +msgstr "无法创建符号链接 '%s'：%s" -#: merge-recursive.c:787 +#: merge-recursive.c:838 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:925 +#: merge-recursive.c:978 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" -#: merge-recursive.c:929 +#: merge-recursive.c:982 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" -#: merge-recursive.c:945 -msgid "unsupported object type in the tree" -msgstr "在树中有不支持的对象类型" - -#: merge-recursive.c:1024 merge-recursive.c:1038 +#: merge-recursive.c:1081 merge-recursive.c:1095 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -665,7 +1172,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本被保留。" -#: merge-recursive.c:1030 merge-recursive.c:1043 +#: merge-recursive.c:1087 merge-recursive.c:1100 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -674,20 +1181,20 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本保留于 %8$s 中。" -#: merge-recursive.c:1084 +#: merge-recursive.c:1143 msgid "rename" msgstr "重命名" -#: merge-recursive.c:1084 +#: merge-recursive.c:1143 msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1140 +#: merge-recursive.c:1200 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" -#: merge-recursive.c:1162 +#: merge-recursive.c:1225 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -696,227 +1203,228 @@ msgstr "" "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1167 +#: merge-recursive.c:1230 msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1221 +#: merge-recursive.c:1292 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->" "%5$s" -#: merge-recursive.c:1251 +#: merge-recursive.c:1325 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是重命名 %s 至 %s，以及 %s 至 %s" -#: merge-recursive.c:1450 +#: merge-recursive.c:1531 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" -#: merge-recursive.c:1460 +#: merge-recursive.c:1546 #, c-format msgid "Adding merged %s" msgstr "添加合并后的 %s" -#: merge-recursive.c:1465 merge-recursive.c:1663 +#: merge-recursive.c:1553 merge-recursive.c:1766 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" -#: merge-recursive.c:1516 +#: merge-recursive.c:1610 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" -#: merge-recursive.c:1519 +#: merge-recursive.c:1613 #, c-format msgid "object %s is not a blob" -msgstr "对象 %s 不是一个数据（blob）对象" +msgstr "对象 %s 不是一个数据对象" -#: merge-recursive.c:1567 +#: merge-recursive.c:1666 msgid "modify" msgstr "修改" -#: merge-recursive.c:1567 +#: merge-recursive.c:1666 msgid "modified" msgstr "修改" -#: merge-recursive.c:1577 +#: merge-recursive.c:1676 msgid "content" msgstr "内容" -#: merge-recursive.c:1584 +#: merge-recursive.c:1683 msgid "add/add" msgstr "添加/添加" -#: merge-recursive.c:1618 +#: merge-recursive.c:1718 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:1632 +#: merge-recursive.c:1732 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-recursive.c:1636 git-submodule.sh:1149 +#: merge-recursive.c:1736 git-submodule.sh:919 msgid "submodule" msgstr "子模组" -#: merge-recursive.c:1637 +#: merge-recursive.c:1737 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" -#: merge-recursive.c:1727 +#: merge-recursive.c:1831 #, c-format msgid "Removing %s" msgstr "删除 %s" -#: merge-recursive.c:1752 +#: merge-recursive.c:1857 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:1758 +#: merge-recursive.c:1863 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:1763 +#: merge-recursive.c:1868 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" -#: merge-recursive.c:1773 +#: merge-recursive.c:1877 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:1790 -msgid "Fatal merge failure, shouldn't happen." -msgstr "严重的合并错误，不应发生。" - -#: merge-recursive.c:1809 +#: merge-recursive.c:1914 msgid "Already up-to-date!" msgstr "已经是最新的！" -#: merge-recursive.c:1818 +#: merge-recursive.c:1923 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:1848 -#, c-format -msgid "Unprocessed path??? %s" -msgstr "未处理的路径??? %s" - -#: merge-recursive.c:1893 +#: merge-recursive.c:2006 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:1906 +#: merge-recursive.c:2019 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:1943 +#: merge-recursive.c:2058 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:2000 +#: merge-recursive.c:2121 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:2012 builtin/merge.c:668 +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 msgid "Unable to write index." msgstr "不能写入索引。" -#: notes-utils.c:40 +#: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "不能提交未初始化/未引用的注解树" -#: notes-utils.c:81 +#: notes-utils.c:100 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "坏的 notes.rewriteMode 值：'%s'" -#: notes-utils.c:91 +#: notes-utils.c:110 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: notes-utils.c:118 +#: notes-utils.c:137 #, c-format msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" -#: object.c:229 +#: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "不能解析对象：%s" -#: parse-options.c:532 +#: parse-options.c:572 msgid "..." msgstr "..." -#: parse-options.c:550 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:554 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:557 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:591 +#: parse-options.c:631 msgid "-NUM" msgstr "-数字" +#: parse-options-cb.c:108 +#, c-format +msgid "malformed object name '%s'" +msgstr "非法的对象名 '%s'" + +#: path.c:798 +#, c-format +msgid "Could not make %s writable by group" +msgstr "不能设置 %s 为组可写" + #: pathspec.c:133 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容" +msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" #: pathspec.c:143 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" -msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容" +msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" #: pathspec.c:177 msgid "invalid parameter for pathspec magic 'prefix'" -msgstr "路径规则包含无效的神奇前缀" +msgstr "路径规格包含无效的神奇前缀" #: pathspec.c:183 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" -msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" +msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" #: pathspec.c:187 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" -msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'" +msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" #: pathspec.c:205 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" -msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'" +msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" #: pathspec.c:230 #, c-format @@ -926,22 +1434,22 @@ msgstr "%s：'literal' 和 'glob' 不兼容" #: pathspec.c:241 #, c-format msgid "%s: '%s' is outside repository" -msgstr "%s：'%s' 在版本库之外" +msgstr "%s：'%s' 在仓库之外" #: pathspec.c:291 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "路径规则 '%s' 在子模组 '%.*s' 中" +msgstr "路径规格 '%s' 在子模组 '%.*s' 中" #: pathspec.c:353 #, c-format msgid "%s: pathspec magic not supported by this command: %s" -msgstr "%s：路径规则神奇前缀不被此命令支持：%s" +msgstr "%s：路径规格神奇前缀不被此命令支持：%s" #: pathspec.c:433 #, c-format msgid "pathspec '%s' is beyond a symbolic link" -msgstr "路径规则 '%s' 位于符号链接中" +msgstr "路径规格 '%s' 位于符号链接中" #: pathspec.c:442 msgid "" @@ -951,11 +1459,15 @@ msgstr "" "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" "添加 ':/' 或 '.' ？" -#: progress.c:224 +#: pretty.c:973 +msgid "unable to parse --pretty format" +msgstr "不能解析 --pretty 格式" + +#: progress.c:235 msgid "done" msgstr "完成" -#: read-cache.c:1238 +#: read-cache.c:1281 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -964,7 +1476,7 @@ msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1248 +#: read-cache.c:1291 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -973,51 +1485,247 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" -#: remote.c:758 +#: refs.c:551 builtin/merge.c:840 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "无法打开 '%s' 进行写入" + +#: refs/files-backend.c:2534 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "无法删除引用 %s：%s" + +#: refs/files-backend.c:2537 +#, c-format +msgid "could not delete references: %s" +msgstr "无法删除引用：%s" + +#: refs/files-backend.c:2546 +#, c-format +msgid "could not remove reference %s" +msgstr "无法删除引用 %s" + +#: ref-filter.c:55 +#, c-format +msgid "expected format: %%(color:<color>)" +msgstr "期望的格式：%%(color:<color>)" + +#: ref-filter.c:57 +#, c-format +msgid "unrecognized color: %%(color:%s)" +msgstr "未能识别的颜色：%%(color:%s)" + +#: ref-filter.c:71 +#, c-format +msgid "unrecognized format: %%(%s)" +msgstr "未能识别的格式：%%(%s)" + +#: ref-filter.c:77 +#, c-format +msgid "%%(body) does not take arguments" +msgstr "%%(body) 不带参数" + +#: ref-filter.c:84 +#, c-format +msgid "%%(subject) does not take arguments" +msgstr "%%(subject) 不带参数" + +#: ref-filter.c:101 +#, c-format +msgid "positive value expected contents:lines=%s" +msgstr "要为 contents:lines=%s 提供一个正数" + +#: ref-filter.c:103 +#, c-format +msgid "unrecognized %%(contents) argument: %s" +msgstr "未能识别的 %%(contents) 参数：%s" + +#: ref-filter.c:113 +#, c-format +msgid "unrecognized %%(objectname) argument: %s" +msgstr "未能识别的 %%(objectname) 参数：%s" + +#: ref-filter.c:135 +#, c-format +msgid "expected format: %%(align:<width>,<position>)" +msgstr "期望的格式：%%(align:<width>,<position>)" + +#: ref-filter.c:147 +#, c-format +msgid "unrecognized position:%s" +msgstr "未能识别的位置：%s" + +#: ref-filter.c:151 +#, c-format +msgid "unrecognized width:%s" +msgstr "未能识别的宽度：%s" + +#: ref-filter.c:157 +#, c-format +msgid "unrecognized %%(align) argument: %s" +msgstr "未能识别的 %%(align) 参数：%s" + +#: ref-filter.c:161 +#, c-format +msgid "positive width expected with the %%(align) atom" +msgstr "元素 %%(align) 需要一个正数的宽度" + +#: ref-filter.c:244 +#, c-format +msgid "malformed field name: %.*s" +msgstr "非法的字段名：%.*s" + +#: ref-filter.c:270 +#, c-format +msgid "unknown field name: %.*s" +msgstr "未知的字段名：%.*s" + +#: ref-filter.c:372 +#, c-format +msgid "format: %%(end) atom used without corresponding atom" +msgstr "格式：使用了 %%(end) 元素却没有它的对应元素" + +#: ref-filter.c:424 +#, c-format +msgid "malformed format string %s" +msgstr "非法的格式化字符串 %s" + +#: ref-filter.c:878 +msgid ":strip= requires a positive integer argument" +msgstr ":strip= 需要一个正整型参数" + +#: ref-filter.c:883 +#, c-format +msgid "ref '%s' does not have %ld components to :strip" +msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件" + +#: ref-filter.c:1046 +#, c-format +msgid "unknown %.*s format %s" +msgstr "未知的 %.*s 格式 %s" + +#: ref-filter.c:1066 ref-filter.c:1097 +#, c-format +msgid "missing object %s for %s" +msgstr "缺失 %2$s 的对象 %1$s" + +#: ref-filter.c:1069 ref-filter.c:1100 +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" + +#: ref-filter.c:1311 +#, c-format +msgid "malformed object at '%s'" +msgstr "非法的对象于 '%s'" + +#: ref-filter.c:1373 +#, c-format +msgid "ignoring ref with broken name %s" +msgstr "忽略带有错误名称 %s 的引用" + +#: ref-filter.c:1378 +#, c-format +msgid "ignoring broken ref %s" +msgstr "忽略损坏的引用 %s" + +#: ref-filter.c:1651 +#, c-format +msgid "format: %%(end) atom missing" +msgstr "格式：缺少 %%(end) 元素" + +#: ref-filter.c:1705 +#, c-format +msgid "malformed object name %s" +msgstr "非法的对象名 %s" + +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同时获取 %s 和 %s 至 %s" -#: remote.c:762 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %s，而非 %s" -#: remote.c:766 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同时跟踪 %s 和 %s" -#: remote.c:774 +#: remote.c:762 msgid "Internal error" msgstr "内部错误" -#: remote.c:1948 +#: remote.c:1677 remote.c:1720 +msgid "HEAD does not point to a branch" +msgstr "HEAD 没有指向一个分支" + +#: remote.c:1686 +#, c-format +msgid "no such branch: '%s'" +msgstr "没有此分支：'%s'" + +#: remote.c:1689 +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "尚未给分支 '%s' 设置上游" + +#: remote.c:1695 +#, c-format +msgid "upstream branch '%s' not stored as a remote-tracking branch" +msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" + +#: remote.c:1710 +#, c-format +msgid "push destination '%s' on remote '%s' has no local tracking branch" +msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" + +#: remote.c:1725 +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "分支 '%s' 没有设置要推送的远程服务器" + +#: remote.c:1736 +#, c-format +msgid "push refspecs for '%s' do not include '%s'" +msgstr "向 '%s' 推送引用规格未包含 '%s'" + +#: remote.c:1749 +msgid "push has no destination (push.default is 'nothing')" +msgstr "推送无目标（push.default 是 'nothing'）" + +#: remote.c:1771 +msgid "cannot resolve 'simple' push to a single destination" +msgstr "无法解析 'simple' 推送至一个单独的目标" + +#: remote.c:2073 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n" -#: remote.c:1952 +#: remote.c:2077 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n" -#: remote.c:1955 +#: remote.c:2080 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" -#: remote.c:1959 +#: remote.c:2084 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" -#: remote.c:1965 +#: remote.c:2090 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 来发布您的本地提交）\n" -#: remote.c:1968 +#: remote.c:2093 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1026,11 +1734,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" # 译者：注意保持前导空格 -#: remote.c:1976 +#: remote.c:2101 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" -#: remote.c:1979 +#: remote.c:2104 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1046,266 +1754,391 @@ msgstr[1] "" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者：注意保持前导空格 -#: remote.c:1989 +#: remote.c:2114 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" -#: run-command.c:80 +#: revision.c:2132 +msgid "your current branch appears to be broken" +msgstr "您的当前分支好像被损坏" + +#: revision.c:2135 +#, c-format +msgid "your current branch '%s' does not have any commits yet" +msgstr "您的当前分支 '%s' 尚无任何提交" + +#: revision.c:2329 +msgid "--first-parent is incompatible with --bisect" +msgstr "--first-parent 与 --bisect 不兼容" + +#: run-command.c:92 msgid "open /dev/null failed" msgstr "不能打开 /dev/null" -#: run-command.c:82 +#: run-command.c:94 #, c-format msgid "dup2(%d,%d) failed" msgstr "不能调用 dup2(%d,%d)" -#: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899 -#: builtin/merge.c:1009 builtin/merge.c:1019 -#, c-format -msgid "Could not open '%s' for writing" -msgstr "不能为写入打开 '%s'" +#: send-pack.c:298 +msgid "failed to sign the push certificate" +msgstr "无法为推送证书签名" -#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789 -#: builtin/merge.c:1011 builtin/merge.c:1024 -#, c-format -msgid "Could not write to '%s'" -msgstr "不能写入 '%s'" +#: send-pack.c:411 +msgid "the receiving end does not support --signed push" +msgstr "接收端不支持签名推送" -#: sequencer.c:229 +#: send-pack.c:413 +msgid "" +"not sending a push certificate since the receiving end does not support --" +"signed push" +msgstr "未发送推送证书，因为接收端不支持签名推送" + +#: send-pack.c:425 +msgid "the receiving end does not support --atomic push" +msgstr "接收端不支持原子推送" + +#: send-pack.c:430 +msgid "the receiving end does not support push options" +msgstr "接收端不支持推送选项" + +#: sequencer.c:174 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -"冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" +"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "命令标记修正后的文件" -#: sequencer.c:232 +#: sequencer.c:177 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -"冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" +"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:245 sequencer.c:879 sequencer.c:962 +#: sequencer.c:190 sequencer.c:841 sequencer.c:924 #, c-format msgid "Could not write to %s" msgstr "不能写入 %s" -#: sequencer.c:248 +#: sequencer.c:193 sequencer.c:843 sequencer.c:928 #, c-format -msgid "Error wrapping up %s" -msgstr "错误收尾 %s" +msgid "Error wrapping up %s." +msgstr "错误收尾 %s。" -#: sequencer.c:263 +#: sequencer.c:208 msgid "Your local changes would be overwritten by cherry-pick." msgstr "您的本地修改将被拣选操作覆盖。" -#: sequencer.c:265 +#: sequencer.c:210 msgid "Your local changes would be overwritten by revert." msgstr "您的本地修改将被还原操作覆盖。" -#: sequencer.c:268 +#: sequencer.c:213 msgid "Commit your changes or stash them to proceed." msgstr "提交您的修改或保存进度后再继续。" +#: sequencer.c:228 +#, c-format +msgid "%s: fast-forward" +msgstr "%s：快进" + #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:325 +#: sequencer.c:303 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新索引文件" -#: sequencer.c:356 +#: sequencer.c:321 msgid "Could not resolve HEAD commit\n" msgstr "不能解析 HEAD 提交\n" -#: sequencer.c:378 +#: sequencer.c:341 msgid "Unable to update cache tree\n" msgstr "不能更新缓存\n" -#: sequencer.c:430 +#: sequencer.c:393 #, c-format msgid "Could not parse commit %s\n" msgstr "不能解析提交 %s\n" -#: sequencer.c:435 +#: sequencer.c:398 #, c-format msgid "Could not parse parent commit %s\n" msgstr "不能解析父提交 %s\n" -#: sequencer.c:501 +#: sequencer.c:463 msgid "Your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:520 +#: sequencer.c:482 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:528 +#: sequencer.c:490 #, c-format msgid "Commit %s does not have parent %d" msgstr "提交 %s 没有父提交 %d" -#: sequencer.c:532 +#: sequencer.c:494 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "指定了主线但提交 %s 不是一个合并。" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:545 +#: sequencer.c:507 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:549 +#: sequencer.c:511 #, c-format msgid "Cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" -#: sequencer.c:635 +#: sequencer.c:597 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:636 +#: sequencer.c:598 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:672 +#: sequencer.c:633 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:680 +#: sequencer.c:641 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:685 +#: sequencer.c:645 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:743 -#, c-format -msgid "Cannot %s during a %s" -msgstr "无法 %s 在一个 %s 过程中" +#: sequencer.c:705 +msgid "Cannot revert during another revert." +msgstr "不能在回退中执行另一回退。" + +#: sequencer.c:706 +msgid "Cannot revert during a cherry-pick." +msgstr "不能在拣选中执行回退。" + +#: sequencer.c:709 +msgid "Cannot cherry-pick during a revert." +msgstr "不能在回退中执行拣选。" -#: sequencer.c:765 +#: sequencer.c:710 +msgid "Cannot cherry-pick during another cherry-pick." +msgstr "不能在拣选过程中执行另一拣选。" + +#: sequencer.c:732 #, c-format msgid "Could not parse line %d." msgstr "不能解析第 %d 行。" -#: sequencer.c:770 +#: sequencer.c:737 msgid "No commits parsed." msgstr "没有提交被解析。" -#: sequencer.c:783 +#: sequencer.c:749 #, c-format msgid "Could not open %s" msgstr "不能打开 %s" -#: sequencer.c:787 +#: sequencer.c:753 #, c-format msgid "Could not read %s." msgstr "不能读取 %s。" -#: sequencer.c:794 +#: sequencer.c:760 #, c-format msgid "Unusable instruction sheet: %s" msgstr "无用的指令表单：%s" -#: sequencer.c:824 +#: sequencer.c:790 #, c-format msgid "Invalid key: %s" msgstr "无效键名：%s" -#: sequencer.c:827 +#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:839 +#: sequencer.c:803 #, c-format msgid "Malformed options sheet: %s" msgstr "非法的选项表单：%s" -#: sequencer.c:860 +#: sequencer.c:822 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" -#: sequencer.c:861 +#: sequencer.c:823 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:865 +#: sequencer.c:827 #, c-format msgid "Could not create sequencer directory %s" msgstr "不能创建序列目录 %s" -#: sequencer.c:881 sequencer.c:966 -#, c-format -msgid "Error wrapping up %s." -msgstr "错误收尾 %s。" - -#: sequencer.c:900 sequencer.c:1036 +#: sequencer.c:862 sequencer.c:998 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:902 +#: sequencer.c:864 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:904 +#: sequencer.c:866 sequencer.c:900 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:926 builtin/apply.c:4061 +#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970 #, c-format -msgid "cannot open %s: %s" -msgstr "不能打开 %s：%s" +msgid "cannot open %s" +msgstr "不能打开 %s" -#: sequencer.c:929 +#: sequencer.c:888 #, c-format msgid "cannot read %s: %s" msgstr "不能读取 %s：%s" -#: sequencer.c:930 +#: sequencer.c:889 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:936 +#: sequencer.c:895 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:959 +#: sequencer.c:921 #, c-format msgid "Could not format %s." msgstr "不能格式化 %s。" -#: sequencer.c:1104 +#: sequencer.c:1066 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:1107 +#: sequencer.c:1069 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:1141 +#: sequencer.c:1102 msgid "Can't revert as initial commit" msgstr "不能作为初始提交还原" -#: sequencer.c:1142 -msgid "Can't cherry-pick into empty head" -msgstr "不能拣选到空分支" +#: setup.c:160 +#, c-format +msgid "" +"%s: no such path in the working tree.\n" +"Use 'git <command> -- <path>...' to specify paths that do not exist locally." +msgstr "" +"%s：工作区中无此路径。\n" +"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。" + +#: setup.c:173 +#, c-format +msgid "" +"ambiguous argument '%s': unknown revision or path not in the working tree.\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "" +"有歧义的参数 '%s'：未知的版本或路径不存在于工作区中。\n" +"使用 '--' 来分隔版本和路径，例如：\n" +"'git <command> [<revision>...] -- [<file>...]'" -#: sha1_name.c:439 +#: setup.c:223 +#, c-format +msgid "" +"ambiguous argument '%s': both revision and filename\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "" +"有歧义的参数 '%s'：可同时是版本和文件\n" +"使用 '--' 来分隔版本和路径，例如：\n" +"'git <command> [<revision>...] -- [<file>...]'" + +#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419 +#, c-format +msgid "failed to read %s" +msgstr "无法读取 %s" + +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "期望 git 仓库版本 <= %d，却得到 %d" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "发现未知的仓库扩展：" + +#: setup.c:762 +#, c-format +msgid "Not a git repository (or any of the parent directories): %s" +msgstr "不是一个 git 仓库（或者任何父目录）：%s" + +#: setup.c:764 setup.c:915 builtin/index-pack.c:1641 +msgid "Cannot come back to cwd" +msgstr "无法返回当前工作目录" + +#: setup.c:845 +msgid "Unable to read current working directory" +msgstr "不能读取当前工作目录" + +#: setup.c:920 +#, c-format +msgid "" +"Not a git repository (or any parent up to mount point %s)\n" +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." +msgstr "" +"不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n" +"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" + +#: setup.c:927 +#, c-format +msgid "Cannot change to '%s/..'" +msgstr "不能切换到 '%s/..'" + +#: setup.c:989 +#, c-format +msgid "" +"Problem with core.sharedRepository filemode value (0%.3o).\n" +"The owner of files must always have read and write permissions." +msgstr "" +"参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n" +"文件属主必须始终拥有读写权限。" + +#: sha1_file.c:1046 +msgid "offset before end of packfile (broken .idx?)" +msgstr "偏移量在包文件结束之前（损坏的 .idx？）" + +#: sha1_file.c:2434 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" + +#: sha1_file.c:2438 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" + +#: sha1_name.c:462 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -1326,25 +2159,6 @@ msgstr "" "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" "命令关闭本消息通知。" -#: sha1_name.c:1072 -msgid "HEAD does not point to a branch" -msgstr "HEAD 没有指向一个分支" - -#: sha1_name.c:1075 -#, c-format -msgid "No such branch: '%s'" -msgstr "没有此分支：'%s'" - -#: sha1_name.c:1077 -#, c-format -msgid "No upstream configured for branch '%s'" -msgstr "尚未给分支 '%s' 设置上游" - -#: sha1_name.c:1081 -#, c-format -msgid "Upstream branch '%s' not stored as a remote-tracking branch" -msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" - #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "无法修改未合并的 .gitmodules，先解决合并冲突" @@ -1368,17 +2182,335 @@ msgstr "无法移除 %s 的 .gitmodules 条目" msgid "staging updated .gitmodules failed" msgstr "将更新后 .gitmodules 添加暂存区失败" -#: submodule.c:1121 builtin/init-db.c:363 +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "submodule.fetchJobs 不允许为负值" + +#: submodule-config.c:358 +#, c-format +msgid "invalid value for %s" +msgstr "%s 的值无效" + +#: trailer.c:237 +#, c-format +msgid "running trailer command '%s' failed" +msgstr "执行 trailer 命令 '%s' 失败" + +#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 +#: trailer.c:562 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "键 '%2$s' 的未知取值 '%1$s'" + +#: trailer.c:544 trailer.c:549 builtin/remote.c:289 +#, c-format +msgid "more than one %s" +msgstr "多于一个 %s" + +#: trailer.c:582 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "签名 '%.*s' 的键为空" + +#: trailer.c:702 +#, c-format +msgid "could not read input file '%s'" +msgstr "不能读取输入文件 '%s'" + +#: trailer.c:705 +msgid "could not read from stdin" +msgstr "不能自标准输入读取" + +#: trailer.c:857 builtin/am.c:42 +#, c-format +msgid "could not stat %s" +msgstr "不能获取 %s 的文件状态" + +#: trailer.c:859 +#, c-format +msgid "file %s is not a regular file" +msgstr "文件 %s 不是一个正规文件" + +#: trailer.c:861 +#, c-format +msgid "file %s is not writable by user" +msgstr "文件 %s 用户不可写" + +#: trailer.c:873 +msgid "could not open temporary file" +msgstr "不能打开临时文件" + +#: trailer.c:912 +#, c-format +msgid "could not rename temporary file to %s" +msgstr "不能重命名临时文件为 %s" + +#: transport.c:62 #, c-format -msgid "Could not create git link %s" -msgstr "不能创建 git link %s" +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" -#: submodule.c:1132 +#: transport.c:151 #, c-format -msgid "Could not set core.worktree in %s" -msgstr "不能在 %s 中设置 core.worktree" +msgid "transport: invalid depth option '%s'" +msgstr "传输：无效的深度选项 '%s'" -#: unpack-trees.c:206 +#: transport.c:771 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n" + +#: transport.c:775 +#, c-format +msgid "" +"\n" +"Please try\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"or cd to the path and use\n" +"\n" +"\tgit push\n" +"\n" +"to push them to a remote.\n" +"\n" +msgstr "" +"\n" +"请尝试\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"或者进入到子目录执行\n" +"\n" +"\tgit push\n" +"\n" +"以推送至远程。\n" +"\n" + +#: transport.c:783 +msgid "Aborting." +msgstr "正在终止。" + +#: transport-helper.c:1041 +#, c-format +msgid "Could not read ref %s" +msgstr "不能读取引用 %s" + +#: unpack-trees.c:64 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you switch branches." +msgstr "" +"您对下列文件的本地修改将被检出操作覆盖：\n" +"%%s请在切换分支前提交您的修改或者保存进度。" + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"您对下列文件的本地修改将被检出操作覆盖：\n" +"%%s" + +#: unpack-trees.c:69 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you merge." +msgstr "" +"您对下列文件的本地修改将被合并操作覆盖：\n" +"%%s请在合并前提交您的修改或者保存进度。" + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"您对下列文件的本地修改将被合并操作覆盖：\n" +"%%s" + +#: unpack-trees.c:74 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you %s." +msgstr "" +"您对下列文件的本地修改将被 %s 覆盖：\n" +"%%s请在 %s 之前提交您的修改或者保存进度。" + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"您对下列文件的本地修改将被 %s 覆盖：\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"更新如下目录将会丢失其中未跟踪的文件：\n" +"%s" + +#: unpack-trees.c:85 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you switch branches." +msgstr "" +"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" +"%%s请在切换分支之前移动或删除。" + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you merge." +msgstr "" +"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" +"%%s请在合并前移动或删除。" + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you %s." +msgstr "" +"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" +"%%s请在 %s 前移动或删除。" + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you switch branches." +msgstr "" +"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" +"%%s请在切换分支前移动或删除。" + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you merge." +msgstr "" +"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" +"%%s请在合并前移动或删除。" + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you %s." +msgstr "" +"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" +"%%s请在 %s 前移动或删除。" + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"无法更新稀疏检出：如下条目不是最新：\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"工作区中下列文件将会因为稀疏检出而被覆盖：\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"工作区中下列文件将会因为稀疏检出而被删除：\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "终止中\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "正在检出文件" @@ -1393,7 +2525,7 @@ msgstr "无效的 %XX 转义序列" #: urlmatch.c:172 msgid "missing host and scheme is not 'file:'" -msgstr "缺失主机名且URL方案不是 'file:'" +msgstr "缺失主机名且 URL 方案不是 'file:'" #: urlmatch.c:189 msgid "a 'file:' URL may not have a port number" @@ -1411,24 +2543,46 @@ msgstr "无效的端口号" msgid "invalid '..' path segment" msgstr "无效的 '..' 路径片段" -#: wrapper.c:422 +#: worktree.c:282 #, c-format -msgid "unable to access '%s': %s" -msgstr "不能访问 '%s'：%s" +msgid "failed to read '%s'" +msgstr "无法读取 '%s'" -#: wrapper.c:443 +#: wrapper.c:222 wrapper.c:392 +#, c-format +msgid "could not open '%s' for reading and writing" +msgstr "无法打开 '%s' 进行读写" + +#: wrapper.c:224 wrapper.c:394 builtin/am.c:778 +#, c-format +msgid "could not open '%s' for writing" +msgstr "无法打开 '%s' 进行写入" + +#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771 +#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029 +#: builtin/pull.c:407 +#, c-format +msgid "could not open '%s' for reading" +msgstr "无法打开 '%s' 进行读取" + +#: wrapper.c:605 wrapper.c:626 #, c-format msgid "unable to access '%s'" msgstr "不能访问 '%s'" -#: wrapper.c:454 +#: wrapper.c:634 +msgid "unable to get current working directory" +msgstr "不能获取当前工作目录" + +#: wrapper.c:658 #, c-format -msgid "unable to look up current user in the passwd file: %s" -msgstr "无法在口令文件中查询到当前用户：%s" +msgid "could not write to %s" +msgstr "不能写入 %s" -#: wrapper.c:455 -msgid "no such user" -msgstr "无此用户" +#: wrapper.c:660 +#, c-format +msgid "could not close %s" +msgstr "不能关闭 %s" #: wt-status.c:150 msgid "Unmerged paths:" @@ -1438,51 +2592,51 @@ msgstr "未合并的路径：" #: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）" +msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）" # 译者：注意保持前导空格 #: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）" +msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）" # 译者：注意保持前导空格 #: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" -msgstr " （使用 \"git add <file>...\" 标记解决方案）" +msgstr " （使用 \"git add <文件>...\" 标记解决方案）" # 译者：注意保持前导空格 #: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" -msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）" +msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）" # 译者：注意保持前导空格 #: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" -msgstr " （使用 \"git rm <file>...\" 标记解决方案）" +msgstr " （使用 \"git rm <文件>...\" 标记解决方案）" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:882 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:891 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" # 译者：注意保持前导空格 #: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr " （使用 \"git add <file>...\" 更新要提交的内容）" +msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）" # 译者：注意保持前导空格 #: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" -msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）" +msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）" # 译者：注意保持前导空格 #: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" -msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）" +msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）" # 译者：注意保持前导空格 #: wt-status.c:225 @@ -1493,7 +2647,7 @@ msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" #: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" -msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）" +msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）" #: wt-status.c:252 msgid "both deleted:" @@ -1523,11 +2677,6 @@ msgstr "双方添加：" msgid "both modified:" msgstr "双方修改：" -#: wt-status.c:266 -#, c-format -msgid "bug: unhandled unmerged status %x" -msgstr "bug：无法处理的未合并状态 %x" - #: wt-status.c:274 msgid "new file:" msgstr "新文件：" @@ -1575,20 +2724,15 @@ msgstr "修改的内容, " msgid "untracked content, " msgstr "未跟踪的内容, " -#: wt-status.c:391 -#, c-format -msgid "bug: unhandled diff status %c" -msgstr "bug：无法处理的差异状态 %c" - -#: wt-status.c:765 +#: wt-status.c:756 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:767 +#: wt-status.c:758 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:846 +#: wt-status.c:839 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1596,198 +2740,239 @@ msgstr "" "不要改动上面的一行。\n" "下面的所有内容均将被删除。" -#: wt-status.c:937 +#: wt-status.c:950 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:940 +#: wt-status.c:953 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" -#: wt-status.c:943 +# 译者：注意保持前导空格 +#: wt-status.c:955 +msgid " (use \"git merge --abort\" to abort the merge)" +msgstr " （使用 \"git merge --abort\" 终止合并）" + +#: wt-status.c:960 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:946 +#: wt-status.c:963 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:956 +#: wt-status.c:973 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:959 +#: wt-status.c:976 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:963 +#: wt-status.c:980 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:965 +#: wt-status.c:982 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:967 +#: wt-status.c:984 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:1027 wt-status.c:1044 +#: wt-status.c:1109 +msgid "No commands done." +msgstr "没有命令被执行。" + +#: wt-status.c:1112 +#, c-format +msgid "Last command done (%d command done):" +msgid_plural "Last commands done (%d commands done):" +msgstr[0] "最后一条命令已完成（%d 条命令被执行）：" +msgstr[1] "最后的命令已完成（%d 条命令被执行）：" + +#: wt-status.c:1123 +#, c-format +msgid " (see more in file %s)" +msgstr " （更多参见文件 %s）" + +#: wt-status.c:1128 +msgid "No commands remaining." +msgstr "未剩下任何命令。" + +#: wt-status.c:1131 +#, c-format +msgid "Next command to do (%d remaining command):" +msgid_plural "Next commands to do (%d remaining commands):" +msgstr[0] "接下来要执行的命令（剩余 %d 条命令）：" +msgstr[1] "接下来要执行的命令（剩余 %d 条命令）：" + +# 译者：注意保持前导空格 +#: wt-status.c:1139 +msgid " (use \"git rebase --edit-todo\" to view and edit)" +msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）" + +#: wt-status.c:1152 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:1032 wt-status.c:1049 +#: wt-status.c:1157 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者：注意保持前导空格 -#: wt-status.c:1035 +#: wt-status.c:1171 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1037 +#: wt-status.c:1173 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1039 +#: wt-status.c:1175 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:1052 +#: wt-status.c:1181 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:1056 +#: wt-status.c:1185 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:1061 +#: wt-status.c:1190 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 -#: wt-status.c:1064 +#: wt-status.c:1193 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:1068 +#: wt-status.c:1197 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:1073 +#: wt-status.c:1202 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 -#: wt-status.c:1076 +#: wt-status.c:1205 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:1078 +#: wt-status.c:1207 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:1088 +#: wt-status.c:1217 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1093 +#: wt-status.c:1222 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1096 +#: wt-status.c:1225 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1098 +#: wt-status.c:1227 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1107 +#: wt-status.c:1236 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1112 +#: wt-status.c:1241 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1115 +#: wt-status.c:1244 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1117 +#: wt-status.c:1246 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1128 +#: wt-status.c:1257 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1132 +#: wt-status.c:1261 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1135 +#: wt-status.c:1264 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1310 +#: wt-status.c:1464 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1317 +#: wt-status.c:1470 +msgid "interactive rebase in progress; onto " +msgstr "交互式变基操作正在进行中；至 " + +#: wt-status.c:1472 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1324 +#: wt-status.c:1477 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1326 +#: wt-status.c:1479 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1329 +#: wt-status.c:1482 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1346 +#: wt-status.c:1500 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1360 +#: wt-status.c:1514 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1362 +#: wt-status.c:1516 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1366 +#: wt-status.c:1520 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1797,297 +2982,705 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1372 +#: wt-status.c:1526 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1374 +#: wt-status.c:1528 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1380 +#: wt-status.c:1534 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1385 +#: wt-status.c:1539 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" -#: wt-status.c:1388 +#: wt-status.c:1542 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1391 +#: wt-status.c:1545 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1394 +#: wt-status.c:1548 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1397 +#: wt-status.c:1551 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1400 wt-status.c:1405 +#: wt-status.c:1554 wt-status.c:1559 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1403 +#: wt-status.c:1557 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1407 +#: wt-status.c:1561 #, c-format -msgid "nothing to commit, working directory clean\n" +msgid "nothing to commit, working tree clean\n" msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1516 -msgid "HEAD (no branch)" -msgstr "HEAD（非分支）" - # 译者：注意保持句尾空格 -#: wt-status.c:1522 +#: wt-status.c:1668 msgid "Initial commit on " msgstr "初始提交于 " -#: wt-status.c:1554 +#: wt-status.c:1672 +msgid "HEAD (no branch)" +msgstr "HEAD（非分支）" + +#: wt-status.c:1701 msgid "gone" msgstr "丢失" # 译者：注意保持句尾空格 -#: wt-status.c:1556 wt-status.c:1564 +#: wt-status.c:1703 wt-status.c:1711 msgid "behind " msgstr "落后 " -#: compat/precompose_utf8.c:55 builtin/clone.c:356 +#: wt-status.c:1706 wt-status.c:1709 +msgid "ahead " +msgstr "领先 " + +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" -#: builtin/add.c:21 -msgid "git add [options] [--] <pathspec>..." -msgstr "git add [选项] [--] <路径规则>..." +#: builtin/add.c:22 +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<选项>] [--] <路径规格>..." -#: builtin/add.c:64 +#: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:69 builtin/commit.c:261 +#: builtin/add.c:71 builtin/commit.c:281 msgid "updating files failed" msgstr "更新文件失败" -#: builtin/add.c:79 +#: builtin/add.c:81 #, c-format msgid "remove '%s'\n" msgstr "删除 '%s'\n" -#: builtin/add.c:133 +#: builtin/add.c:136 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:193 +#: builtin/add.c:196 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "不能读取索引" -#: builtin/add.c:204 +#: builtin/add.c:207 #, c-format msgid "Could not open '%s' for writing." -msgstr "不能打开 '%s' 以写入。" +msgstr "无法打开 '%s' 进行写入。" -#: builtin/add.c:208 +#: builtin/add.c:211 msgid "Could not write patch" msgstr "不能生成补丁" -#: builtin/add.c:213 +#: builtin/add.c:214 +msgid "editing patch failed" +msgstr "编辑补丁失败" + +#: builtin/add.c:217 #, c-format msgid "Could not stat '%s'" msgstr "不能查看文件状态 '%s'" -#: builtin/add.c:215 +#: builtin/add.c:219 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" -#: builtin/add.c:221 +#: builtin/add.c:224 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" -#: builtin/add.c:231 +#: builtin/add.c:234 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70 -#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344 -#: builtin/rm.c:269 +#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521 +#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "演习" -#: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19 -#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612 -#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113 +#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19 +#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593 +#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "冗长输出" -#: builtin/add.c:251 +#: builtin/add.c:256 msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283 +#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286 msgid "select hunks interactively" msgstr "交互式挑选数据块" -#: builtin/add.c:253 +#: builtin/add.c:258 msgid "edit current diff and apply" msgstr "编辑当前差异并应用" -#: builtin/add.c:254 +#: builtin/add.c:259 msgid "allow adding otherwise ignored files" msgstr "允许添加忽略的文件" -#: builtin/add.c:255 +#: builtin/add.c:260 msgid "update tracked files" msgstr "更新已跟踪的文件" -#: builtin/add.c:256 +#: builtin/add.c:261 msgid "record only the fact that the path will be added later" msgstr "只记录，该路径稍后再添加" -#: builtin/add.c:257 +#: builtin/add.c:262 msgid "add changes from all tracked and untracked files" msgstr "添加所有改变的已跟踪文件和未跟踪文件" -#: builtin/add.c:260 +#: builtin/add.c:265 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区中移除的路径（和 --no-all 相同）" -#: builtin/add.c:262 +#: builtin/add.c:267 msgid "don't add, only refresh the index" msgstr "不添加，只刷新索引" -#: builtin/add.c:263 +#: builtin/add.c:268 msgid "just skip files which cannot be added because of errors" msgstr "跳过因出错不能添加的文件" -#: builtin/add.c:264 +#: builtin/add.c:269 msgid "check if - even missing - files are ignored in dry run" msgstr "检查在演习模式下文件（即使不存在）是否被忽略" -#: builtin/add.c:286 +#: builtin/add.c:270 builtin/update-index.c:958 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/add.c:270 builtin/update-index.c:959 +msgid "override the executable bit of the listed files" +msgstr "覆盖列表里文件的可执行位" + +#: builtin/add.c:292 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 参数如果您确实要添加它们。\n" -#: builtin/add.c:287 -msgid "no files added" -msgstr "没有文件被添加" - -#: builtin/add.c:293 +#: builtin/add.c:300 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:330 +#: builtin/add.c:336 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" -#: builtin/add.c:337 +#: builtin/add.c:343 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" -#: builtin/add.c:358 +#: builtin/add.c:352 +#, c-format +msgid "--chmod param '%s' must be either -x or +x" +msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" + +#: builtin/add.c:367 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" -#: builtin/add.c:359 +#: builtin/add.c:368 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920 -#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299 +#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279 +#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340 +#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432 +#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: builtin/apply.c:57 -msgid "git apply [options] [<patch>...]" -msgstr "git apply [选项] [<补丁>...]" +#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032 +#, c-format +msgid "could not read '%s'" +msgstr "不能读取 '%s'" + +#: builtin/am.c:426 +msgid "could not parse author script" +msgstr "不能解析作者脚本" + +#: builtin/am.c:503 +#, c-format +msgid "'%s' was deleted by the applypatch-msg hook" +msgstr "'%s' 被 applypatch-msg 钩子删除" + +#: builtin/am.c:544 builtin/notes.c:301 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "非法的输入行：'%s'。" + +#: builtin/am.c:581 builtin/notes.c:316 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "从 '%s' 拷贝注解到 '%s' 时失败" + +#: builtin/am.c:607 +msgid "fseek failed" +msgstr "fseek 失败" -#: builtin/apply.c:110 +#: builtin/am.c:787 +#, c-format +msgid "could not parse patch '%s'" +msgstr "无法解析补丁 '%s'" + +#: builtin/am.c:852 +msgid "Only one StGIT patch series can be applied at once" +msgstr "一次只能有一个 StGIT 补丁队列被应用" + +#: builtin/am.c:899 +msgid "invalid timestamp" +msgstr "无效的时间戳" + +#: builtin/am.c:902 builtin/am.c:910 +msgid "invalid Date line" +msgstr "无效的日期行" + +#: builtin/am.c:907 +msgid "invalid timezone offset" +msgstr "无效的时区偏移值" + +#: builtin/am.c:996 +msgid "Patch format detection failed." +msgstr "补丁格式检测失败。" + +#: builtin/am.c:1001 builtin/clone.c:380 +#, c-format +msgid "failed to create directory '%s'" +msgstr "无法创建目录 '%s'" + +#: builtin/am.c:1005 +msgid "Failed to split patches." +msgstr "无法拆分补丁。" + +#: builtin/am.c:1137 builtin/commit.c:366 +msgid "unable to write index file" +msgstr "无法写入索引文件" + +#: builtin/am.c:1188 +#, c-format +msgid "When you have resolved this problem, run \"%s --continue\"." +msgstr "当您解决这一问题，执行 \"%s --continue\"。" + +#: builtin/am.c:1189 +#, c-format +msgid "If you prefer to skip this patch, run \"%s --skip\" instead." +msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" + +#: builtin/am.c:1190 +#, c-format +msgid "To restore the original branch and stop patching, run \"%s --abort\"." +msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" + +#: builtin/am.c:1328 +msgid "Patch is empty. Was it split wrong?" +msgstr "补丁为空。是不是切分错误？" + +#: builtin/am.c:1402 builtin/log.c:1543 +#, c-format +msgid "invalid ident line: %s" +msgstr "包含无效的身份标识：%s" + +#: builtin/am.c:1429 +#, c-format +msgid "unable to parse commit %s" +msgstr "不能解析提交 %s" + +#: builtin/am.c:1602 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "仓库缺乏必要的数据对象以进行三方合并。" + +#: builtin/am.c:1604 +msgid "Using index info to reconstruct a base tree..." +msgstr "使用索引来重建一个（三方合并的）基础目录树..." + +#: builtin/am.c:1623 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"您是否曾手动编辑过您的补丁？\n" +"无法应用补丁到索引中的数据对象上。" + +#: builtin/am.c:1629 +msgid "Falling back to patching base and 3-way merge..." +msgstr "回落到基础版本上打补丁及进行三方合并..." + +#: builtin/am.c:1654 +msgid "Failed to merge in the changes." +msgstr "无法合并变更。" + +#: builtin/am.c:1679 builtin/merge.c:628 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree 无法写入一树对象" + +#: builtin/am.c:1686 +msgid "applying to an empty history" +msgstr "正应用到一个空历史上" + +#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798 +#: builtin/merge.c:823 +msgid "failed to write commit object" +msgstr "无法写提交对象" + +#: builtin/am.c:1731 builtin/am.c:1735 +#, c-format +msgid "cannot resume: %s does not exist." +msgstr "无法继续：%s 不存在。" + +#: builtin/am.c:1751 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "标准输入没有和终端关联，不能进行交互式操作。" + +#: builtin/am.c:1756 +msgid "Commit Body is:" +msgstr "提交内容为：" + +# 译者：注意保持句尾空格 +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#. +#: builtin/am.c:1766 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " +msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]：" + +#: builtin/am.c:1816 +#, c-format +msgid "Dirty index: cannot apply patches (dirty: %s)" +msgstr "脏索引：不能应用补丁（脏文件：%s）" + +#: builtin/am.c:1853 builtin/am.c:1925 +#, c-format +msgid "Applying: %.*s" +msgstr "应用：%.*s" + +#: builtin/am.c:1869 +msgid "No changes -- Patch already applied." +msgstr "没有变更 —— 补丁已经应用过。" + +#: builtin/am.c:1877 +#, c-format +msgid "Patch failed at %s %.*s" +msgstr "打补丁失败于 %s %.*s" + +#: builtin/am.c:1883 +#, c-format +msgid "The copy of the patch that failed is found in: %s" +msgstr "失败的补丁文件副本位于：%s" + +#: builtin/am.c:1928 +msgid "" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" +"没有变更 —— 您是不是忘了执行 'git add'？\n" +"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" +"您也许想要跳过这个补丁。" + +#: builtin/am.c:1935 +msgid "" +"You still have unmerged paths in your index.\n" +"Did you forget to use 'git add'?" +msgstr "" +"您的索引中仍有未合并的路径。\n" +"您是否忘了执行 'git add'？" + +#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308 +#: builtin/reset.c:316 +#, c-format +msgid "Could not parse object '%s'." +msgstr "不能解析对象 '%s'。" + +#: builtin/am.c:2095 +msgid "failed to clean index" +msgstr "无法清空索引" + +#: builtin/am.c:2129 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" + +#: builtin/am.c:2192 +#, c-format +msgid "Invalid value for --patch-format: %s" +msgstr "无效的 --patch-format 值：%s" + +#: builtin/am.c:2225 +msgid "git am [<options>] [(<mbox>|<Maildir>)...]" +msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]" + +#: builtin/am.c:2226 +msgid "git am [<options>] (--continue | --skip | --abort)" +msgstr "git am [<选项>] (--continue | --skip | --abort)" + +#: builtin/am.c:2232 +msgid "run interactively" +msgstr "以交互式方式运行" + +#: builtin/am.c:2234 +msgid "historical option -- no-op" +msgstr "老的参数 —— 无作用" + +#: builtin/am.c:2236 +msgid "allow fall back on 3way merging if needed" +msgstr "如果必要，允许使用三方合并。" + +#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57 +#: builtin/repack.c:172 +msgid "be quiet" +msgstr "静默模式" + +#: builtin/am.c:2239 +msgid "add a Signed-off-by line to the commit message" +msgstr "在提交说明中添加一个 Signed-off-by 签名" + +#: builtin/am.c:2242 +msgid "recode into utf8 (default)" +msgstr "使用 utf8 字符集（默认）" + +#: builtin/am.c:2244 +msgid "pass -k flag to git-mailinfo" +msgstr "向 git-mailinfo 传递 -k 参数" + +#: builtin/am.c:2246 +msgid "pass -b flag to git-mailinfo" +msgstr "向 git-mailinfo 传递 -b 参数" + +#: builtin/am.c:2248 +msgid "pass -m flag to git-mailinfo" +msgstr "向 git-mailinfo 传递 -m 参数" + +#: builtin/am.c:2250 +msgid "pass --keep-cr flag to git-mailsplit for mbox format" +msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" + +#: builtin/am.c:2253 +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" +msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" + +#: builtin/am.c:2256 +msgid "strip everything before a scissors line" +msgstr "丢弃裁切线前的所有内容" + +#: builtin/am.c:2257 builtin/apply.c:4837 +msgid "action" +msgstr "动作" + +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279 +#: builtin/am.c:2285 +msgid "pass it through git-apply" +msgstr "传递给 git-apply" + +#: builtin/am.c:2266 builtin/apply.c:4861 +msgid "root" +msgstr "根目录" + +#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799 +#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96 +#: builtin/pull.c:179 builtin/submodule--helper.c:277 +#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482 +#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823 +#: builtin/submodule--helper.c:826 +msgid "path" +msgstr "路径" + +#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 +#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185 +#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 +#: parse-options.h:132 parse-options.h:134 parse-options.h:244 +msgid "n" +msgstr "n" + +#: builtin/am.c:2278 builtin/apply.c:4805 +msgid "num" +msgstr "数字" + +#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/tag.c:372 +msgid "format" +msgstr "格式" + +#: builtin/am.c:2282 +msgid "format the patch(es) are in" +msgstr "补丁的格式" + +#: builtin/am.c:2288 +msgid "override error message when patch failure occurs" +msgstr "打补丁失败时显示的错误信息" + +#: builtin/am.c:2290 +msgid "continue applying patches after resolving a conflict" +msgstr "冲突解决后继续应用补丁" + +#: builtin/am.c:2293 +msgid "synonyms for --continue" +msgstr "和 --continue 同义" + +#: builtin/am.c:2296 +msgid "skip the current patch" +msgstr "跳过当前补丁" + +#: builtin/am.c:2299 +msgid "restore the original branch and abort the patching operation." +msgstr "恢复原始分支并终止打补丁操作。" + +#: builtin/am.c:2303 +msgid "lie about committer date" +msgstr "将作者日期作为提交日期" + +#: builtin/am.c:2305 +msgid "use current timestamp for author date" +msgstr "用当前时间作为作者日期" + +#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 +msgid "key-id" +msgstr "key-id" + +#: builtin/am.c:2308 +msgid "GPG-sign commits" +msgstr "使用 GPG 签名提交" + +#: builtin/am.c:2311 +msgid "(internal use for git-rebase)" +msgstr "（内部使用，用于 git-rebase）" + +#: builtin/am.c:2326 +msgid "" +"The -b/--binary option has been a no-op for long time, and\n" +"it will be removed. Please do not use it anymore." +msgstr "" +"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" +"请不要再使用它了。" + +#: builtin/am.c:2333 +msgid "failed to read the index" +msgstr "无法读取索引" + +#: builtin/am.c:2348 +#, c-format +msgid "previous rebase directory %s still exists but mbox given." +msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" + +#: builtin/am.c:2372 +#, c-format +msgid "" +"Stray %s directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" +"发现了错误的 %s 目录。\n" +"使用 \"git am --abort\" 删除它。" + +#: builtin/am.c:2378 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "解决操作未进行，我们不会继续。" + +#: builtin/apply.c:122 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<选项>] [<补丁>...]" + +#: builtin/apply.c:153 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" -#: builtin/apply.c:125 +#: builtin/apply.c:169 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: builtin/apply.c:823 +#: builtin/apply.c:854 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" -#: builtin/apply.c:832 +#: builtin/apply.c:863 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" -#: builtin/apply.c:913 +#: builtin/apply.c:947 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" -#: builtin/apply.c:945 +#: builtin/apply.c:984 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s" -#: builtin/apply.c:949 +#: builtin/apply.c:989 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" -#: builtin/apply.c:950 +#: builtin/apply.c:990 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" -#: builtin/apply.c:957 +#: builtin/apply.c:995 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" -#: builtin/apply.c:1422 +#: builtin/apply.c:1489 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: builtin/apply.c:1479 +#: builtin/apply.c:1550 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" -#: builtin/apply.c:1496 +#: builtin/apply.c:1567 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2098,77 +3691,77 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: builtin/apply.c:1656 +#: builtin/apply.c:1743 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: builtin/apply.c:1658 +#: builtin/apply.c:1745 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: builtin/apply.c:1684 +#: builtin/apply.c:1774 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" -#: builtin/apply.c:1720 +#: builtin/apply.c:1810 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: builtin/apply.c:1722 +#: builtin/apply.c:1812 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: builtin/apply.c:1725 +#: builtin/apply.c:1815 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: builtin/apply.c:1871 +#: builtin/apply.c:1962 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" -#: builtin/apply.c:1900 +#: builtin/apply.c:1999 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: builtin/apply.c:1986 +#: builtin/apply.c:2154 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: builtin/apply.c:2076 +#: builtin/apply.c:2244 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: builtin/apply.c:2080 +#: builtin/apply.c:2248 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: builtin/apply.c:2688 +#: builtin/apply.c:2901 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: builtin/apply.c:2806 +#: builtin/apply.c:3020 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）" msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）" -#: builtin/apply.c:2818 +#: builtin/apply.c:3032 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: builtin/apply.c:2824 +#: builtin/apply.c:3038 #, c-format msgid "" "while searching for:\n" @@ -2177,323 +3770,330 @@ msgstr "" "当查询：\n" "%.*s" -#: builtin/apply.c:2843 +#: builtin/apply.c:3060 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: builtin/apply.c:2946 +#: builtin/apply.c:3163 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: builtin/apply.c:2952 +#: builtin/apply.c:3169 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" -#: builtin/apply.c:2973 +#: builtin/apply.c:3190 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: builtin/apply.c:3095 +#: builtin/apply.c:3314 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 +#: builtin/apply.c:3370 #, c-format -msgid "read of %s failed" -msgstr "读取 %s 失败" +msgid "reading from '%s' beyond a symbolic link" +msgstr "读取位于符号链接中的 '%s'" -#: builtin/apply.c:3174 builtin/apply.c:3396 +#: builtin/apply.c:3399 builtin/apply.c:3630 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: builtin/apply.c:3255 builtin/apply.c:3410 +#: builtin/apply.c:3482 builtin/apply.c:3644 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 +#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: builtin/apply.c:3264 builtin/apply.c:3418 +#: builtin/apply.c:3491 builtin/apply.c:3652 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: builtin/apply.c:3366 +#: builtin/apply.c:3597 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: builtin/apply.c:3435 +#: builtin/apply.c:3669 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: builtin/apply.c:3437 +#: builtin/apply.c:3671 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: builtin/apply.c:3538 +#: builtin/apply.c:3822 builtin/apply.c:3824 +#, c-format +msgid "invalid path '%s'" +msgstr "无效路径 '%s'" + +#: builtin/apply.c:3879 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: builtin/apply.c:3541 +#: builtin/apply.c:3882 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: builtin/apply.c:3561 +#: builtin/apply.c:3902 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: builtin/apply.c:3566 +#: builtin/apply.c:3907 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配" -#: builtin/apply.c:3574 +#: builtin/apply.c:3927 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "受影响的文件 '%s' 位于符号链接中" + +#: builtin/apply.c:3931 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: builtin/apply.c:3587 +#: builtin/apply.c:3945 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134 +#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: builtin/apply.c:3823 +#: builtin/apply.c:4182 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: builtin/apply.c:3851 +#: builtin/apply.c:4215 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: builtin/apply.c:3855 +#: builtin/apply.c:4219 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能枚举新建文件 '%s' 的状态" -#: builtin/apply.c:3860 +#: builtin/apply.c:4224 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: builtin/apply.c:3863 builtin/apply.c:3971 +#: builtin/apply.c:4227 builtin/apply.c:4340 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: builtin/apply.c:3896 +#: builtin/apply.c:4260 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: builtin/apply.c:3945 +#: builtin/apply.c:4313 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: builtin/apply.c:4032 +#: builtin/apply.c:4403 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: builtin/apply.c:4040 +#: builtin/apply.c:4411 msgid "internal error" msgstr "内部错误" -#: builtin/apply.c:4043 +#: builtin/apply.c:4414 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..." msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..." -#: builtin/apply.c:4053 +#: builtin/apply.c:4424 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: builtin/apply.c:4074 +#: builtin/apply.c:4432 +#, c-format +msgid "cannot open %s: %s" +msgstr "不能打开 %s：%s" + +#: builtin/apply.c:4445 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: builtin/apply.c:4077 +#: builtin/apply.c:4448 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: builtin/apply.c:4227 +#: builtin/apply.c:4537 +#, c-format +msgid "Skipped patch '%s'." +msgstr "略过补丁 '%s'。" + +#: builtin/apply.c:4545 msgid "unrecognized input" msgstr "未能识别的输入" -#: builtin/apply.c:4238 +#: builtin/apply.c:4556 msgid "unable to read index file" msgstr "无法读取索引文件" -#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 -#: builtin/fetch.c:78 -msgid "path" -msgstr "路径" +#: builtin/apply.c:4701 +msgid "--3way outside a repository" +msgstr "--3way 在一个仓库之外" + +#: builtin/apply.c:4709 +msgid "--index outside a repository" +msgstr "--index 在一个仓库之外" -#: builtin/apply.c:4358 +#: builtin/apply.c:4712 +msgid "--cached outside a repository" +msgstr "--cached 在一个仓库之外" + +#: builtin/apply.c:4745 +#, c-format +msgid "can't open patch '%s'" +msgstr "不能打开补丁 '%s'" + +#: builtin/apply.c:4760 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "抑制下仍有 %d 个空白字符误用" +msgstr[1] "抑制下仍有 %d 个空白字符误用" + +#: builtin/apply.c:4766 builtin/apply.c:4776 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d 行有空白字符误用。" +msgstr[1] "%d 行有空白字符误用。" + +#: builtin/apply.c:4800 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: builtin/apply.c:4361 +#: builtin/apply.c:4803 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: builtin/apply.c:4363 -msgid "num" -msgstr "数字" - -#: builtin/apply.c:4364 +#: builtin/apply.c:4806 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: builtin/apply.c:4367 +#: builtin/apply.c:4809 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: builtin/apply.c:4369 +#: builtin/apply.c:4811 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: builtin/apply.c:4373 +#: builtin/apply.c:4815 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: builtin/apply.c:4375 +#: builtin/apply.c:4817 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: builtin/apply.c:4377 +#: builtin/apply.c:4819 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: builtin/apply.c:4379 +#: builtin/apply.c:4821 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: builtin/apply.c:4381 +#: builtin/apply.c:4823 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: builtin/apply.c:4383 +#: builtin/apply.c:4825 +msgid "accept a patch that touches outside the working area" +msgstr "接受修改工作区之外文件的补丁" + +#: builtin/apply.c:4827 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: builtin/apply.c:4385 +#: builtin/apply.c:4829 msgid "attempt three-way merge if a patch does not apply" -msgstr "如果一个补丁不能应用则尝试三路合并" +msgstr "如果一个补丁不能应用则尝试三方合并" -#: builtin/apply.c:4387 +#: builtin/apply.c:4831 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455 +#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: builtin/apply.c:4392 +#: builtin/apply.c:4836 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: builtin/apply.c:4393 -msgid "action" -msgstr "动作" - -#: builtin/apply.c:4394 +#: builtin/apply.c:4838 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: builtin/apply.c:4397 builtin/apply.c:4400 +#: builtin/apply.c:4841 builtin/apply.c:4844 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: builtin/apply.c:4403 +#: builtin/apply.c:4847 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: builtin/apply.c:4405 +#: builtin/apply.c:4849 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: builtin/apply.c:4407 +#: builtin/apply.c:4851 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: builtin/apply.c:4409 +#: builtin/apply.c:4853 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: builtin/apply.c:4412 +#: builtin/apply.c:4856 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: builtin/apply.c:4415 +#: builtin/apply.c:4859 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: builtin/apply.c:4417 -msgid "root" -msgstr "根目录" - -#: builtin/apply.c:4418 +#: builtin/apply.c:4862 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: builtin/apply.c:4440 -msgid "--3way outside a repository" -msgstr "--3way 在一个版本库之外" - -#: builtin/apply.c:4448 -msgid "--index outside a repository" -msgstr "--index 在一个版本库之外" - -#: builtin/apply.c:4451 -msgid "--cached outside a repository" -msgstr "--cached 在一个版本库之外" - -#: builtin/apply.c:4467 -#, c-format -msgid "can't open patch '%s'" -msgstr "不能打开补丁 '%s'" - -#: builtin/apply.c:4481 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "抑制下仍有 %d 个空白字符误用" -msgstr[1] "抑制下仍有 %d 个空白字符误用" - -#: builtin/apply.c:4487 builtin/apply.c:4497 -#, c-format -msgid "%d line adds whitespace errors." -msgid_plural "%d lines add whitespace errors." -msgstr[0] "%d 行有空白字符误用。" -msgstr[1] "%d 行有空白字符误用。" - #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -2505,11 +4105,11 @@ msgstr "不能重定向输出" #: builtin/archive.c:37 msgid "git archive: Remote with no URL" -msgstr "git archive：未提供远程URL" +msgstr "git archive：未提供远程 URL" #: builtin/archive.c:58 msgid "git archive: expected ACK/NAK, got EOF" -msgstr "git archive：应为ACK/NACK，却得到EOF" +msgstr "git archive：应为 ACK/NACK，却得到 EOF" #: builtin/archive.c:61 #, c-format @@ -2541,103 +4141,111 @@ msgstr "执行 'git bisect next'" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "更新 BISECT_HEAD 而非检出当前提交" -#: builtin/blame.c:27 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [选项] [版本选项] [版本] [--] 文件" +#: builtin/blame.c:33 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" + +#: builtin/blame.c:38 +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" -#: builtin/blame.c:32 -msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中" +#: builtin/blame.c:1781 +msgid "Blaming lines" +msgstr "追踪代码行" -#: builtin/blame.c:2249 +#: builtin/blame.c:2536 msgid "Show blame entries as we find them, incrementally" msgstr "增量式地显示发现的 blame 条目" -#: builtin/blame.c:2250 +#: builtin/blame.c:2537 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界提交显示空的 SHA-1（默认：关闭）" -#: builtin/blame.c:2251 +#: builtin/blame.c:2538 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作为边界（默认：关闭）" -#: builtin/blame.c:2252 +#: builtin/blame.c:2539 msgid "Show work cost statistics" msgstr "显示命令消耗统计" -#: builtin/blame.c:2253 +#: builtin/blame.c:2540 +msgid "Force progress reporting" +msgstr "强制进度显示" + +#: builtin/blame.c:2541 msgid "Show output score for blame entries" msgstr "显示判断 blame 条目位移的得分诊断信息" -#: builtin/blame.c:2254 +#: builtin/blame.c:2542 msgid "Show original filename (Default: auto)" msgstr "显示原始文件名（默认：自动）" -#: builtin/blame.c:2255 +#: builtin/blame.c:2543 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行号（默认：关闭）" -#: builtin/blame.c:2256 +#: builtin/blame.c:2544 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适合机器读取的格式" -#: builtin/blame.c:2257 +#: builtin/blame.c:2545 msgid "Show porcelain format with per-line commit information" msgstr "为每一行显示机器适用的提交信息" -#: builtin/blame.c:2258 +#: builtin/blame.c:2546 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" -#: builtin/blame.c:2259 +#: builtin/blame.c:2547 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关闭）" -#: builtin/blame.c:2260 +#: builtin/blame.c:2548 msgid "Show long commit SHA1 (Default: off)" -msgstr "显示长的SHA1提交号（默认：关闭）" +msgstr "显示长的 SHA1 提交号（默认：关闭）" -#: builtin/blame.c:2261 +#: builtin/blame.c:2549 msgid "Suppress author name and timestamp (Default: off)" msgstr "隐藏作者名字和时间戳（默认：关闭）" -#: builtin/blame.c:2262 +#: builtin/blame.c:2550 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而不是名字（默认：关闭）" -#: builtin/blame.c:2263 +#: builtin/blame.c:2551 msgid "Ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:2264 +#: builtin/blame.c:2552 msgid "Spend extra cycles to find better match" msgstr "花费额外的循环来找到更好的匹配" -#: builtin/blame.c:2265 +#: builtin/blame.c:2553 msgid "Use revisions from <file> instead of calling git-rev-list" -msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list" +msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" -#: builtin/blame.c:2266 +#: builtin/blame.c:2554 msgid "Use <file>'s contents as the final image" -msgstr "使用 <file> 的内容作为最终的图片" +msgstr "使用 <文件> 的内容作为最终的图片" -#: builtin/blame.c:2267 builtin/blame.c:2268 +#: builtin/blame.c:2555 builtin/blame.c:2556 msgid "score" msgstr "得分" -#: builtin/blame.c:2267 +#: builtin/blame.c:2555 msgid "Find line copies within and across files" msgstr "找到文件内及跨文件的行拷贝" -#: builtin/blame.c:2268 +#: builtin/blame.c:2556 msgid "Find line movements within and across files" msgstr "找到文件内及跨文件的行移动" -#: builtin/blame.c:2269 +#: builtin/blame.c:2557 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2269 +#: builtin/blame.c:2557 msgid "Process only line range n,m, counting from 1" msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" @@ -2647,28 +4255,32 @@ msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2347 +#: builtin/blame.c:2649 msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" -#: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]" - -#: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]" - #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git branch [选项] [-r] (-d | -D) <分支名>..." +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" + +#: builtin/branch.c:28 +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." + +#: builtin/branch.c:29 +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" + +#: builtin/branch.c:30 +msgid "git branch [<options>] [-r | -a] [--points-at]" +msgstr "git branch [<选项>] [-r | -a] [--points-at]" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:150 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2678,7 +4290,7 @@ msgstr "" " '%s'，但未合并到 HEAD。" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:154 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2687,12 +4299,12 @@ msgstr "" "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" " 然而却尚未被合并到分支 '%s' 。" -#: builtin/branch.c:168 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "无法查询 '%s' 指向的提交对象" -#: builtin/branch.c:172 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2701,338 +4313,363 @@ msgstr "" "分支 '%s' 没有完全合并。\n" "如果您确认要删除它，执行 'git branch -D %s'。" -#: builtin/branch.c:185 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "无法更新 config 文件" -#: builtin/branch.c:213 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" -#: builtin/branch.c:219 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "无法查询 HEAD 指向的提交对象" -#: builtin/branch.c:227 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "无法删除您当前所在的分支 '%s'。" +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" -#: builtin/branch.c:240 +#: builtin/branch.c:241 #, c-format -msgid "remote branch '%s' not found." -msgstr "远程分支 '%s' 未发现。" +msgid "remote-tracking branch '%s' not found." +msgstr "未能找到远程跟踪分支 '%s'。" -#: builtin/branch.c:241 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未发现。" -#: builtin/branch.c:255 +#: builtin/branch.c:257 #, c-format -msgid "Error deleting remote branch '%s'" -msgstr "删除远程分支 '%s' 时出错" +msgid "Error deleting remote-tracking branch '%s'" +msgstr "无法删除远程跟踪分支 '%s'" -#: builtin/branch.c:256 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" -msgstr "删除分支 '%s' 时出错" +msgstr "无法删除分支 '%s'" -#: builtin/branch.c:263 +#: builtin/branch.c:265 #, c-format -msgid "Deleted remote branch %s (was %s).\n" -msgstr "已删除远程分支 %s（曾为 %s）。\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" +msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n" -#: builtin/branch.c:264 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s（曾为 %s）。\n" -#: builtin/branch.c:366 -#, c-format -msgid "branch '%s' does not point at a commit" -msgstr "分支 '%s' 未指向一个提交" - -#: builtin/branch.c:454 +#: builtin/branch.c:312 #, c-format msgid "[%s: gone]" msgstr "[%s: 丢失]" -#: builtin/branch.c:459 +#: builtin/branch.c:317 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:464 +#: builtin/branch.c:322 #, c-format msgid "[%s: behind %d]" msgstr "[%s：落后 %d]" -#: builtin/branch.c:466 +#: builtin/branch.c:324 #, c-format msgid "[behind %d]" msgstr "[落后 %d]" -#: builtin/branch.c:470 +#: builtin/branch.c:328 #, c-format msgid "[%s: ahead %d]" msgstr "[%s：领先 %d]" -#: builtin/branch.c:472 +#: builtin/branch.c:330 #, c-format msgid "[ahead %d]" msgstr "[领先 %d]" -#: builtin/branch.c:475 +#: builtin/branch.c:333 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s：领先 %d，落后 %d]" -#: builtin/branch.c:478 +#: builtin/branch.c:336 #, c-format msgid "[ahead %d, behind %d]" msgstr "[领先 %d，落后 %d]" -#: builtin/branch.c:502 +#: builtin/branch.c:349 msgid " **** invalid ref ****" msgstr " **** 无效引用 ****" -#: builtin/branch.c:594 +#: builtin/branch.c:375 #, c-format msgid "(no branch, rebasing %s)" msgstr "（非分支，正变基 %s）" -#: builtin/branch.c:597 +#: builtin/branch.c:378 #, c-format msgid "(no branch, bisect started on %s)" msgstr "（非分支，二分查找开始于 %s）" -#: builtin/branch.c:600 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:384 #, c-format -msgid "(detached from %s)" -msgstr "（分离自 %s）" +msgid "(HEAD detached at %s)" +msgstr "（头指针分离于 %s）" -#: builtin/branch.c:603 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:389 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "（头指针分离自 %s）" + +#: builtin/branch.c:393 msgid "(no branch)" msgstr "（非分支）" -#: builtin/branch.c:649 +#: builtin/branch.c:544 #, c-format -msgid "object '%s' does not point to a commit" -msgstr "对象 '%s' 没有指向一个提交" +msgid "Branch %s is being rebased at %s" +msgstr "分支 %s 正被变基到 %s" -#: builtin/branch.c:681 -msgid "some refs could not be read" -msgstr "一些引用不能读取" +#: builtin/branch.c:548 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "分支 %s 正被二分查找于 %s" -#: builtin/branch.c:694 +#: builtin/branch.c:563 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" -#: builtin/branch.c:704 +#: builtin/branch.c:573 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c:719 +#: builtin/branch.c:590 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:723 +#: builtin/branch.c:594 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "重命名掉一个错误命名的旧分支 '%s'" -#: builtin/branch.c:727 +#: builtin/branch.c:597 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: builtin/branch.c:734 +#: builtin/branch.c:604 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新 config 文件失败" -#: builtin/branch.c:749 +#: builtin/branch.c:620 #, c-format -msgid "malformed object name %s" -msgstr "非法的对象名 %s" - -#: builtin/branch.c:773 -#, c-format -msgid "could not write branch description template: %s" -msgstr "不能写分支描述模版：%s" +msgid "" +"Please edit the description for the branch\n" +" %s\n" +"Lines starting with '%c' will be stripped.\n" +msgstr "" +"请编辑分支的描述\n" +" %s\n" +"以 '%c' 开头的行将被过滤。\n" -#: builtin/branch.c:803 +#: builtin/branch.c:651 msgid "Generic options" msgstr "通用选项" -#: builtin/branch.c:805 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" -#: builtin/branch.c:806 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "不显示信息" -#: builtin/branch.c:807 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模式（参见 git-pull(1)）" -#: builtin/branch.c:809 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "改变上游信息" -#: builtin/branch.c:813 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "上游" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "改变上游信息" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "使用彩色输出" -#: builtin/branch.c:814 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" -#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 -#: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495 -#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527 -#: builtin/tag.c:533 -msgid "commit" -msgstr "提交" - -#: builtin/branch.c:818 builtin/branch.c:824 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "只打印包含该提交的分支" -#: builtin/branch.c:830 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作：" -#: builtin/branch.c:831 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪及本地分支" -#: builtin/branch.c:833 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "删除完全合并的分支" -#: builtin/branch.c:834 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "删除分支（即使没有合并）" -#: builtin/branch.c:835 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "移动/重命名一个分支，以及它的引用日志" -#: builtin/branch.c:836 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支，即使目标已存在" -#: builtin/branch.c:837 +#: builtin/branch.c:675 msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c:838 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "创建分支的引用日志" -#: builtin/branch.c:840 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "标记分支的描述" -#: builtin/branch.c:841 -msgid "force creation (when already exists)" -msgstr "强制创建（当已经存在）" +#: builtin/branch.c:679 +msgid "force creation, move/rename, deletion" +msgstr "强制创建、移动/重命名、删除" -#: builtin/branch.c:844 -msgid "print only not merged branches" -msgstr "只打印没有合并的分支" +#: builtin/branch.c:680 +msgid "print only branches that are merged" +msgstr "只打印已经合并的分支" -#: builtin/branch.c:850 -msgid "print only merged branches" -msgstr "只打印合并的分支" +#: builtin/branch.c:681 +msgid "print only branches that are not merged" +msgstr "只打印尚未合并的分支" -#: builtin/branch.c:854 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "以列的方式显示分支" -#: builtin/branch.c:867 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 +msgid "key" +msgstr "key" + +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 +msgid "field name to sort on" +msgstr "排序的字段名" + +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402 +#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568 +#: builtin/tag.c:369 +msgid "object" +msgstr "对象" + +#: builtin/branch.c:687 +msgid "print only branches of the object" +msgstr "只打印指向该对象的分支" + +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:872 builtin/clone.c:635 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c:896 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" -#: builtin/branch.c:902 builtin/branch.c:941 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "必须提供分支名" -#: builtin/branch.c:917 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" -#: builtin/branch.c:922 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" -#: builtin/branch.c:929 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚无提交。" -#: builtin/branch.c:932 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" -#: builtin/branch.c:947 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "为重命名操作提供了太多的分支名" -#: builtin/branch.c:952 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "为设置新上游提供了太多的分支名" -#: builtin/branch.c:956 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。" -#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "没有此分支 '%s'" -#: builtin/branch.c:963 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:975 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "为取消上游设置操作提供了太多的分支名" -#: builtin/branch.c:979 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" -#: builtin/branch.c:985 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" -#: builtin/branch.c:999 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "手工创建 'HEAD' 没有意义" -#: builtin/branch.c:1005 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" -#: builtin/branch.c:1008 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3040,7 +4677,7 @@ msgid "" msgstr "" "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" -#: builtin/branch.c:1025 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3051,76 +4688,86 @@ msgstr "" "如果你想用 '%s' 跟踪 '%s', 这么做：\n" "\n" -#: builtin/branch.c:1026 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:1027 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - -#: builtin/bundle.c:47 +#: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" -#: builtin/bundle.c:56 +#: builtin/bundle.c:64 msgid "Need a repository to create a bundle." -msgstr "需要一个版本库来创建包。" +msgstr "需要一个仓库来创建包。" -#: builtin/bundle.c:60 +#: builtin/bundle.c:68 msgid "Need a repository to unbundle." -msgstr "需要一个版本库来解包。" +msgstr "需要一个仓库来解包。" -#: builtin/cat-file.c:331 -msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" -msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>" +#: builtin/cat-file.c:443 +msgid "" +"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" +"<type>|--textconv) <object>" +msgstr "" +"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型" +">|--textconv) <对象>" -#: builtin/cat-file.c:332 -msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" -msgstr "git cat-file (--batch|--batch-check) < <对象列表>" +#: builtin/cat-file.c:444 +msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" +msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:481 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:482 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:483 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:485 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:374 +#: builtin/cat-file.c:486 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:488 msgid "for blob objects, run textconv on object's content" -msgstr "对于数据（blob）对象，对其内容执行 textconv" +msgstr "对于数据对象，对其内容执行 textconv" + +#: builtin/cat-file.c:490 +msgid "allow -s and -t to work with broken/corrupt objects" +msgstr "允许 -s 和 -t 对损坏的对象生效" + +#: builtin/cat-file.c:491 +msgid "buffer --batch output" +msgstr "缓冲 --batch 的输出" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:493 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" -#: builtin/cat-file.c:381 +#: builtin/cat-file.c:496 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" +#: builtin/cat-file.c:499 +msgid "follow in-tree symlinks (used with --batch or --batch-check)" +msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）" + +#: builtin/cat-file.c:501 +msgid "show all objects with --batch or --batch-check" +msgstr "使用 --batch 或 --batch-check 参数显示所有对象" + #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "git check-attr [-a | --all | attr...] [--] 路径名..." +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" -msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" +msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3130,7 +4777,7 @@ msgstr "报告设置在文件上的所有属性" msgid "use .gitattributes only from the index" msgstr "只使用索引中的 .gitattributes" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 msgid "read file names from stdin" msgstr "从标准输入读出文件名" @@ -3138,7 +4785,7 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271 +#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -3152,7 +4799,7 @@ msgstr "检查时忽略索引" #: builtin/check-ignore.c:154 msgid "cannot specify pathnames with --stdin" -msgstr "不能同时提供路径及 --stdin 参数" +msgstr "不能同时指定路径及 --stdin 参数" #: builtin/check-ignore.c:157 msgid "-z only makes sense with --stdin" @@ -3175,8 +4822,8 @@ msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 选项只在使用 --verbose 时有效" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." -msgstr "git check-mailmap [选项] <联系地址>..." +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<选项>] <联系地址>..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" @@ -3191,158 +4838,165 @@ msgstr "不能解析联系地址：%s" msgid "no contacts specified" msgstr "未指定联系地址" -#: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" -msgstr "git checkout-index [选项] [--] [<文件>...]" +#: builtin/checkout-index.c:127 +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<选项>] [--] [<文件>...]" + +#: builtin/checkout-index.c:144 +msgid "stage should be between 1 and 3 or all" +msgstr "索引值应该取值 1 到 3 或者 all" -#: builtin/checkout-index.c:187 +#: builtin/checkout-index.c:160 msgid "check out all files in the index" msgstr "检出索引区的所有文件" -#: builtin/checkout-index.c:188 +#: builtin/checkout-index.c:161 msgid "force overwrite of existing files" msgstr "强制覆盖现有的文件" -#: builtin/checkout-index.c:190 +#: builtin/checkout-index.c:163 msgid "no warning for existing files and files not in index" msgstr "存在或不在索引中的文件都没有警告" -#: builtin/checkout-index.c:192 +#: builtin/checkout-index.c:165 msgid "don't checkout new files" msgstr "不检出新文件" -#: builtin/checkout-index.c:194 +#: builtin/checkout-index.c:167 msgid "update stat information in the index file" msgstr "更新索引中文件的状态信息" -#: builtin/checkout-index.c:200 +#: builtin/checkout-index.c:171 msgid "read list of paths from the standard input" msgstr "从标准输入读取路径列表" -#: builtin/checkout-index.c:202 +#: builtin/checkout-index.c:173 msgid "write the content to temporary files" msgstr "将内容写入临时文件" -#: builtin/checkout-index.c:203 builtin/column.c:30 +#: builtin/checkout-index.c:174 builtin/column.c:30 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491 +#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497 +#: builtin/submodule--helper.c:830 builtin/worktree.c:469 msgid "string" msgstr "字符串" -#: builtin/checkout-index.c:204 +#: builtin/checkout-index.c:175 msgid "when creating files, prepend <string>" -msgstr "在创建文件时，在前面加上<字符串>" +msgstr "在创建文件时，在前面加上 <字符串>" -#: builtin/checkout-index.c:207 +#: builtin/checkout-index.c:177 msgid "copy out the files from named stage" msgstr "从指定暂存区中拷出文件" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" -msgstr "git checkout [选项] <分支>" +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<选项>] <分支>" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git checkout [选项] [<分支>] -- <文件>..." +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<选项>] [<分支>] -- <文件>..." -#: builtin/checkout.c:114 builtin/checkout.c:147 +#: builtin/checkout.c:134 builtin/checkout.c:167 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" -#: builtin/checkout.c:116 builtin/checkout.c:149 +#: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" -#: builtin/checkout.c:132 +#: builtin/checkout.c:152 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必须的版本" -#: builtin/checkout.c:176 +#: builtin/checkout.c:196 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必须的版本" -#: builtin/checkout.c:193 +#: builtin/checkout.c:213 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" -#: builtin/checkout.c:210 +#: builtin/checkout.c:230 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238 -#: builtin/checkout.c:241 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路径时使用" -#: builtin/checkout.c:244 builtin/checkout.c:247 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同时使用" -#: builtin/checkout.c:250 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" -#: builtin/checkout.c:261 builtin/checkout.c:450 -msgid "corrupt index file" -msgstr "损坏的索引文件" - -#: builtin/checkout.c:321 builtin/checkout.c:328 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:472 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:593 +#: builtin/checkout.c:625 #, c-format -msgid "Can not do reflog for '%s'\n" -msgstr "不能对 '%s' 执行 reflog 操作\n" +msgid "Can not do reflog for '%s': %s\n" +msgstr "不能对 '%s' 执行 reflog 操作：%s\n" -#: builtin/checkout.c:631 +#: builtin/checkout.c:664 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:638 +#: builtin/checkout.c:668 builtin/clone.c:661 +msgid "unable to update HEAD" +msgstr "不能更新 HEAD" + +#: builtin/checkout.c:672 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:641 +#: builtin/checkout.c:675 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:645 +#: builtin/checkout.c:679 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:647 builtin/checkout.c:1032 +#: builtin/checkout.c:681 builtin/checkout.c:1070 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:649 +#: builtin/checkout.c:683 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:705 +#: builtin/checkout.c:734 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c:711 +#: builtin/checkout.c:740 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3363,154 +5017,177 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:729 +#: builtin/checkout.c:759 #, c-format msgid "" +"If you want to keep it by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch <new-branch-name> %s\n" +"\n" +msgid_plural "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" -msgstr "" -"如果您想要通过创建新分支保存他们，这可能是一个好时候。\n" +msgstr[0] "" +"如果您想要通过创建新分支保存它，这可能是一个好时候。\n" "如下操作：\n" "\n" -" git branch new_branch_name %s\n" +" git branch <新分支名> %s\n" +"\n" +msgstr[1] "" +"如果您想要通过创建新分支保存它们，这可能是一个好时候。\n" +"如下操作：\n" +"\n" +" git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:759 +#: builtin/checkout.c:795 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:763 +#: builtin/checkout.c:799 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:790 builtin/checkout.c:1027 +#: builtin/checkout.c:826 builtin/checkout.c:1065 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:934 +#: builtin/checkout.c:971 #, c-format msgid "only one reference expected, %d given." msgstr "只要一个引用，却给出了 %d 个" -#: builtin/checkout.c:973 +#: builtin/checkout.c:1011 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#: builtin/checkout.c:1002 +#: builtin/checkout.c:1040 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:1041 +#: builtin/checkout.c:1079 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1044 builtin/checkout.c:1048 +#: builtin/checkout.c:1082 builtin/checkout.c:1086 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098 +#: builtin/checkout.c:1101 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1068 +#: builtin/checkout.c:1106 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88 -#: builtin/remote.c:159 builtin/remote.c:161 +#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 +#: builtin/worktree.c:326 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1091 +#: builtin/checkout.c:1140 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1142 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1094 +#: builtin/checkout.c:1143 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1095 -msgid "detach the HEAD at named commit" -msgstr "成为指向该提交的分离头指针" +#: builtin/checkout.c:1144 builtin/worktree.c:328 +msgid "detach HEAD at named commit" +msgstr "HEAD 从指定的提交分离" -#: builtin/checkout.c:1096 +#: builtin/checkout.c:1145 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1147 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1147 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1148 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1150 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1103 +#: builtin/checkout.c:1152 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1153 msgid "perform a 3-way merge with the new branch" -msgstr "和新的分支执行三路合并" +msgstr "和新的分支执行三方合并" -#: builtin/checkout.c:1105 builtin/merge.c:225 +#: builtin/checkout.c:1154 builtin/merge.c:231 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245 +#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250 msgid "style" msgstr "风格" -#: builtin/checkout.c:1107 +#: builtin/checkout.c:1156 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1110 +#: builtin/checkout.c:1159 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1112 -msgid "second guess 'git checkout no-such-branch'" -msgstr "再者猜测'git checkout no-such-branch'" +#: builtin/checkout.c:1161 +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "二次猜测'git checkout <无此分支>'" + +#: builtin/checkout.c:1163 +msgid "do not check if another worktree is holding the given ref" +msgstr "不检查指定的引用是否被其他工作区所占用" -#: builtin/checkout.c:1135 +#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117 +#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536 +#: builtin/send-pack.c:168 +msgid "force progress reporting" +msgstr "强制显示进度报告" + +#: builtin/checkout.c:1195 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b、-B 和 --orphan 是互斥的" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1212 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1217 msgid "Missing branch name; try -b" msgstr "缺少分支名；尝试 -b" -#: builtin/checkout.c:1196 +#: builtin/checkout.c:1253 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1203 +#: builtin/checkout.c:1260 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3519,50 +5196,50 @@ msgstr "" "不能同时更新路径并切换到分支'%s'。\n" "您是想要检出 '%s' 但其未能解析为提交么？" -#: builtin/checkout.c:1208 +#: builtin/checkout.c:1265 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1269 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。" -#: builtin/clean.c:26 +#: builtin/clean.c:25 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." -#: builtin/clean.c:30 +#: builtin/clean.c:29 #, c-format msgid "Removing %s\n" msgstr "正删除 %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:30 #, c-format msgid "Would remove %s\n" msgstr "将删除 %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:31 #, c-format msgid "Skipping repository %s\n" -msgstr "忽略版本库 %s\n" +msgstr "忽略仓库 %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:32 #, c-format msgid "Would skip repository %s\n" -msgstr "将忽略版本库 %s\n" +msgstr "将忽略仓库 %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:33 #, c-format msgid "failed to remove %s" msgstr "无法删除 %s" -#: builtin/clean.c:295 +#: builtin/clean.c:291 msgid "" "Prompt help:\n" "1 - select a numbered item\n" @@ -3574,7 +5251,7 @@ msgstr "" "foo - 通过标题选择一个选项\n" " - （空）什么也不选择" -#: builtin/clean.c:299 +#: builtin/clean.c:295 msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -3594,35 +5271,36 @@ msgstr "" "* - 选择所有选项\n" " - （空）结束选择" -#: builtin/clean.c:517 +#: builtin/clean.c:511 #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: builtin/clean.c:660 +#: builtin/clean.c:653 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除条目>> " -#: builtin/clean.c:697 +#: builtin/clean.c:690 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：无法找到和 %s 匹配的条目" -#: builtin/clean.c:718 +#: builtin/clean.c:711 msgid "Select items to delete" msgstr "选择要删除的条目" -#: builtin/clean.c:758 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:752 #, c-format -msgid "remove %s? " -msgstr "删除 %s？" +msgid "Remove %s [y/N]? " +msgstr "删除 %s [y/N]？" -#: builtin/clean.c:783 +#: builtin/clean.c:777 msgid "Bye." msgstr "再见。" -#: builtin/clean.c:791 +#: builtin/clean.c:785 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3640,123 +5318,127 @@ msgstr "" "help - 显示本帮助\n" "? - 显示如何在提示符下选择的帮助" -#: builtin/clean.c:818 +#: builtin/clean.c:812 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: builtin/clean.c:819 +#: builtin/clean.c:813 msgid "What now" msgstr "请选择" -#: builtin/clean.c:827 +#: builtin/clean.c:821 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "将删除如下条目：" msgstr[1] "将删除如下条目：" -#: builtin/clean.c:844 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "没有要清理的文件，退出。" -#: builtin/clean.c:875 +#: builtin/clean.c:869 msgid "do not print names of files removed" msgstr "不打印删除文件的名称" -#: builtin/clean.c:877 +#: builtin/clean.c:871 msgid "force" msgstr "强制" -#: builtin/clean.c:878 +#: builtin/clean.c:872 msgid "interactive cleaning" msgstr "交互式清除" -#: builtin/clean.c:880 +#: builtin/clean.c:874 msgid "remove whole directories" msgstr "删除整个目录" -#: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716 -#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 +#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" msgstr "模式" -#: builtin/clean.c:882 +#: builtin/clean.c:876 msgid "add <pattern> to ignore rules" -msgstr "添加<模式>到忽略规则" +msgstr "添加 <模式> 到忽略规则" -#: builtin/clean.c:883 +#: builtin/clean.c:877 msgid "remove ignored files, too" msgstr "也删除忽略的文件" -#: builtin/clean.c:885 +#: builtin/clean.c:879 msgid "remove only ignored files" msgstr "只删除忽略的文件" -#: builtin/clean.c:903 +#: builtin/clean.c:897 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" -#: builtin/clean.c:907 +#: builtin/clean.c:901 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:910 +#: builtin/clean.c:904 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clone.c:36 -msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "git clone [选项] [--] <版本库> [<路径>]" - -#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 -#: builtin/push.c:504 -msgid "force progress reporting" -msgstr "强制显示进度报告" +#: builtin/clone.c:37 +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<选项>] [--] <仓库> [<路径>]" -#: builtin/clone.c:66 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "不创建一个检出" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476 msgid "create a bare repository" -msgstr "创建一个裸版本库" +msgstr "创建一个纯仓库" -#: builtin/clone.c:71 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" -msgstr "创建一个镜像版本库（也是裸版本库）" +msgstr "创建一个镜像仓库（也是纯仓库）" -#: builtin/clone.c:73 +#: builtin/clone.c:69 msgid "to clone from a local repository" -msgstr "从本地版本库克隆" +msgstr "从本地仓库克隆" -#: builtin/clone.c:75 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "不使用本地硬链接，始终复制" -#: builtin/clone.c:77 +#: builtin/clone.c:73 msgid "setup as shared repository" -msgstr "设置为共享版本库" +msgstr "设置为共享仓库" -#: builtin/clone.c:79 builtin/clone.c:81 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "在克隆时初始化子模组" -#: builtin/clone.c:82 builtin/init-db.c:483 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "并发克隆的子模组的数量" + +#: builtin/clone.c:80 builtin/init-db.c:473 msgid "template-directory" msgstr "模板目录" -#: builtin/clone.c:83 builtin/init-db.c:484 +#: builtin/clone.c:81 builtin/init-db.c:474 msgid "directory from which templates will be used" msgstr "模板目录将被使用" -#: builtin/clone.c:85 +#: builtin/clone.c:83 builtin/submodule--helper.c:495 +#: builtin/submodule--helper.c:833 msgid "reference repository" -msgstr "参考版本库" +msgstr "参考仓库" + +#: builtin/clone.c:85 +msgid "use --reference only while cloning" +msgstr "仅在克隆时参考 --reference 指向的本地仓库" #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" @@ -3764,17 +5446,18 @@ msgstr "名称" #: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" -msgstr "使用<名称>而不是 'origin' 去跟踪上游" +msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" #: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" -msgstr "检出<分支>而不是远程HEAD" +msgstr "检出 <分支> 而不是远程 HEAD" #: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661 +#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 +#: builtin/pull.c:201 msgid "depth" msgstr "深度" @@ -3786,73 +5469,93 @@ msgstr "创建一个指定深度的浅克隆" msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" -#: builtin/clone.c:96 builtin/init-db.c:492 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "子模组将以浅下载模式克隆" + +#: builtin/clone.c:98 builtin/init-db.c:482 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:97 builtin/init-db.c:493 +#: builtin/clone.c:99 builtin/init-db.c:483 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" -#: builtin/clone.c:98 +#: builtin/clone.c:100 msgid "key=value" msgstr "key=value" -#: builtin/clone.c:99 +#: builtin/clone.c:101 msgid "set config inside the new repository" -msgstr "在新版本库中设置配置信息" +msgstr "在新仓库中设置配置信息" -#: builtin/clone.c:252 +#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547 +msgid "use IPv4 addresses only" +msgstr "只使用 IPv4 地址" + +#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549 +msgid "use IPv6 addresses only" +msgstr "只使用 IPv6 地址" + +#: builtin/clone.c:241 +msgid "" +"No directory name could be guessed.\n" +"Please specify a directory on the command line" +msgstr "" +"无法猜到目录名。\n" +"请在命令行指定一个目录" + +#: builtin/clone.c:307 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" + +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." -msgstr "参考版本库 '%s' 不是一个本地版本库。" +msgstr "参考仓库 '%s' 不是一个本地仓库。" -#: builtin/clone.c:256 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" -msgstr "参考版本库 '%s' 是一个浅克隆" +msgstr "参考仓库 '%s' 是一个浅克隆" -#: builtin/clone.c:259 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" -msgstr "参考版本库 '%s' 已被嫁接" - -#: builtin/clone.c:321 -#, c-format -msgid "failed to create directory '%s'" -msgstr "无法创建目录 '%s'" +msgstr "参考仓库 '%s' 已被嫁接" -#: builtin/clone.c:323 builtin/diff.c:83 +#: builtin/clone.c:376 #, c-format -msgid "failed to stat '%s'" -msgstr "无法枚举 '%s' 状态" +msgid "failed to open '%s'" +msgstr "无法打开 '%s'" -#: builtin/clone.c:325 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" -#: builtin/clone.c:339 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "无法枚举 %s 状态\n" -#: builtin/clone.c:361 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "无法创建链接 '%s'" -#: builtin/clone.c:365 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "无法拷贝文件至 '%s'" -#: builtin/clone.c:388 builtin/clone.c:565 +#: builtin/clone.c:449 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:401 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -3862,114 +5565,127 @@ msgstr "" "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" "'git checkout -f HEAD' 重试\n" -#: builtin/clone.c:480 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:560 -#, c-format -msgid "Checking connectivity... " -msgstr "检查连接... " - -#: builtin/clone.c:563 +#: builtin/clone.c:633 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必须的对象" -#: builtin/clone.c:626 +#: builtin/clone.c:649 +#, c-format +msgid "unable to update %s" +msgstr "不能更新 %s" + +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:657 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "不能检出工作区" -#: builtin/clone.c:765 +#: builtin/clone.c:766 +msgid "unable to write parameters to config file" +msgstr "无法将参数写入配置文件" + +#: builtin/clone.c:829 +msgid "cannot repack to clean up" +msgstr "无法执行 repack 来清理" + +#: builtin/clone.c:831 +msgid "cannot unlink temporary alternates file" +msgstr "无法删除临时的 alternates 文件" + +#: builtin/clone.c:863 builtin/receive-pack.c:1855 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:769 +#: builtin/clone.c:867 msgid "You must specify a repository to clone." -msgstr "您必须指定一个版本库来克隆。" +msgstr "您必须指定一个仓库来克隆。" -#: builtin/clone.c:780 +#: builtin/clone.c:878 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:783 +#: builtin/clone.c:881 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 选项不兼容。" -#: builtin/clone.c:796 +#: builtin/clone.c:894 #, c-format msgid "repository '%s' does not exist" -msgstr "版本库 '%s' 不存在" +msgstr "仓库 '%s' 不存在" -#: builtin/clone.c:802 -msgid "--depth is ignored in local clones; use file:// instead." -msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" - -#: builtin/clone.c:805 -msgid "source repository is shallow, ignoring --local" -msgstr "源版本库是浅克隆，忽略 --local" - -#: builtin/clone.c:810 -msgid "--local is ignored" -msgstr "--local 被忽略" - -#: builtin/clone.c:814 builtin/fetch.c:1119 +#: builtin/clone.c:900 builtin/fetch.c:1293 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" -#: builtin/clone.c:824 +#: builtin/clone.c:910 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:834 +#: builtin/clone.c:920 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:847 builtin/clone.c:859 +#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544 +#: builtin/worktree.c:222 builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:850 +#: builtin/clone.c:938 #, c-format -msgid "could not create work tree dir '%s'." -msgstr "不能为 '%s' 创建工作区目录。" +msgid "could not create work tree dir '%s'" +msgstr "不能创建工作区目录 '%s'" -#: builtin/clone.c:869 +#: builtin/clone.c:956 #, c-format msgid "Cloning into bare repository '%s'...\n" -msgstr "克隆到裸版本库 '%s'...\n" +msgstr "克隆到纯仓库 '%s'...\n" -#: builtin/clone.c:871 +#: builtin/clone.c:958 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:906 +#: builtin/clone.c:997 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" + +#: builtin/clone.c:1000 +msgid "source repository is shallow, ignoring --local" +msgstr "源仓库是浅克隆，忽略 --local" + +#: builtin/clone.c:1005 +msgid "--local is ignored" +msgstr "--local 被忽略" + +#: builtin/clone.c:1009 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" -#: builtin/clone.c:957 builtin/clone.c:965 +#: builtin/clone.c:1058 builtin/clone.c:1066 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:968 +#: builtin/clone.c:1069 msgid "You appear to have cloned an empty repository." -msgstr "您似乎克隆了一个空版本库。" +msgstr "您似乎克隆了一个空仓库。" #: builtin/column.c:9 -msgid "git column [options]" -msgstr "git column [选项]" +msgid "git column [<options>]" +msgstr "git column [<选项>]" #: builtin/column.c:26 msgid "lookup config vars" @@ -3999,15 +5715,39 @@ msgstr "两列之间的填充空间" msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" -#: builtin/commit.c:36 -msgid "git commit [options] [--] <pathspec>..." -msgstr "git commit [选项] [--] <路径规则>..." +#: builtin/commit.c:38 +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<选项>] [--] <路径规格>..." -#: builtin/commit.c:41 -msgid "git status [options] [--] <pathspec>..." -msgstr "git status [选项] [--] <路径规则>..." +#: builtin/commit.c:43 +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<选项>] [--] <路径规格>..." -#: builtin/commit.c:46 +#: builtin/commit.c:48 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" +"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" +"中编辑您的配置文件：\n" +"\n" +" git config --global --edit\n" +"\n" +"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n" +"\n" +" git commit --amend --reset-author\n" + +#: builtin/commit.c:61 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4021,7 +5761,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" -"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息：\n" +"与否。您可以对其进行设置以免再出现本提示信息：\n" "\n" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" @@ -4030,7 +5770,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:58 +#: builtin/commit.c:73 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -4039,7 +5779,7 @@ msgstr "" "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" -#: builtin/commit.c:63 +#: builtin/commit.c:78 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4053,11 +5793,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:70 +#: builtin/commit.c:85 msgid "Otherwise, please use 'git reset'\n" msgstr "否则，请使用命令 'git reset'\n" -#: builtin/commit.c:73 +#: builtin/commit.c:88 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4073,93 +5813,103 @@ msgstr "" "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" "操作。\n" -#: builtin/commit.c:288 +#: builtin/commit.c:308 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" -#: builtin/commit.c:330 +#: builtin/commit.c:349 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:336 +#: builtin/commit.c:355 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440 +#: builtin/commit.c:368 +msgid "unable to update temporary index" +msgstr "无法更新临时索引" + +#: builtin/commit.c:370 +msgid "Failed to update main cache tree" +msgstr "不能更新树的主缓存" + +#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:421 +#: builtin/commit.c:448 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:423 +#: builtin/commit.c:450 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:433 +#: builtin/commit.c:459 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:453 +#: builtin/commit.c:478 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:544 builtin/commit.c:550 +#: builtin/commit.c:583 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "提交 '%s' 缺少作者信息" + +#: builtin/commit.c:585 #, c-format -msgid "invalid commit: %s" -msgstr "无效的提交：%s" +msgid "commit '%s' has malformed author line" +msgstr "提交 '%s' 有非法的作者信息" -#: builtin/commit.c:572 +#: builtin/commit.c:604 msgid "malformed --author parameter" msgstr "非法的 --author 参数" -#: builtin/commit.c:592 +#: builtin/commit.c:612 #, c-format -msgid "Malformed ident string: '%s'" -msgstr "非法的身份字符串：'%s'" +msgid "invalid date format: %s" +msgstr "无效的日期格式：%s" -#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014 +#: builtin/commit.c:656 +msgid "" +"unable to select a comment character that is not used\n" +"in the current commit message" +msgstr "无法选择一个未被当前提交说明使用的注释字符" + +#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:641 builtin/shortlog.c:273 +#: builtin/commit.c:705 builtin/shortlog.c:286 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:643 +#: builtin/commit.c:707 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:647 +#: builtin/commit.c:711 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:654 -msgid "commit has empty message" -msgstr "提交说明为空" - -#: builtin/commit.c:670 -msgid "could not read MERGE_MSG" -msgstr "不能读取 MERGE_MSG" - -#: builtin/commit.c:674 +#: builtin/commit.c:738 builtin/commit.c:746 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:678 -#, c-format -msgid "could not read '%s'" -msgstr "不能读取 '%s'" +#: builtin/commit.c:743 +msgid "could not read MERGE_MSG" +msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:749 +#: builtin/commit.c:797 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:764 +#: builtin/commit.c:815 #, c-format msgid "" "\n" @@ -4173,7 +5923,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:769 +#: builtin/commit.c:820 #, c-format msgid "" "\n" @@ -4187,7 +5937,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:782 +#: builtin/commit.c:833 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4196,7 +5946,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:789 +#: builtin/commit.c:840 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4207,873 +5957,911 @@ msgstr "" "也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:802 +#: builtin/commit.c:860 +#, c-format +msgid "%sAuthor: %.*s <%.*s>" +msgstr "%s作者： %.*s <%.*s>" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: builtin/commit.c:868 #, c-format -msgid "%sAuthor: %s" -msgstr "%s作者： %s" +msgid "%sDate: %s" +msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:809 +#: builtin/commit.c:875 #, c-format -msgid "%sCommitter: %s" -msgstr "%s提交者： %s" +msgid "%sCommitter: %.*s <%.*s>" +msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:829 +#: builtin/commit.c:893 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:872 +#: builtin/commit.c:950 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:887 builtin/tag.c:391 +#: builtin/commit.c:965 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:989 +#: builtin/commit.c:1067 #, c-format -msgid "No existing author found with '%s'" -msgstr "没有找到匹配 '%s' 的作者" +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配" -#: builtin/commit.c:1004 builtin/commit.c:1244 +#: builtin/commit.c:1082 builtin/commit.c:1322 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1041 +#: builtin/commit.c:1119 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" -#: builtin/commit.c:1071 +#: builtin/commit.c:1149 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1080 +#: builtin/commit.c:1158 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1083 +#: builtin/commit.c:1161 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1085 +#: builtin/commit.c:1163 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1088 +#: builtin/commit.c:1166 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1098 +#: builtin/commit.c:1176 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1100 +#: builtin/commit.c:1178 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" -#: builtin/commit.c:1108 +#: builtin/commit.c:1186 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1125 +#: builtin/commit.c:1203 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1127 +#: builtin/commit.c:1205 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1129 +#: builtin/commit.c:1207 msgid "Clever... amending the last one with dirty index." -msgstr "聪明... 在索引不干净下修补最后的提交。" +msgstr "聪明... 用脏索引修补最后一个提交。" -#: builtin/commit.c:1131 +#: builtin/commit.c:1209 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..." -#: builtin/commit.c:1143 builtin/tag.c:639 +#: builtin/commit.c:1221 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" -#: builtin/commit.c:1148 +#: builtin/commit.c:1226 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项同时使用没有意义。" -#: builtin/commit.c:1258 builtin/commit.c:1516 +#: builtin/commit.c:1336 builtin/commit.c:1622 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1260 builtin/commit.c:1518 +#: builtin/commit.c:1338 builtin/commit.c:1624 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490 +#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522 +#: builtin/worktree.c:440 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1265 builtin/commit.c:1522 +#: builtin/commit.c:1343 builtin/commit.c:1628 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1268 builtin/commit.c:1525 +#: builtin/commit.c:1346 builtin/commit.c:1631 msgid "terminate entries with NUL" -msgstr "条目以NUL字符结尾" +msgstr "条目以 NUL 字符结尾" -#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674 -#: builtin/fast-export.c:677 builtin/tag.c:514 +#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981 +#: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "模式" -#: builtin/commit.c:1271 builtin/commit.c:1528 +#: builtin/commit.c:1349 builtin/commit.c:1634 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1274 +#: builtin/commit.c:1352 msgid "show ignored files" msgstr "显示忽略的文件" -#: builtin/commit.c:1275 parse-options.h:153 +#: builtin/commit.c:1353 parse-options.h:155 msgid "when" msgstr "何时" -#: builtin/commit.c:1276 +#: builtin/commit.c:1354 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1278 +#: builtin/commit.c:1356 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1347 +#: builtin/commit.c:1442 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1349 +#: builtin/commit.c:1444 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1390 +#: builtin/commit.c:1489 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:1392 +#: builtin/commit.c:1492 msgid " (root-commit)" msgstr "（根提交）" -#: builtin/commit.c:1486 +#: builtin/commit.c:1592 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1487 +#: builtin/commit.c:1593 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1489 +#: builtin/commit.c:1595 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1490 builtin/tag.c:512 +#: builtin/commit.c:1596 builtin/tag.c:351 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1491 +#: builtin/commit.c:1597 msgid "author" msgstr "作者" -#: builtin/commit.c:1491 +#: builtin/commit.c:1597 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1492 builtin/gc.c:272 +#: builtin/commit.c:1598 builtin/gc.c:326 msgid "date" msgstr "日期" -#: builtin/commit.c:1492 +#: builtin/commit.c:1598 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409 -#: builtin/notes.c:566 builtin/tag.c:510 +#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396 +#: builtin/notes.c:559 builtin/tag.c:349 msgid "message" msgstr "说明" -#: builtin/commit.c:1493 +#: builtin/commit.c:1599 msgid "commit message" msgstr "提交说明" -#: builtin/commit.c:1494 +#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602 +#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79 +msgid "commit" +msgstr "提交" + +#: builtin/commit.c:1600 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1495 +#: builtin/commit.c:1601 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" -#: builtin/commit.c:1496 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1497 +#: builtin/commit.c:1603 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1498 +#: builtin/commit.c:1604 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1499 builtin/log.c:1180 builtin/revert.c:86 +#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "添加 Signed-off-by: 签名" -#: builtin/commit.c:1500 +#: builtin/commit.c:1606 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1501 +#: builtin/commit.c:1607 msgid "force edit of commit" msgstr "强制编辑提交" # 译者：可选值，不能翻译（或是原文中笔误，应为 mode） -#: builtin/commit.c:1502 +#: builtin/commit.c:1608 msgid "default" msgstr "default" -#: builtin/commit.c:1502 builtin/tag.c:515 +#: builtin/commit.c:1608 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "设置如何删除提交说明里的空格和#注释" -#: builtin/commit.c:1503 +#: builtin/commit.c:1609 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92 -#: builtin/tag.c:516 -msgid "key-id" -msgstr "key-id" - -#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93 +#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165 +#: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG 提交签名" -#: builtin/commit.c:1508 +#: builtin/commit.c:1614 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1509 +#: builtin/commit.c:1615 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1510 +#: builtin/commit.c:1616 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1511 +#: builtin/commit.c:1617 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1512 +#: builtin/commit.c:1618 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1513 +#: builtin/commit.c:1619 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1514 -msgid "bypass pre-commit hook" -msgstr "绕过 pre-commit 钩子" +#: builtin/commit.c:1620 +msgid "bypass pre-commit and commit-msg hooks" +msgstr "绕过 pre-commit 和 commit-msg 钩子" -#: builtin/commit.c:1515 +#: builtin/commit.c:1621 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1526 +#: builtin/commit.c:1632 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1527 +#: builtin/commit.c:1633 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1532 +#: builtin/commit.c:1638 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1534 +#: builtin/commit.c:1640 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1562 +#: builtin/commit.c:1669 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1601 builtin/merge.c:518 -#, c-format -msgid "could not open '%s' for reading" -msgstr "不能为读入打开 '%s'" - -#: builtin/commit.c:1608 +#: builtin/commit.c:1719 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1615 +#: builtin/commit.c:1726 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1634 +#: builtin/commit.c:1745 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1645 +#: builtin/commit.c:1756 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1650 +#: builtin/commit.c:1761 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882 -msgid "failed to write commit object" -msgstr "无法写提交对象" - -#: builtin/commit.c:1686 -msgid "cannot lock HEAD ref" -msgstr "无法锁定 HEAD 引用" - -#: builtin/commit.c:1690 -msgid "cannot update HEAD ref" -msgstr "无法更新 HEAD 引用" - -#: builtin/commit.c:1701 +#: builtin/commit.c:1809 msgid "" "Repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full or quota is\n" +"new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" -"版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n" +"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满\n" "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。" -#: builtin/config.c:8 -msgid "git config [options]" -msgstr "git config [选项]" +#: builtin/config.c:9 +msgid "git config [<options>]" +msgstr "git config [<选项>]" -#: builtin/config.c:53 +#: builtin/config.c:55 msgid "Config file location" msgstr "配置文件位置" -#: builtin/config.c:54 +#: builtin/config.c:56 msgid "use global config file" msgstr "使用全局配置文件" -#: builtin/config.c:55 +#: builtin/config.c:57 msgid "use system config file" msgstr "使用系统级配置文件" -#: builtin/config.c:56 +#: builtin/config.c:58 msgid "use repository config file" -msgstr "使用版本库级配置文件" +msgstr "使用仓库级配置文件" -#: builtin/config.c:57 +#: builtin/config.c:59 msgid "use given config file" msgstr "使用指定的配置文件" -#: builtin/config.c:58 +#: builtin/config.c:60 msgid "blob-id" -msgstr "数据对象ID" +msgstr "数据对象 ID" -#: builtin/config.c:58 +#: builtin/config.c:60 msgid "read config from given blob object" msgstr "从给定的数据对象读取配置" -#: builtin/config.c:59 +#: builtin/config.c:61 msgid "Action" msgstr "操作" -#: builtin/config.c:60 +#: builtin/config.c:62 msgid "get value: name [value-regex]" msgstr "获取值：name [value-regex]" -#: builtin/config.c:61 +#: builtin/config.c:63 msgid "get all values: key [value-regex]" msgstr "获得所有的值：key [value-regex]" -#: builtin/config.c:62 +#: builtin/config.c:64 msgid "get values for regexp: name-regex [value-regex]" msgstr "根据正则表达式获得值：name-regex [value-regex]" -#: builtin/config.c:63 +#: builtin/config.c:65 msgid "get value specific for the URL: section[.var] URL" msgstr "获得 URL 取值：section[.var] URL" -#: builtin/config.c:64 +#: builtin/config.c:66 msgid "replace all matching variables: name value [value_regex]" msgstr "替换所有匹配的变量：name value [value_regex]" -#: builtin/config.c:65 +#: builtin/config.c:67 msgid "add a new variable: name value" msgstr "添加一个新的变量：name value" -#: builtin/config.c:66 +#: builtin/config.c:68 msgid "remove a variable: name [value-regex]" msgstr "删除一个变量：name [value-regex]" -#: builtin/config.c:67 +#: builtin/config.c:69 msgid "remove all matches: name [value-regex]" msgstr "删除所有匹配项：name [value-regex]" -#: builtin/config.c:68 +#: builtin/config.c:70 msgid "rename section: old-name new-name" msgstr "重命名小节：old-name new-name" -#: builtin/config.c:69 +#: builtin/config.c:71 msgid "remove a section: name" msgstr "删除一个小节：name" -#: builtin/config.c:70 +#: builtin/config.c:72 msgid "list all" msgstr "列出所有" -#: builtin/config.c:71 +#: builtin/config.c:73 msgid "open an editor" msgstr "打开一个编辑器" -#: builtin/config.c:72 builtin/config.c:73 -msgid "slot" -msgstr "slot" - -#: builtin/config.c:72 -msgid "find the color configured: [default]" -msgstr "找到配置的颜色：[默认]" +#: builtin/config.c:74 +msgid "find the color configured: slot [default]" +msgstr "获得配置的颜色：配置 [默认]" -#: builtin/config.c:73 -msgid "find the color setting: [stdout-is-tty]" -msgstr "找到颜色设置：[stdout-is-tty]" +#: builtin/config.c:75 +msgid "find the color setting: slot [stdout-is-tty]" +msgstr "获得颜色设置：配置 [stdout-is-tty]" -#: builtin/config.c:74 +#: builtin/config.c:76 msgid "Type" msgstr "类型" -#: builtin/config.c:75 +#: builtin/config.c:77 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" -#: builtin/config.c:76 +#: builtin/config.c:78 msgid "value is decimal number" msgstr "值是十进制数" -#: builtin/config.c:77 +#: builtin/config.c:79 msgid "value is --bool or --int" msgstr "值是 --bool or --int" -#: builtin/config.c:78 +#: builtin/config.c:80 msgid "value is a path (file or directory name)" msgstr "值是一个路径（文件或目录名）" -#: builtin/config.c:79 +#: builtin/config.c:81 msgid "Other" msgstr "其它" -#: builtin/config.c:80 +#: builtin/config.c:82 msgid "terminate values with NUL byte" -msgstr "终止值是NUL字节" +msgstr "终止值是 NUL 字节" -#: builtin/config.c:81 +#: builtin/config.c:83 +msgid "show variable names only" +msgstr "只显示变量名" + +#: builtin/config.c:84 msgid "respect include directives on lookup" msgstr "查询时参照 include 指令递归查找" -#: builtin/count-objects.c:82 +#: builtin/config.c:85 +msgid "show origin of config (file, standard input, blob, command line)" +msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）" + +#: builtin/config.c:327 +msgid "unable to parse default color value" +msgstr "不能解析默认颜色值" + +#: builtin/config.c:471 +#, c-format +msgid "" +"# This is Git's per-user configuration file.\n" +"[user]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tname = %s\n" +"#\temail = %s\n" +msgstr "" +"# This is Git's per-user configuration file.\n" +"[user]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tname = %s\n" +"#\temail = %s\n" + +#: builtin/config.c:613 +#, c-format +msgid "cannot create configuration file %s" +msgstr "不能创建配置文件 %s" + +#: builtin/count-objects.c:77 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:87 msgid "print sizes in human readable format" msgstr "以用户可读的格式显示大小" -#: builtin/describe.c:16 -msgid "git describe [options] <commit-ish>*" -msgstr "git describe [选项] <提交号>*" - #: builtin/describe.c:17 -msgid "git describe [options] --dirty" -msgstr "git describe [选项] --dirty" +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<选项>] [<提交号>...]" + +#: builtin/describe.c:18 +msgid "git describe [<options>] --dirty" +msgstr "git describe [<选项>] --dirty" -#: builtin/describe.c:225 +#: builtin/describe.c:217 #, c-format msgid "annotated tag %s not available" -msgstr "注释 tag %s 无效" +msgstr "附注标签 %s 无效" -#: builtin/describe.c:229 +#: builtin/describe.c:221 #, c-format msgid "annotated tag %s has no embedded name" -msgstr "注释 tag %s 没有嵌入名称" +msgstr "附注标签 %s 没有嵌入名称" -#: builtin/describe.c:231 +#: builtin/describe.c:223 #, c-format msgid "tag '%s' is really '%s' here" -msgstr "tag '%s' 的确是在 '%s'" +msgstr "标签 '%s' 的确是在 '%s'" -#: builtin/describe.c:258 +#: builtin/describe.c:250 builtin/log.c:480 #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" -#: builtin/describe.c:261 +#: builtin/describe.c:253 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: builtin/describe.c:278 +#: builtin/describe.c:270 #, c-format msgid "no tag exactly matches '%s'" -msgstr "没有 tag 准确匹配 '%s'" +msgstr "没有标签准确匹配 '%s'" -#: builtin/describe.c:280 +#: builtin/describe.c:272 #, c-format msgid "searching to describe %s\n" msgstr "搜索描述 %s\n" -#: builtin/describe.c:327 +#: builtin/describe.c:319 #, c-format msgid "finished search at %s\n" msgstr "完成搜索 %s\n" -#: builtin/describe.c:354 +#: builtin/describe.c:346 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -"没有注释 tag 能描述 '%s'。\n" -"然而，有非注释 tag：尝试 --tags。" +"没有附注标签能描述 '%s'。\n" +"然而，存在未附注标签：尝试 --tags。" -#: builtin/describe.c:358 +#: builtin/describe.c:350 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -"没有注释 tag 能描述 '%s'。\n" -"尝试 --always，或者创建一些 tag。" +"没有标签能描述 '%s'。\n" +"尝试 --always，或者创建一些标签。" -#: builtin/describe.c:379 +#: builtin/describe.c:371 #, c-format msgid "traversed %lu commits\n" msgstr "已遍历 %lu 个提交\n" -#: builtin/describe.c:382 +#: builtin/describe.c:374 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -"发现多于 %i 个 tag，列出最近的 %i 个\n" +"发现多于 %i 个标签，列出最近的 %i 个\n" "在 %s 放弃搜索\n" -#: builtin/describe.c:404 +#: builtin/describe.c:396 msgid "find the tag that comes after the commit" -msgstr "寻找提交之后的 tag（用于描述提交）" +msgstr "寻找该提交之后的标签" -#: builtin/describe.c:405 +#: builtin/describe.c:397 msgid "debug search strategy on stderr" msgstr "在标准错误上调试搜索策略" -#: builtin/describe.c:406 +#: builtin/describe.c:398 msgid "use any ref" msgstr "使用任意引用" -#: builtin/describe.c:407 +#: builtin/describe.c:399 msgid "use any tag, even unannotated" -msgstr "使用任意 tag，即使未带注解" +msgstr "使用任意标签，即使未附带注释" -#: builtin/describe.c:408 +#: builtin/describe.c:400 msgid "always use long format" msgstr "始终使用长提交号格式" -#: builtin/describe.c:409 +#: builtin/describe.c:401 msgid "only follow first parent" msgstr "只跟随第一个父提交" -#: builtin/describe.c:412 +#: builtin/describe.c:404 msgid "only output exact matches" msgstr "只输出精确匹配" -#: builtin/describe.c:414 +#: builtin/describe.c:406 msgid "consider <n> most recent tags (default: 10)" -msgstr "考虑最近 <n> 个 tags（默认：10）" +msgstr "考虑最近 <n> 个标签（默认：10）" -#: builtin/describe.c:416 +#: builtin/describe.c:408 msgid "only consider tags matching <pattern>" -msgstr "只考虑匹配 <模式> 的 tags" +msgstr "只考虑匹配 <模式> 的标签" -#: builtin/describe.c:418 builtin/name-rev.c:321 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" -#: builtin/describe.c:419 +#: builtin/describe.c:411 msgid "mark" msgstr "标记" -#: builtin/describe.c:420 +#: builtin/describe.c:412 msgid "append <mark> on dirty working tree (default: \"-dirty\")" -msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）" +msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）" -#: builtin/describe.c:438 +#: builtin/describe.c:430 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 不兼容" -#: builtin/describe.c:464 +#: builtin/describe.c:456 msgid "No names found, cannot describe anything." msgstr "没有发现名称，无法描述任何东西。" -#: builtin/describe.c:484 +#: builtin/describe.c:476 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty 不能与提交同时使用" -#: builtin/diff.c:85 +#: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个正规文件或符号链接" -#: builtin/diff.c:236 +#: builtin/diff.c:237 #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" -#: builtin/diff.c:357 +#: builtin/diff.c:360 msgid "Not a git repository" -msgstr "不是一个 git 版本库" +msgstr "不是一个 git 仓库" -#: builtin/diff.c:400 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:409 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" -msgstr "提供了超过两个数据（blob）对象：'%s'" +msgstr "提供了超过两个数据对象：'%s'" -#: builtin/diff.c:416 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "无法处理的对象 '%s'。" -#: builtin/fast-export.c:22 +#: builtin/fast-export.c:25 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:673 +#: builtin/fast-export.c:980 msgid "show progress after <n> objects" msgstr "在 <n> 个对象之后显示进度" -#: builtin/fast-export.c:675 +#: builtin/fast-export.c:982 msgid "select handling of signed tags" -msgstr "选择如何处理签名 tags" +msgstr "选择如何处理签名标签" -#: builtin/fast-export.c:678 +#: builtin/fast-export.c:985 msgid "select handling of tags that tag filtered objects" -msgstr "选择当 tag 指向被过滤时 tags 的处理方式" +msgstr "选择当标签指向被过滤对象时该标签的处理方式" -#: builtin/fast-export.c:681 +#: builtin/fast-export.c:988 msgid "Dump marks to this file" msgstr "把标记存储到这个文件" -#: builtin/fast-export.c:683 +#: builtin/fast-export.c:990 msgid "Import marks from this file" msgstr "从这个文件导入标记" -#: builtin/fast-export.c:685 +#: builtin/fast-export.c:992 msgid "Fake a tagger when tags lack one" -msgstr "当 tags 缺少标记者字段时，假装提供一个" +msgstr "当标签缺少标记者字段时，假装提供一个" -#: builtin/fast-export.c:687 +#: builtin/fast-export.c:994 msgid "Output full tree for each commit" msgstr "每次提交都输出整个树" -#: builtin/fast-export.c:689 +#: builtin/fast-export.c:996 msgid "Use the done feature to terminate the stream" msgstr "使用 done 功能来终止流" -#: builtin/fast-export.c:690 +#: builtin/fast-export.c:997 msgid "Skip output of blob data" msgstr "跳过数据对象的输出" -#: builtin/fetch.c:20 -msgid "git fetch [<options>] [<repository> [<refspec>...]]" -msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]" +#: builtin/fast-export.c:998 +msgid "refspec" +msgstr "引用规格" + +#: builtin/fast-export.c:999 +msgid "Apply refspec to exported refs" +msgstr "对导出的引用应用引用规格" + +#: builtin/fast-export.c:1000 +msgid "anonymize output" +msgstr "匿名输出" #: builtin/fetch.c:21 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" + +#: builtin/fetch.c:22 msgid "git fetch [<options>] <group>" msgstr "git fetch [<选项>] <组>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" -msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]" +msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c:75 +#: builtin/fetch.c:93 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "从所有的远程抓取" -#: builtin/fetch.c:77 +#: builtin/fetch.c:95 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" -#: builtin/fetch.c:79 +#: builtin/fetch.c:97 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" -#: builtin/fetch.c:80 +#: builtin/fetch.c:98 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" -#: builtin/fetch.c:82 +#: builtin/fetch.c:100 msgid "fetch from multiple remotes" msgstr "从多个远程抓取" -#: builtin/fetch.c:84 +#: builtin/fetch.c:102 builtin/pull.c:184 msgid "fetch all tags and associated objects" -msgstr "抓取所有的 tags 和关联对象" +msgstr "抓取所有的标签和关联对象" -#: builtin/fetch.c:86 +#: builtin/fetch.c:104 msgid "do not fetch all tags (--no-tags)" -msgstr "不抓取任何 tags (--no-tags)" +msgstr "不抓取任何标签(--no-tags)" + +#: builtin/fetch.c:106 +msgid "number of submodules fetched in parallel" +msgstr "子模组获取的并发数" -#: builtin/fetch.c:88 +#: builtin/fetch.c:108 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" # 译者：可选值，不能翻译 -#: builtin/fetch.c:89 +#: builtin/fetch.c:109 builtin/pull.c:190 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:90 +#: builtin/fetch.c:110 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" -#: builtin/fetch.c:94 +#: builtin/fetch.c:114 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "保持下载包" -#: builtin/fetch.c:96 +#: builtin/fetch.c:116 msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" -#: builtin/fetch.c:99 +#: builtin/fetch.c:119 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" -#: builtin/fetch.c:101 +#: builtin/fetch.c:121 builtin/pull.c:205 msgid "convert to a complete repository" -msgstr "转换为一个完整的版本库" +msgstr "转换为一个完整的仓库" -#: builtin/fetch.c:103 builtin/log.c:1197 +#: builtin/fetch.c:123 builtin/log.c:1426 msgid "dir" msgstr "目录" -#: builtin/fetch.c:104 +#: builtin/fetch.c:124 msgid "prepend this to submodule path output" msgstr "在子模组路径输出的前面加上此目录" -#: builtin/fetch.c:107 +#: builtin/fetch.c:127 msgid "default mode for recursion" msgstr "递归的默认模式" -#: builtin/fetch.c:109 +#: builtin/fetch.c:129 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:347 +#: builtin/fetch.c:130 builtin/pull.c:210 +msgid "refmap" +msgstr "引用映射" + +#: builtin/fetch.c:131 builtin/pull.c:211 +msgid "specify fetch refmap" +msgstr "指定获取操作的引用映射" + +#: builtin/fetch.c:387 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:411 +#: builtin/fetch.c:503 +#, c-format +msgid "configuration fetch.output contains invalid value %s" +msgstr "配置变量 fetch.output 包含无效值 %s" + +#: builtin/fetch.c:592 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:416 +#: builtin/fetch.c:596 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:430 -#, c-format -msgid "! %-*s %-*s -> %s (can't fetch in current branch)" -msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）" - -#: builtin/fetch.c:431 builtin/fetch.c:517 +#: builtin/fetch.c:609 builtin/fetch.c:689 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:442 +#: builtin/fetch.c:610 +msgid "can't fetch in current branch" +msgstr "当前分支下不能执行获取操作" + +#: builtin/fetch.c:619 msgid "[tag update]" -msgstr "[tag更新]" +msgstr "[标签更新]" -# 译者：注意保持前导空格 -#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497 -msgid " (unable to update local ref)" -msgstr " （不能更新本地引用）" +#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669 +#: builtin/fetch.c:684 +msgid "unable to update local ref" +msgstr "不能更新本地引用" -#: builtin/fetch.c:462 +#: builtin/fetch.c:639 msgid "[new tag]" -msgstr "[新tag]" +msgstr "[新标签]" -#: builtin/fetch.c:465 +#: builtin/fetch.c:642 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:468 +#: builtin/fetch.c:645 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:513 -msgid "unable to update local ref" -msgstr "不能更新本地引用" - -#: builtin/fetch.c:513 +#: builtin/fetch.c:684 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:519 -msgid "(non-fast-forward)" -msgstr "（非快进式）" +#: builtin/fetch.c:689 +msgid "non-fast-forward" +msgstr "非快进" -#: builtin/fetch.c:552 builtin/fetch.c:785 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "无法打开 %s：%s\n" - -#: builtin/fetch.c:561 +#: builtin/fetch.c:733 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必须的对象\n" -#: builtin/fetch.c:579 +#: builtin/fetch.c:753 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "拒绝 %s 因为浅克隆不允许被更新" -#: builtin/fetch.c:667 builtin/fetch.c:750 +#: builtin/fetch.c:839 builtin/fetch.c:934 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:678 +#: builtin/fetch.c:850 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5083,539 +6871,576 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:730 +#: builtin/fetch.c:904 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为摇摆状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:731 +#: builtin/fetch.c:905 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为摇摆状态）" -#: builtin/fetch.c:755 +#: builtin/fetch.c:937 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:756 builtin/remote.c:1050 +#: builtin/fetch.c:938 builtin/remote.c:1020 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:775 +#: builtin/fetch.c:960 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "拒绝获取到非裸版本库的当前分支 %s" +msgstr "拒绝获取到非纯仓库的当前分支 %s" -#: builtin/fetch.c:794 +#: builtin/fetch.c:979 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:797 +#: builtin/fetch.c:982 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:853 +#: builtin/fetch.c:1039 #, c-format msgid "Don't know how to fetch from %s" msgstr "不知道如何从 %s 获取" -#: builtin/fetch.c:1015 +#: builtin/fetch.c:1199 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:1017 builtin/remote.c:90 +#: builtin/fetch.c:1201 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:1035 +#: builtin/fetch.c:1219 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." -msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。" +msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。" -#: builtin/fetch.c:1059 +#: builtin/fetch.c:1242 msgid "You need to specify a tag name." -msgstr "您需要指定一个 tag 名称。" +msgstr "您需要指定一个标签名称。" -#: builtin/fetch.c:1107 +#: builtin/fetch.c:1284 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:1109 +#: builtin/fetch.c:1286 msgid "--unshallow on a complete repository does not make sense" -msgstr "对于一个完整的版本库，参数 --unshallow 没有意义" +msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" -#: builtin/fetch.c:1132 +#: builtin/fetch.c:1306 msgid "fetch --all does not take a repository argument" -msgstr "fetch --all 不能带一个版本库参数" +msgstr "fetch --all 不能带一个仓库参数" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1308 msgid "fetch --all does not make sense with refspecs" -msgstr "fetch --all 带引用规则没有任何意义" +msgstr "fetch --all 带引用规格没有任何意义" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1319 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1153 +#: builtin/fetch.c:1327 msgid "Fetching a group and specifying refspecs does not make sense" -msgstr "获取组并指定引用规则没有意义" - -#: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" -msgstr "" -"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgstr "获取组并指定引用规格没有意义" -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700 -#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501 -#: parse-options.h:132 parse-options.h:239 -msgid "n" -msgstr "n" +#: builtin/fmt-merge-msg.c:14 +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" +msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" -#: builtin/fmt-merge-msg.c:664 +#: builtin/fmt-merge-msg.c:667 msgid "populate log with at most <n> entries from shortlog" msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:670 msgid "alias for --log (deprecated)" msgstr "参数 --log 的别名（已弃用）" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 msgid "text" msgstr "文本" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 msgid "use <text> as start of message" msgstr "使用 <文本> 作为提交说明的开始" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:675 msgid "file to read from" msgstr "从文件中读取" -#: builtin/for-each-ref.c:1063 -msgid "git for-each-ref [options] [<pattern>]" -msgstr "git for-each-ref [选项] [<模式>]" +#: builtin/for-each-ref.c:9 +msgid "git for-each-ref [<options>] [<pattern>]" +msgstr "git for-each-ref [<选项>] [<模式>]" + +#: builtin/for-each-ref.c:10 +msgid "git for-each-ref [--points-at <object>]" +msgstr "git for-each-ref [--points-at <对象>]" + +#: builtin/for-each-ref.c:11 +msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" +msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:12 +msgid "git for-each-ref [--contains [<object>]]" +msgstr "git for-each-ref [--contains [<对象>]]" + +#: builtin/for-each-ref.c:27 msgid "quote placeholders suitably for shells" msgstr "引用占位符适用于 shells" -#: builtin/for-each-ref.c:1080 +#: builtin/for-each-ref.c:29 msgid "quote placeholders suitably for perl" msgstr "引用占位符适用于 perl" -#: builtin/for-each-ref.c:1082 +#: builtin/for-each-ref.c:31 msgid "quote placeholders suitably for python" msgstr "引用占位符适用于 python" -#: builtin/for-each-ref.c:1084 -msgid "quote placeholders suitably for tcl" -msgstr "引用占位符适用于 tcl" +#: builtin/for-each-ref.c:33 +msgid "quote placeholders suitably for Tcl" +msgstr "引用占位符适用于 Tcl" -#: builtin/for-each-ref.c:1087 +#: builtin/for-each-ref.c:36 msgid "show only <n> matched refs" msgstr "只显示 <n> 个匹配的引用" -#: builtin/for-each-ref.c:1088 builtin/replace.c:177 -msgid "format" -msgstr "格式" - -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:37 builtin/tag.c:372 msgid "format to use for the output" msgstr "输出格式" -#: builtin/for-each-ref.c:1089 -msgid "key" -msgstr "key" +#: builtin/for-each-ref.c:41 +msgid "print only refs which points at the given object" +msgstr "只打印指向给定对象的引用" -#: builtin/for-each-ref.c:1090 -msgid "field name to sort on" -msgstr "排序的字段名" +#: builtin/for-each-ref.c:43 +msgid "print only refs that are merged" +msgstr "只打印已经合并的引用" -#: builtin/fsck.c:147 builtin/prune.c:172 -msgid "Checking connectivity" -msgstr "检查连接中" +#: builtin/for-each-ref.c:44 +msgid "print only refs that are not merged" +msgstr "只打印没有合并的引用" + +#: builtin/for-each-ref.c:45 +msgid "print only refs which contain the commit" +msgstr "只打印包含该提交的引用" -#: builtin/fsck.c:544 +#: builtin/fsck.c:519 msgid "Checking object directories" msgstr "检查对象目录中" -#: builtin/fsck.c:607 -msgid "git fsck [options] [<object>...]" -msgstr "git fsck [选项] [<对象>...]" +#: builtin/fsck.c:588 +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<选项>] [<对象>...]" -#: builtin/fsck.c:613 +#: builtin/fsck.c:594 msgid "show unreachable objects" msgstr "显示不可达的对象" -#: builtin/fsck.c:614 +#: builtin/fsck.c:595 msgid "show dangling objects" msgstr "显示摇摆的对象" -#: builtin/fsck.c:615 +#: builtin/fsck.c:596 msgid "report tags" -msgstr "报告 tags" +msgstr "报告标签" -#: builtin/fsck.c:616 +#: builtin/fsck.c:597 msgid "report root nodes" msgstr "报告根节点" -#: builtin/fsck.c:617 +#: builtin/fsck.c:598 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" -#: builtin/fsck.c:618 +#: builtin/fsck.c:599 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点（默认）" -#: builtin/fsck.c:619 +#: builtin/fsck.c:600 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" -#: builtin/fsck.c:620 +#: builtin/fsck.c:601 +msgid "check only connectivity" +msgstr "仅检查连通性" + +#: builtin/fsck.c:602 msgid "enable more strict checking" msgstr "启用更严格的检查" -#: builtin/fsck.c:622 +#: builtin/fsck.c:604 msgid "write dangling objects in .git/lost-found" msgstr "将摇摆对象写入 .git/lost-found 中" -#: builtin/fsck.c:623 builtin/prune.c:144 +#: builtin/fsck.c:605 builtin/prune.c:107 msgid "show progress" msgstr "显示进度" -#: builtin/fsck.c:673 +#: builtin/fsck.c:606 +msgid "show verbose names for reachable objects" +msgstr "显示可达对象的详细名称" + +#: builtin/fsck.c:671 msgid "Checking objects" msgstr "检查对象中" -#: builtin/gc.c:24 -msgid "git gc [options]" -msgstr "git gc [选项]" +#: builtin/gc.c:25 +msgid "git gc [<options>]" +msgstr "git gc [<选项>]" -#: builtin/gc.c:90 +#: builtin/gc.c:72 #, c-format msgid "Invalid %s: '%s'" -msgstr "无效的 %s：'%s'" +msgstr "无效 %s：'%s'" -#: builtin/gc.c:117 +#: builtin/gc.c:139 #, c-format msgid "insanely long object directory %.*s" msgstr "不正常的长对象目录 %.*s" -#: builtin/gc.c:273 +#: builtin/gc.c:290 +#, c-format +msgid "" +"The last gc run reported the following. Please correct the root cause\n" +"and remove %s.\n" +"Automatic cleanup will not be performed until the file is removed.\n" +"\n" +"%s" +msgstr "" +"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" +"在该文件被删除之前，自动清理将不会执行。\n" +"\n" +"%s" + +#: builtin/gc.c:327 msgid "prune unreferenced objects" msgstr "清除未引用的对象" -#: builtin/gc.c:275 +#: builtin/gc.c:329 msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" -#: builtin/gc.c:276 +#: builtin/gc.c:330 msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" -#: builtin/gc.c:277 +#: builtin/gc.c:331 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" -#: builtin/gc.c:318 +#: builtin/gc.c:373 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" -msgstr "自动在后台执行版本库打包以求最佳性能。\n" +msgstr "自动在后台执行仓库打包以求最佳性能。\n" -#: builtin/gc.c:320 +#: builtin/gc.c:375 #, c-format msgid "Auto packing the repository for optimum performance.\n" -msgstr "自动打包版本库以求最佳性能。\n" +msgstr "自动打包仓库以求最佳性能。\n" -#: builtin/gc.c:321 +#: builtin/gc.c:376 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护参见 \"git help gc\"。\n" -#: builtin/gc.c:336 +#: builtin/gc.c:397 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）" -#: builtin/gc.c:361 +#: builtin/gc.c:441 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" -#: builtin/grep.c:218 +#: builtin/grep.c:219 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep：无法创建线程：%s" -#: builtin/grep.c:365 +#: builtin/grep.c:277 #, c-format -msgid "Failed to chdir: %s" -msgstr "无法切换目录：%s" +msgid "invalid number of threads specified (%d) for %s" +msgstr "为 %2$s 设定的线程数 (%1$d) 无效" -#: builtin/grep.c:443 builtin/grep.c:478 +#: builtin/grep.c:452 builtin/grep.c:487 #, c-format msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" -#: builtin/grep.c:493 +#: builtin/grep.c:502 #, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:549 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:566 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: builtin/grep.c:640 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" -#: builtin/grep.c:642 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/grep.c:644 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" -#: builtin/grep.c:646 -msgid "search also in ignored files" -msgstr "也在忽略的文件中搜索" +#: builtin/grep.c:652 +msgid "ignore files specified via '.gitignore'" +msgstr "忽略 '.gitignore' 包含的文件" -#: builtin/grep.c:649 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "显示未匹配的行" -#: builtin/grep.c:651 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "不区分大小写匹配" -#: builtin/grep.c:653 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" -#: builtin/grep.c:655 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "把二进制文件当做文本处理" -#: builtin/grep.c:657 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" -#: builtin/grep.c:660 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处理二进制文件" -#: builtin/grep.c:662 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下寻找" -#: builtin/grep.c:666 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" -#: builtin/grep.c:669 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" -#: builtin/grep.c:672 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" -#: builtin/grep.c:675 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" -#: builtin/grep.c:678 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "显示行号" -#: builtin/grep.c:679 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "不显示文件名" -#: builtin/grep.c:680 +#: builtin/grep.c:686 msgid "show filenames" msgstr "显示文件名" -#: builtin/grep.c:682 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/grep.c:684 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" -#: builtin/grep.c:686 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" -#: builtin/grep.c:689 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" -#: builtin/grep.c:691 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" -#: builtin/grep.c:693 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" -#: builtin/grep.c:694 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "高亮显示匹配项" -#: builtin/grep.c:696 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" -#: builtin/grep.c:698 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" -#: builtin/grep.c:701 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "显示匹配项前后的 <n> 行上下文" -#: builtin/grep.c:704 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "显示匹配项前 <n> 行上下文" -#: builtin/grep.c:706 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "显示匹配项后 <n> 行上下文" -#: builtin/grep.c:707 +#: builtin/grep.c:714 +msgid "use <n> worker threads" +msgstr "使用 <n> 个工作线程" + +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" -#: builtin/grep.c:710 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" -#: builtin/grep.c:712 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "显示所在函数的前后内容" -#: builtin/grep.c:715 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "从文件读取模式" -#: builtin/grep.c:717 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "匹配 <模式>" -#: builtin/grep.c:719 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" -#: builtin/grep.c:731 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" -#: builtin/grep.c:733 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" -#: builtin/grep.c:735 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "显示 grep 表达式的解析树" -#: builtin/grep.c:739 +#: builtin/grep.c:747 msgid "pager" msgstr "分页" -#: builtin/grep.c:739 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "分页显示匹配的文件" -#: builtin/grep.c:742 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:743 builtin/show-ref.c:187 -msgid "show usage" -msgstr "显示用法" - -#: builtin/grep.c:810 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "未提供模式匹配。" -#: builtin/grep.c:868 +#: builtin/grep.c:845 builtin/index-pack.c:1479 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "指定的线程数无效（%d）" + +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:891 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" -#: builtin/grep.c:896 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 或 --untracked 不能和版本同时使用。" -#: builtin/grep.c:899 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" -#: builtin/grep.c:907 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" -#: builtin/hash-object.c:60 +#: builtin/hash-object.c:81 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" -"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] " -"<文件>..." +"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " +"[--] <文件>..." -#: builtin/hash-object.c:61 -msgid "git hash-object --stdin-paths < <list-of-paths>" -msgstr "git hash-object --stdin-paths < <路径列表>" +#: builtin/hash-object.c:82 +msgid "git hash-object --stdin-paths" +msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:72 builtin/tag.c:521 +#: builtin/hash-object.c:93 msgid "type" msgstr "类型" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:93 msgid "object type" msgstr "对象类型" -#: builtin/hash-object.c:73 +#: builtin/hash-object.c:94 msgid "write the object into the object database" msgstr "将对象写入对象数据库" -#: builtin/hash-object.c:74 +#: builtin/hash-object.c:96 msgid "read the object from stdin" msgstr "从标准输入读取对象" -#: builtin/hash-object.c:76 +#: builtin/hash-object.c:98 msgid "store file as is without filters" msgstr "原样存储文件不使用过滤器" -#: builtin/hash-object.c:77 +#: builtin/hash-object.c:99 +msgid "" +"just hash any random garbage to create corrupt objects for debugging Git" +msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" + +#: builtin/hash-object.c:100 msgid "process file as it were from this path" msgstr "处理文件并假设其来自于此路径" @@ -5640,1100 +7465,1207 @@ msgid "show info page" msgstr "显示 info 手册" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" #: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c:92 +#: builtin/help.c:91 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c:105 +#: builtin/help.c:104 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c:113 +#: builtin/help.c:112 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 +#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "无法执行 '%s'：%s" +msgid "failed to exec '%s'" +msgstr "无法执行 '%s'" -#: builtin/help.c:216 +#: builtin/help.c:205 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" -"请使用 'man.<tool>.cmd'。" +"请使用 'man.<工具>.cmd'。" -#: builtin/help.c:228 +#: builtin/help.c:217 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" "'%s': 支持的 man 手册查看器命令。\n" -"请使用 'man.<tool>.path'。" +"请使用 'man.<工具>.path'。" -#: builtin/help.c:353 +#: builtin/help.c:334 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:370 +#: builtin/help.c:351 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:378 +#: builtin/help.c:359 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:424 +#: builtin/help.c:401 msgid "Defining attributes per path" msgstr "定义路径的属性" -#: builtin/help.c:425 +#: builtin/help.c:402 +msgid "Everyday Git With 20 Commands Or So" +msgstr "每一天 Git 常用的约 20 条命令" + +#: builtin/help.c:403 msgid "A Git glossary" msgstr "Git 词汇表" -#: builtin/help.c:426 +#: builtin/help.c:404 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未跟踪文件" -#: builtin/help.c:427 +#: builtin/help.c:405 msgid "Defining submodule properties" msgstr "定义子模组属性" -#: builtin/help.c:428 +#: builtin/help.c:406 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本范围" -#: builtin/help.c:429 +#: builtin/help.c:407 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "一个 Git 教程（针对 1.5.1 或更新版本）" -#: builtin/help.c:430 +#: builtin/help.c:408 msgid "An overview of recommended workflows with Git" msgstr "Git 推荐的工作流概览" -#: builtin/help.c:442 +#: builtin/help.c:420 msgid "The common Git guides are:\n" msgstr "最常用的 Git 向导有：\n" -#: builtin/help.c:463 builtin/help.c:480 +#: builtin/help.c:441 builtin/help.c:458 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:496 +#: builtin/help.c:474 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别名" -#: builtin/index-pack.c:184 +#: builtin/index-pack.c:153 +#, c-format +msgid "unable to open %s" +msgstr "不能打开 %s" + +#: builtin/index-pack.c:203 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型不匹配" -#: builtin/index-pack.c:204 -msgid "object of unexpected type" -msgstr "意外的类型的对象" +#: builtin/index-pack.c:223 +#, c-format +msgid "did not receive expected object %s" +msgstr "未能获取期望的对象 %s" + +#: builtin/index-pack.c:226 +#, c-format +msgid "object %s: expected type %s, found %s" +msgstr "对象 %s：期待类型 %s，却是 %s" -#: builtin/index-pack.c:244 +#: builtin/index-pack.c:268 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "无法填充 %d 字节" msgstr[1] "无法填充 %d 字节" -#: builtin/index-pack.c:254 +#: builtin/index-pack.c:278 msgid "early EOF" msgstr "过早的文件结束符（EOF）" -#: builtin/index-pack.c:255 +#: builtin/index-pack.c:279 msgid "read error on input" msgstr "输入上的读错误" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:291 msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c:274 +#: builtin/index-pack.c:298 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" -#: builtin/index-pack.c:290 +#: builtin/index-pack.c:314 #, c-format msgid "unable to create '%s'" msgstr "不能创建 '%s'" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:319 #, c-format msgid "cannot open packfile '%s'" msgstr "无法打开包文件 '%s'" -#: builtin/index-pack.c:309 +#: builtin/index-pack.c:333 msgid "pack signature mismatch" msgstr "包签名不匹配" -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:335 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "不支持包版本 %<PRIu32>" -#: builtin/index-pack.c:329 +#: builtin/index-pack.c:353 #, c-format -msgid "pack has bad object at offset %lu: %s" -msgstr "包中有错误的对象位于 %lu：%s" +msgid "pack has bad object at offset %<PRIuMAX>: %s" +msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s" -#: builtin/index-pack.c:451 +#: builtin/index-pack.c:475 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" -#: builtin/index-pack.c:500 +#: builtin/index-pack.c:524 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" -#: builtin/index-pack.c:508 +#: builtin/index-pack.c:532 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" -#: builtin/index-pack.c:516 +#: builtin/index-pack.c:540 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" -#: builtin/index-pack.c:547 +#: builtin/index-pack.c:571 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: builtin/index-pack.c:549 +#: builtin/index-pack.c:573 #, c-format -msgid "premature end of pack file, %lu byte missing" -msgid_plural "premature end of pack file, %lu bytes missing" -msgstr[0] "包文件过早结束，缺少 %lu 字节" -msgstr[1] "包文件过早结束，缺少 %lu 字节" +msgid "premature end of pack file, %<PRIuMAX> byte missing" +msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" +msgstr[0] "包文件过早结束，缺少 %<PRIuMAX> 字节" +msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节" -#: builtin/index-pack.c:575 +#: builtin/index-pack.c:599 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" -#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695 -#: builtin/index-pack.c:729 builtin/index-pack.c:738 +#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774 +#: builtin/index-pack.c:808 builtin/index-pack.c:817 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:669 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:748 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "不能读 %s" -#: builtin/index-pack.c:735 +#: builtin/index-pack.c:814 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" -#: builtin/index-pack.c:749 +#: builtin/index-pack.c:828 #, c-format msgid "invalid blob object %s" -msgstr "无效的数据（blob）对象 %s" +msgstr "无效的数据对象 %s" -#: builtin/index-pack.c:763 +#: builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/index-pack.c:766 +#: builtin/index-pack.c:845 msgid "Error in object" msgstr "对象中出错" -#: builtin/index-pack.c:768 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c:839 builtin/index-pack.c:869 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "无法应用 delta" -#: builtin/index-pack.c:1010 +#: builtin/index-pack.c:1120 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:1010 +#: builtin/index-pack.c:1120 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:1036 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c:1041 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "不能枚举包文件状态" -#: builtin/index-pack.c:1044 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1171 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" -#: builtin/index-pack.c:1078 +#: builtin/index-pack.c:1196 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1088 +#: builtin/index-pack.c:1207 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1249 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1138 +#: builtin/index-pack.c:1255 #, c-format -msgid "completed with %d local objects" -msgstr "完成 %d 个本地对象" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "完成 %d 个本地对象" +msgstr[1] "完成 %d 个本地对象" -#: builtin/index-pack.c:1148 +#: builtin/index-pack.c:1267 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1271 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" -#: builtin/index-pack.c:1177 +#: builtin/index-pack.c:1295 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1256 +#: builtin/index-pack.c:1371 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1280 +#: builtin/index-pack.c:1395 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1293 +#: builtin/index-pack.c:1408 #, c-format msgid "cannot write keep file '%s'" msgstr "无法写保留文件 '%s'" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1416 #, c-format msgid "cannot close written keep file '%s'" msgstr "无法关闭保留文件 '%s'" -#: builtin/index-pack.c:1314 +#: builtin/index-pack.c:1429 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1325 +#: builtin/index-pack.c:1440 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1358 +#: builtin/index-pack.c:1473 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1364 -#, c-format -msgid "invalid number of threads specified (%d)" -msgstr "指定的线程数无效（%d）" - -#: builtin/index-pack.c:1368 builtin/index-pack.c:1546 +#: builtin/index-pack.c:1483 builtin/index-pack.c:1681 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" -#: builtin/index-pack.c:1426 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1428 +#: builtin/index-pack.c:1544 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1475 +#: builtin/index-pack.c:1591 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 个对象" msgstr[1] "非 delta：%d 个对象" -#: builtin/index-pack.c:1482 +#: builtin/index-pack.c:1598 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "链长 = %d: %lu 对象" msgstr[1] "链长 = %d: %lu 对象" -#: builtin/index-pack.c:1510 -msgid "Cannot come back to cwd" -msgstr "无法返回当前工作目录" +#: builtin/index-pack.c:1611 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "包文件名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1558 builtin/index-pack.c:1561 -#: builtin/index-pack.c:1573 builtin/index-pack.c:1577 +#: builtin/index-pack.c:1693 builtin/index-pack.c:1696 +#: builtin/index-pack.c:1712 builtin/index-pack.c:1716 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1591 +#: builtin/index-pack.c:1730 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1595 builtin/index-pack.c:1605 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "包名 '%s' 没有以 '.pack' 结尾" - -#: builtin/index-pack.c:1614 +#: builtin/index-pack.c:1738 msgid "--verify with no packfile name given" -msgstr "--verify 没有提供包名参数" - -#: builtin/init-db.c:35 -#, c-format -msgid "Could not make %s writable by group" -msgstr "不能设置 %s 为组可写" - -#: builtin/init-db.c:62 -#, c-format -msgid "insanely long template name %s" -msgstr "太长的模版名 %s" +msgstr "--verify 没有提供包文件名参数" -#: builtin/init-db.c:67 +#: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "不能枚举 '%s' 状态" -#: builtin/init-db.c:73 +#: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" msgstr "不能枚举模版 '%s' 状态" -#: builtin/init-db.c:80 +#: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "不能打开目录 '%s'" -#: builtin/init-db.c:97 +#: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "不能读取链接 '%s'" -#: builtin/init-db.c:99 -#, c-format -msgid "insanely long symlink %s" -msgstr "太长的符号链接 %s" - -#: builtin/init-db.c:102 +#: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "不能自 '%s' 到 '%s' 创建符号链接" -#: builtin/init-db.c:106 +#: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" -#: builtin/init-db.c:110 +#: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "忽略模版 %s" -#: builtin/init-db.c:133 -#, c-format -msgid "insanely long template path %s" -msgstr "太长的模版路径 %s" - -#: builtin/init-db.c:141 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "模版未找到 %s" -#: builtin/init-db.c:154 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" +msgid "not copying templates from '%s': %s" +msgstr "没有从 '%s' 复制模版：%s" -#: builtin/init-db.c:192 -#, c-format -msgid "insane git directory %s" -msgstr "不正常的 git 目录 %s" - -#: builtin/init-db.c:323 builtin/init-db.c:326 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s 已经存在" -#: builtin/init-db.c:355 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" -#: builtin/init-db.c:358 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" -#. TRANSLATORS: The first '%s' is either "Reinitialized -#. existing" or "Initialized empty", the second " shared" or -#. "", and the last '%s%s' is the verbatim directory name. -#: builtin/init-db.c:418 +#: builtin/init-db.c:402 #, c-format -msgid "%s%s Git repository in %s%s\n" -msgstr "%s%s Git 版本库于 %s%s\n" - -#: builtin/init-db.c:419 -msgid "Reinitialized existing" -msgstr "重新初始化现存的" +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:419 -msgid "Initialized empty" -msgstr "初始化空的" +#: builtin/init-db.c:403 +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" -# 译者：中文字符串拼接，可删除前导空格 -#: builtin/init-db.c:420 -msgid " shared" -msgstr "共享" +#: builtin/init-db.c:407 +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "已初始化空的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:439 -msgid "cannot tell cwd" -msgstr "无法获知当前路径" +#: builtin/init-db.c:408 +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "已初始化空的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:465 +#: builtin/init-db.c:455 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " -"[目录]" +"[<目录>]" -#: builtin/init-db.c:488 +#: builtin/init-db.c:478 msgid "permissions" msgstr "权限" -#: builtin/init-db.c:489 +#: builtin/init-db.c:479 msgid "specify that the git repository is to be shared amongst several users" -msgstr "指定 git 版本库是多个用户之间共享的" +msgstr "指定 git 仓库是多个用户之间共享的" -#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168 -msgid "be quiet" -msgstr "保持安静" - -#: builtin/init-db.c:523 builtin/init-db.c:528 +#: builtin/init-db.c:513 builtin/init-db.c:518 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:532 +#: builtin/init-db.c:522 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:554 +#: builtin/init-db.c:543 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" -msgstr "" -"不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-" -"dir=<directory>）" +msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）" -#: builtin/init-db.c:578 -msgid "Cannot access current working directory" -msgstr "不能访问当前工作目录" - -#: builtin/init-db.c:585 +#: builtin/init-db.c:571 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" -#: builtin/log.c:41 -msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" -msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n" +#: builtin/interpret-trailers.c:15 +msgid "" +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " +"<token>[(=|:)<value>])...] [<file>...]" +msgstr "" +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" +">])...] [<文件>...]" + +#: builtin/interpret-trailers.c:26 +msgid "edit files in place" +msgstr "在原位编辑文件" -#: builtin/log.c:42 -msgid " or: git show [options] <object>..." -msgstr " 或者：git show [选项] <对象>..." +#: builtin/interpret-trailers.c:27 +msgid "trim empty trailers" +msgstr "删除空签名" + +#: builtin/interpret-trailers.c:28 +msgid "trailer" +msgstr "签名" + +#: builtin/interpret-trailers.c:29 +msgid "trailer(s) to add" +msgstr "要添加的签名" + +#: builtin/interpret-trailers.c:42 +msgid "no input file given for in-place editing" +msgstr "没有给出要原位编辑的文件" + +#: builtin/log.c:44 +msgid "git log [<options>] [<revision-range>] [[--] <path>...]" +msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" + +#: builtin/log.c:45 +msgid "git show [<options>] <object>..." +msgstr "git show [<选项>] <对象>..." + +#: builtin/log.c:84 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "无效的 --decorate 选项：%s" -#: builtin/log.c:125 +#: builtin/log.c:139 msgid "suppress diff output" msgstr "不显示差异输出" -#: builtin/log.c:126 +#: builtin/log.c:140 msgid "show source" msgstr "显示源" -#: builtin/log.c:127 +#: builtin/log.c:141 msgid "Use mail map file" msgstr "使用邮件映射文件" -#: builtin/log.c:128 +#: builtin/log.c:142 msgid "decorate options" msgstr "修饰选项" -#: builtin/log.c:231 +#: builtin/log.c:145 +msgid "Process line range n,m in file, counting from 1" +msgstr "处理文件中第 n 到 m 之间的行，从 1 开始" + +#: builtin/log.c:241 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:473 builtin/log.c:565 +#: builtin/log.c:486 +#, c-format +msgid "git show %s: bad file" +msgstr "git show %s: 损坏的文件" + +#: builtin/log.c:500 builtin/log.c:594 #, c-format msgid "Could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:589 +#: builtin/log.c:618 #, c-format msgid "Unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:689 +#: builtin/log.c:739 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:771 +#: builtin/log.c:839 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:787 +#: builtin/log.c:854 #, c-format msgid "Cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:801 +#: builtin/log.c:868 msgid "Need exactly one range." msgstr "只需要一个范围。" -#: builtin/log.c:809 +#: builtin/log.c:878 msgid "Not a range." msgstr "不是一个范围。" -#: builtin/log.c:911 +#: builtin/log.c:984 msgid "Cover letter needs email format" msgstr "信封需要邮件地址格式" -#: builtin/log.c:987 +#: builtin/log.c:1064 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1015 -msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "git format-patch [选项] [<从> | <修订集范围>]" +#: builtin/log.c:1092 +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<选项>] [<从> | <版本范围>]" -#: builtin/log.c:1060 +#: builtin/log.c:1137 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1175 +#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897 +#, c-format +msgid "Unknown commit %s" +msgstr "未知提交 %s" + +#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305 +#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425 +#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594 +#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "无法解析 '%s' 为一个有效引用。" + +#: builtin/log.c:1259 +msgid "Could not find exact merge base." +msgstr "不能找到准确的合并基线。" + +#: builtin/log.c:1263 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "" +"无法得到上游地址，如果你想自动记录基线提交，请使用命令\n" +"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" +"参数 --base=<base-commit-id> 手动指定一个基线提交。" + +#: builtin/log.c:1283 +msgid "Failed to find exact merge base" +msgstr "无法找到准确的合并基线" + +#: builtin/log.c:1294 +msgid "base commit should be the ancestor of revision list" +msgstr "基线提交应该是版本列表的祖先" + +#: builtin/log.c:1298 +msgid "base commit shouldn't be in revision list" +msgstr "基线提交不应该出现在版本列表中" + +#: builtin/log.c:1347 +msgid "cannot get patch id" +msgstr "无法得到补丁 id" + +#: builtin/log.c:1404 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c:1178 +#: builtin/log.c:1407 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c:1182 +#: builtin/log.c:1411 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c:1184 +#: builtin/log.c:1413 msgid "generate a cover letter" msgstr "生成一封附信" -#: builtin/log.c:1186 +#: builtin/log.c:1415 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1187 +#: builtin/log.c:1416 msgid "sfx" msgstr "后缀" -#: builtin/log.c:1188 +#: builtin/log.c:1417 msgid "use <sfx> instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1190 +#: builtin/log.c:1419 msgid "start numbering patches at <n> instead of 1" msgstr "补丁以 <n> 开始编号，而不是1" -#: builtin/log.c:1192 +#: builtin/log.c:1421 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c:1194 +#: builtin/log.c:1423 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1197 +#: builtin/log.c:1426 msgid "store resulting files in <dir>" -msgstr "把结果文件存储在 <dir>" +msgstr "把结果文件存储在 <目录>" -#: builtin/log.c:1200 +#: builtin/log.c:1429 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1203 +#: builtin/log.c:1432 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c:1205 +#: builtin/log.c:1434 +msgid "output all-zero hash in From header" +msgstr "在 From 头信息中输出全为零的哈希值" + +#: builtin/log.c:1436 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1207 +#: builtin/log.c:1438 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c:1209 +#: builtin/log.c:1440 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c:1210 +#: builtin/log.c:1441 msgid "header" msgstr "header" -#: builtin/log.c:1211 +#: builtin/log.c:1442 msgid "add email header" msgstr "添加邮件头" -#: builtin/log.c:1212 builtin/log.c:1214 +#: builtin/log.c:1443 builtin/log.c:1445 msgid "email" msgstr "邮件地址" -#: builtin/log.c:1212 +#: builtin/log.c:1443 msgid "add To: header" msgstr "添加收件人" -#: builtin/log.c:1214 +#: builtin/log.c:1445 msgid "add Cc: header" msgstr "添加抄送" -#: builtin/log.c:1216 +#: builtin/log.c:1447 msgid "ident" -msgstr "ident" +msgstr "标识" -#: builtin/log.c:1217 +#: builtin/log.c:1448 msgid "set From address to <ident> (or committer ident if absent)" -msgstr "设置 From 地址为 <ident>（如若不提供，用提交者ID做为地址）" +msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" -#: builtin/log.c:1219 +#: builtin/log.c:1450 msgid "message-id" -msgstr "message-id" +msgstr "邮件标识" -#: builtin/log.c:1220 +#: builtin/log.c:1451 msgid "make first mail a reply to <message-id>" -msgstr "使第一封邮件作为对 <message-id> 的回复" +msgstr "使第一封邮件作为对 <邮件标识> 的回复" -#: builtin/log.c:1221 builtin/log.c:1224 +#: builtin/log.c:1452 builtin/log.c:1455 msgid "boundary" msgstr "边界" -#: builtin/log.c:1222 +#: builtin/log.c:1453 msgid "attach the patch" msgstr "附件方式添加补丁" -#: builtin/log.c:1225 +#: builtin/log.c:1456 msgid "inline the patch" msgstr "内联显示补丁" -#: builtin/log.c:1229 +#: builtin/log.c:1460 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" -#: builtin/log.c:1231 +#: builtin/log.c:1462 msgid "signature" msgstr "签名" -#: builtin/log.c:1232 +#: builtin/log.c:1463 msgid "add a signature" msgstr "添加一个签名" -#: builtin/log.c:1233 +#: builtin/log.c:1464 +msgid "base-commit" +msgstr "基线提交" + +#: builtin/log.c:1465 +msgid "add prerequisite tree info to the patch series" +msgstr "为补丁列表添加前置树信息" + +#: builtin/log.c:1467 +msgid "add a signature from a file" +msgstr "从文件添加一个签名" + +#: builtin/log.c:1468 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" -#: builtin/log.c:1307 -#, c-format -msgid "invalid ident line: %s" -msgstr "包含无效的身份标识：%s" - -#: builtin/log.c:1322 +#: builtin/log.c:1558 msgid "-n and -k are mutually exclusive." msgstr "-n 和 -k 互斥。" -#: builtin/log.c:1324 +#: builtin/log.c:1560 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix 和 -k 互斥。" -#: builtin/log.c:1332 +#: builtin/log.c:1568 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1334 +#: builtin/log.c:1570 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1336 +#: builtin/log.c:1572 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1359 +#: builtin/log.c:1602 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1361 +#: builtin/log.c:1604 #, c-format msgid "Could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/log.c:1509 +#: builtin/log.c:1698 +#, c-format +msgid "unable to read signature file '%s'" +msgstr "无法读取签名文件 '%s'" + +#: builtin/log.c:1769 msgid "Failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:1558 +#: builtin/log.c:1818 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:1613 +#: builtin/log.c:1872 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" -msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n" - -#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640 -#, c-format -msgid "Unknown commit %s" -msgstr "未知提交 %s" +msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" -msgstr "git ls-files [选项] [<文件>...]" +#: builtin/ls-files.c:379 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<选项>] [<文件>...]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:428 msgid "identify the file status with tags" msgstr "用标签标识文件的状态" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:430 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小写字母表示 '假设未改变的' 文件" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:432 msgid "show cached files in the output (default)" msgstr "显示缓存的文件（默认）" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:434 msgid "show deleted files in the output" msgstr "显示已删除的文件" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:436 msgid "show modified files in the output" msgstr "显示已修改的文件" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:438 msgid "show other files in the output" msgstr "显示其它文件" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:440 msgid "show ignored files in the output" msgstr "显示忽略的文件" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:443 msgid "show staged contents' object name in the output" msgstr "显示暂存区内容的对象名称" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:445 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需要删除的文件" -#: builtin/ls-files.c:477 -msgid "show 'other' directories' name only" +#: builtin/ls-files.c:447 +msgid "show 'other' directories' names only" msgstr "只显示“其他”目录的名称" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:449 +msgid "show line endings of files" +msgstr "显示文件换行符格式" + +#: builtin/ls-files.c:451 msgid "don't show empty directories" msgstr "不显示空目录" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:454 msgid "show unmerged files in the output" msgstr "显示未合并的文件" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:456 msgid "show resolve-undo information" msgstr "显示 resolve-undo 信息" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:458 msgid "skip files matching pattern" msgstr "匹配排除文件的模式" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:461 msgid "exclude patterns are read from <file>" msgstr "从 <文件> 中读取排除模式" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:464 msgid "read additional per-directory exclude patterns in <file>" msgstr "从 <文件> 读取额外的每个目录的排除模式" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:466 msgid "add the standard git exclusions" msgstr "添加标准的 git 排除" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:469 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:472 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:473 msgid "tree-ish" msgstr "树或提交" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:474 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:476 msgid "show debugging data" msgstr "显示调试数据" +#: builtin/ls-remote.c:7 +msgid "" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<repository> [<refs>...]]" +msgstr "" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<仓库> [<引用>...]]" + +#: builtin/ls-remote.c:50 +msgid "do not print remote URL" +msgstr "不打印远程 URL" + +#: builtin/ls-remote.c:51 builtin/ls-remote.c:53 +msgid "exec" +msgstr "exec" + +#: builtin/ls-remote.c:52 builtin/ls-remote.c:54 +msgid "path of git-upload-pack on the remote host" +msgstr "远程主机上的 git-upload-pack 路径" + +#: builtin/ls-remote.c:56 +msgid "limit to tags" +msgstr "仅限于标签" + +#: builtin/ls-remote.c:57 +msgid "limit to heads" +msgstr "仅限于分支" + +#: builtin/ls-remote.c:58 +msgid "do not show peeled tags" +msgstr "不显示已解析的标签" + +#: builtin/ls-remote.c:60 +msgid "take url.<base>.insteadOf into account" +msgstr "参考 url.<base>.insteadOf 设置" + +#: builtin/ls-remote.c:62 +msgid "exit with exit code 2 if no matching refs are found" +msgstr "若未找到匹配的引用则以退出码2退出" + +#: builtin/ls-remote.c:64 +msgid "show underlying ref in addition to the object pointed by it" +msgstr "除了显示指向的对象外，显示指向的引用名" + #: builtin/ls-tree.c:28 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" -#: builtin/ls-tree.c:126 +#: builtin/ls-tree.c:128 msgid "only show trees" msgstr "只显示树" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:130 msgid "recurse into subtrees" msgstr "递归到子树" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:132 msgid "show trees when recursing" msgstr "当递归时显示树" -#: builtin/ls-tree.c:133 +#: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" -msgstr "条目以NUL字符终止" +msgstr "条目以 NUL 字符终止" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:136 msgid "include object size" msgstr "包括对象大小" -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 +#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" msgstr "只列出文件名" -#: builtin/ls-tree.c:141 +#: builtin/ls-tree.c:143 msgid "use full path names" msgstr "使用文件的全路径" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）" -#: builtin/merge.c:43 -msgid "git merge [options] [<commit>...]" -msgstr "git merge [选项] [<提交>...]" +#: builtin/merge.c:46 +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<选项>] [<提交>...]" -#: builtin/merge.c:44 -msgid "git merge [options] <msg> HEAD <commit>" -msgstr "git merge [选项] <说明> HEAD <提交>" +#: builtin/merge.c:47 +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<选项>] <说明> HEAD <提交>" -#: builtin/merge.c:45 +#: builtin/merge.c:48 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:98 +#: builtin/merge.c:102 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" -#: builtin/merge.c:135 +#: builtin/merge.c:139 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合并策略 '%s'。\n" -#: builtin/merge.c:136 +#: builtin/merge.c:140 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c:141 +#: builtin/merge.c:145 #, c-format msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" -#: builtin/merge.c:191 +#: builtin/merge.c:195 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" -#: builtin/merge.c:194 +#: builtin/merge.c:198 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "在合并的最后显示差异统计" -#: builtin/merge.c:195 +#: builtin/merge.c:199 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "（和 --stat 同义）" -#: builtin/merge.c:197 +#: builtin/merge.c:201 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录" -#: builtin/merge.c:200 +#: builtin/merge.c:204 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" -#: builtin/merge.c:202 +#: builtin/merge.c:206 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" -#: builtin/merge.c:204 +#: builtin/merge.c:208 builtin/pull.c:144 msgid "edit message before committing" msgstr "在提交前编辑提交说明" -#: builtin/merge.c:205 +#: builtin/merge.c:209 msgid "allow fast-forward (default)" msgstr "允许快进（默认）" -#: builtin/merge.c:207 +#: builtin/merge.c:211 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" -#: builtin/merge.c:211 -msgid "Verify that the named commit has a valid GPG signature" +#: builtin/merge.c:215 builtin/pull.c:153 +msgid "verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89 +#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157 +#: builtin/revert.c:89 msgid "strategy" msgstr "策略" -#: builtin/merge.c:213 +#: builtin/merge.c:217 builtin/pull.c:158 msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c:214 +#: builtin/merge.c:218 builtin/pull.c:161 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:215 +#: builtin/merge.c:219 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" -#: builtin/merge.c:217 +#: builtin/merge.c:221 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" -#: builtin/merge.c:221 +#: builtin/merge.c:225 msgid "abort the current in-progress merge" msgstr "放弃当前正在进行的合并" -#: builtin/merge.c:250 +#: builtin/merge.c:227 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "允许合并不相关的历史" + +#: builtin/merge.c:255 msgid "could not run stash." msgstr "不能进行进度保存。" -#: builtin/merge.c:255 +#: builtin/merge.c:260 msgid "stash failed" msgstr "进度保存失败" -#: builtin/merge.c:260 +#: builtin/merge.c:265 #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象：%s" -#: builtin/merge.c:279 builtin/merge.c:296 +#: builtin/merge.c:284 builtin/merge.c:301 msgid "read-tree failed" msgstr "读取树失败" # 译者：注意保持前导空格 -#: builtin/merge.c:326 +#: builtin/merge.c:331 msgid " (nothing to squash)" msgstr " （无可压缩）" -#: builtin/merge.c:339 +#: builtin/merge.c:342 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩提交 -- 未更新 HEAD\n" -#: builtin/merge.c:371 -msgid "Writing SQUASH_MSG" -msgstr "写入 SQUASH_MSG" - -#: builtin/merge.c:373 -msgid "Finishing SQUASH_MSG" -msgstr "完成 SQUASH_MSG" - -#: builtin/merge.c:396 +#: builtin/merge.c:392 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" -#: builtin/merge.c:446 +#: builtin/merge.c:443 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:558 +#: builtin/merge.c:533 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c:653 -msgid "git write-tree failed to write a tree" -msgstr "git write-tree 无法写入一树对象" - -#: builtin/merge.c:681 +#: builtin/merge.c:652 msgid "Not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" -#: builtin/merge.c:695 +#: builtin/merge.c:666 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:709 +#: builtin/merge.c:681 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:798 +#: builtin/merge.c:733 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:807 +#: builtin/merge.c:742 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:813 +#: builtin/merge.c:748 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6747,171 +8679,198 @@ msgstr "" "\n" "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n" -#: builtin/merge.c:837 +#: builtin/merge.c:772 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:849 +#: builtin/merge.c:792 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:914 +#: builtin/merge.c:847 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:930 +#: builtin/merge.c:863 #, c-format msgid "'%s' is not a commit" msgstr "'%s' 不是一个提交" -#: builtin/merge.c:971 +#: builtin/merge.c:904 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:973 +#: builtin/merge.c:906 msgid "No remote for the current branch." -msgstr "当前分支没有对应的远程版本库。" +msgstr "当前分支没有对应的远程仓库。" -#: builtin/merge.c:975 +#: builtin/merge.c:908 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:980 +#: builtin/merge.c:913 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1136 +#: builtin/merge.c:960 +#, c-format +msgid "Bad value '%s' in environment '%s'" +msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" + +#: builtin/merge.c:1034 +#, c-format +msgid "could not close '%s'" +msgstr "不能关闭 '%s'" + +#: builtin/merge.c:1061 +#, c-format +msgid "not something we can merge in %s: %s" +msgstr "不能在 %s 中合并：%s" + +#: builtin/merge.c:1095 +msgid "not something we can merge" +msgstr "不能合并" + +#: builtin/merge.c:1162 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1152 git-pull.sh:31 +#: builtin/merge.c:1178 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1155 git-pull.sh:34 -msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" - -#: builtin/merge.c:1159 +#: builtin/merge.c:1185 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1162 +#: builtin/merge.c:1188 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1171 +#: builtin/merge.c:1197 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 与 --no-ff 同时使用。" -#: builtin/merge.c:1180 +#: builtin/merge.c:1205 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1212 -msgid "Can merge only exactly one commit into empty head" -msgstr "只能将一个提交合并到空分支上" - -#: builtin/merge.c:1215 +#: builtin/merge.c:1222 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1217 +#: builtin/merge.c:1224 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1222 +#: builtin/merge.c:1229 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1273 +#: builtin/merge.c:1231 +msgid "Can merge only exactly one commit into empty head" +msgstr "只能将一个提交合并到空分支上" + +#: builtin/merge.c:1287 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: builtin/merge.c:1276 +#: builtin/merge.c:1290 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" -#: builtin/merge.c:1279 +#: builtin/merge.c:1293 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有一个 GPG 签名。" -#: builtin/merge.c:1282 +#: builtin/merge.c:1296 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: builtin/merge.c:1366 +#: builtin/merge.c:1358 +msgid "refusing to merge unrelated histories" +msgstr "拒绝合并无关的历史" + +#: builtin/merge.c:1367 +msgid "Already up-to-date." +msgstr "已经是最新的。" + +#: builtin/merge.c:1382 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1405 +#: builtin/merge.c:1419 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1412 +#: builtin/merge.c:1426 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1444 +#: builtin/merge.c:1451 +msgid "Already up-to-date. Yeeah!" +msgstr "已经是最新的。耶！" + +#: builtin/merge.c:1457 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1467 builtin/merge.c:1546 +#: builtin/merge.c:1480 builtin/merge.c:1559 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1471 +#: builtin/merge.c:1484 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1537 +#: builtin/merge.c:1550 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1552 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1548 +#: builtin/merge.c:1561 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1560 +#: builtin/merge.c:1573 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] <提交> <提交>..." +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <提交> <提交>..." #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus <提交>..." +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <提交>..." #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." @@ -6923,7 +8882,7 @@ msgstr "git merge-base --is-ancestor <提交> <提交>" #: builtin/merge-base.c:33 msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "git merge-base --fork-point <提交> [<提交>]" +msgstr "git merge-base --fork-point <引用> [<提交>]" #: builtin/merge-base.c:214 msgid "output all common ancestors" @@ -6943,14 +8902,15 @@ msgstr "第一个是其他的祖先提交么？" #: builtin/merge-base.c:222 msgid "find where <commit> forked from reflog of <ref>" -msgstr "查找 <commit> 从<引用>日志的何处分支的" +msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" #: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" -"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2" +"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" +"件> <文件2>" #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -6981,123 +8941,128 @@ msgid "do not warn about conflicts" msgstr "不要警告冲突" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" -msgstr "为 file1/orig_file/file2 设置标签" +msgid "set labels for file1/orig-file/file2" +msgstr "为 文件1/初始文件/文件2 设置标签" -#: builtin/mktree.c:64 +#: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:150 +#: builtin/mktree.c:152 msgid "input is NUL terminated" msgstr "输入以 NUL 字符终止" -#: builtin/mktree.c:151 builtin/write-tree.c:24 +#: builtin/mktree.c:153 builtin/write-tree.c:24 msgid "allow missing objects" msgstr "允许丢失的对象" -#: builtin/mktree.c:152 +#: builtin/mktree.c:154 msgid "allow creation of more than one tree" msgstr "允许创建一个以上的树" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" -msgstr "git mv [选项] <源>... <目标>" +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<选项>] <源>... <目标>" + +#: builtin/mv.c:70 +#, c-format +msgid "Directory %s is in index and no submodule?" +msgstr "目录 %s 在索引中并且不是子模组？" + +#: builtin/mv.c:72 builtin/rm.c:317 +msgid "Please stage your changes to .gitmodules or stash them to proceed" +msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续" -#: builtin/mv.c:71 +#: builtin/mv.c:90 +#, c-format +msgid "%.*s is in index" +msgstr "%.*s 在索引中" + +#: builtin/mv.c:112 msgid "force move/rename even if target exists" msgstr "强制移动/重命令，即使目标存在" -#: builtin/mv.c:72 +#: builtin/mv.c:113 msgid "skip move/rename errors" msgstr "跳过移动/重命名错误" -#: builtin/mv.c:122 +#: builtin/mv.c:155 +#, c-format +msgid "destination '%s' is not a directory" +msgstr "目标 '%s' 不是一个目录" + +#: builtin/mv.c:166 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "检查 '%s' 到 '%s' 的重命名\n" -#: builtin/mv.c:126 +#: builtin/mv.c:170 msgid "bad source" msgstr "坏的源" -#: builtin/mv.c:129 +#: builtin/mv.c:173 msgid "can not move directory into itself" msgstr "不能将目录移动到自身" -#: builtin/mv.c:132 +#: builtin/mv.c:176 msgid "cannot move directory over file" msgstr "不能将目录移动到文件" -#: builtin/mv.c:138 -#, c-format -msgid "Huh? Directory %s is in index and no submodule?" -msgstr "嗯？目录 %s 在索引中并且不是子模组？" - -#: builtin/mv.c:140 builtin/rm.c:318 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" - -#: builtin/mv.c:156 -#, c-format -msgid "Huh? %.*s is in index?" -msgstr "嗯？%.*s 在索引中？" - -#: builtin/mv.c:169 +#: builtin/mv.c:185 msgid "source directory is empty" msgstr "源目录为空" -#: builtin/mv.c:205 +#: builtin/mv.c:210 msgid "not under version control" msgstr "不在版本控制之下" -#: builtin/mv.c:207 +#: builtin/mv.c:213 msgid "destination exists" msgstr "目标已存在" -#: builtin/mv.c:215 +#: builtin/mv.c:221 #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" -#: builtin/mv.c:218 +#: builtin/mv.c:224 msgid "Cannot overwrite" msgstr "不能覆盖" -#: builtin/mv.c:221 +#: builtin/mv.c:227 msgid "multiple sources for the same target" msgstr "同一目标具有多个源" -#: builtin/mv.c:223 +#: builtin/mv.c:229 msgid "destination directory does not exist" msgstr "目标目录不存在" -#: builtin/mv.c:243 +#: builtin/mv.c:236 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，源=%s，目标=%s" -#: builtin/mv.c:253 +#: builtin/mv.c:257 #, c-format msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355 +#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" #: builtin/name-rev.c:258 -msgid "git name-rev [options] <commit>..." -msgstr "git name-rev [选项] <提交>..." +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<选项>] <提交>..." #: builtin/name-rev.c:259 -msgid "git name-rev [options] --all" -msgstr "git name-rev [选项] --all" +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<选项>] --all" #: builtin/name-rev.c:260 -msgid "git name-rev [options] --stdin" -msgstr "git name-rev [选项] --stdin" +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<选项>] --stdin" #: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" @@ -7105,7 +9070,7 @@ msgstr "只打印名称（无 SHA-1）" #: builtin/name-rev.c:313 msgid "only use tags to name the commits" -msgstr "只使用 tags 来命名提交" +msgstr "只使用标签来命名提交" #: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" @@ -7125,265 +9090,245 @@ msgstr "允许打印 `未定义` 的名称（默认）" #: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" -msgstr "反向解析输入中的 tags（内部使用）" +msgstr "反向解析输入中的标签（内部使用）" -#: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" +#: builtin/notes.c:25 +msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <注解引用>] [list [<对象>]]" -#: builtin/notes.c:25 +#: builtin/notes.c:26 msgid "" -"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " -"<object>] [<object>]" +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"| (-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对" -"象>] [<对象>]" +"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " +"| (-c | -C) <对象>] [<对象>]" -#: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +#: builtin/notes.c:27 +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" -#: builtin/notes.c:27 +#: builtin/notes.c:28 msgid "" -"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " -"<object>] [<object>]" +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"(-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象" -">] [<对象>]" - -#: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [<object>]" -msgstr "git notes [--ref <注解引用>] edit [<对象>]" +"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " +"(-c | -C) <对象>] [<对象>]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" -msgstr "git notes [--ref <注解引用>] show [<对象>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" +msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" #: builtin/notes.c:30 +msgid "git notes [--ref <notes-ref>] show [<object>]" +msgstr "git notes [--ref <注解引用>] show [<对象>]" + +#: builtin/notes.c:31 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" -#: builtin/notes.c:31 +#: builtin/notes.c:32 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:32 +#: builtin/notes.c:33 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" +#: builtin/notes.c:34 +msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <注解引用>] remove [<对象>...]" -#: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +#: builtin/notes.c:35 +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <注解引用>] prune [-n | -v]" -#: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" +#: builtin/notes.c:36 +msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <注解引用>] get-ref" -#: builtin/notes.c:40 +#: builtin/notes.c:41 msgid "git notes [list [<object>]]" msgstr "git notes [list [<对象>]]" -#: builtin/notes.c:45 +#: builtin/notes.c:46 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<选项>] [<对象>]" -#: builtin/notes.c:50 +#: builtin/notes.c:51 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<选项>] <源对象> <目标对象>" -#: builtin/notes.c:51 +#: builtin/notes.c:52 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<源对象> <目标对象>]..." -#: builtin/notes.c:56 +#: builtin/notes.c:57 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<选项>] [<对象>]" -#: builtin/notes.c:61 +#: builtin/notes.c:62 msgid "git notes edit [<object>]" msgstr "git notes edit [<对象>]" -#: builtin/notes.c:66 +#: builtin/notes.c:67 msgid "git notes show [<object>]" msgstr "git notes show [<对象>]" -#: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" +#: builtin/notes.c:72 +msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<选项>] <注解引用>" -#: builtin/notes.c:72 +#: builtin/notes.c:73 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<选项>]" -#: builtin/notes.c:73 +#: builtin/notes.c:74 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<选项>]" -#: builtin/notes.c:78 +#: builtin/notes.c:79 msgid "git notes remove [<object>]" msgstr "git notes remove [<对象>]" -#: builtin/notes.c:83 +#: builtin/notes.c:84 msgid "git notes prune [<options>]" msgstr "git notes prune [<选项>]" -#: builtin/notes.c:88 +#: builtin/notes.c:89 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:137 +#: builtin/notes.c:94 +msgid "Write/edit the notes for the following object:" +msgstr "为下面的对象写/编辑说明：" + +#: builtin/notes.c:147 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "不能为对象 '%s' 开始 'show'" -#: builtin/notes.c:141 +#: builtin/notes.c:151 msgid "could not read 'show' output" msgstr "不能读取 'show' 的输出" -#: builtin/notes.c:149 +#: builtin/notes.c:159 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" -#: builtin/notes.c:167 builtin/tag.c:373 -#, c-format -msgid "could not create file '%s'" -msgstr "不能创建文件 '%s'" - -#: builtin/notes.c:186 +#: builtin/notes.c:194 msgid "Please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解提供内容" -#: builtin/notes.c:207 builtin/notes.c:848 -#, c-format -msgid "Removing note for object %s\n" -msgstr "删除对象 %s 的注解\n" - -#: builtin/notes.c:212 +#: builtin/notes.c:203 msgid "unable to write note object" msgstr "不能写注解对象" -#: builtin/notes.c:214 +#: builtin/notes.c:205 #, c-format -msgid "The note contents has been left in %s" -msgstr "注解内容被留在文件 %s 中" +msgid "The note contents have been left in %s" +msgstr "注解内容被留在 %s 中" -#: builtin/notes.c:248 builtin/tag.c:604 +#: builtin/notes.c:233 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: builtin/notes.c:250 builtin/tag.c:607 +#: builtin/notes.c:235 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" -#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322 -#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519 -#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641 -#: builtin/notes.c:843 builtin/tag.c:620 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "无法解析 '%s' 为一个有效引用。" - -#: builtin/notes.c:272 +#: builtin/notes.c:257 #, c-format msgid "Failed to read object '%s'." msgstr "无法读取对象 '%s'。" -#: builtin/notes.c:276 +#: builtin/notes.c:261 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "不能从非数据对象 '%s' 中读取注解数据" -#: builtin/notes.c:316 -#, c-format -msgid "Malformed input line: '%s'." -msgstr "非法的输入行：'%s'。" - -#: builtin/notes.c:331 -#, c-format -msgid "Failed to copy notes from '%s' to '%s'" -msgstr "无法从 '%s' 到 '%s' 拷贝注解" - -#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502 -#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634 -#: builtin/notes.c:908 +#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494 +#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650 +#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968 msgid "too many parameters" msgstr "参数太多" -#: builtin/notes.c:388 builtin/notes.c:647 +#: builtin/notes.c:376 builtin/notes.c:663 #, c-format msgid "No note found for object %s." msgstr "未发现对象 %s 的注解。" -#: builtin/notes.c:410 builtin/notes.c:567 +#: builtin/notes.c:397 builtin/notes.c:560 msgid "note contents as a string" msgstr "注解内容作为一个字符串" -#: builtin/notes.c:413 builtin/notes.c:570 +#: builtin/notes.c:400 builtin/notes.c:563 msgid "note contents in a file" msgstr "注解内容到一个文件中" -#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572 -#: builtin/notes.c:575 builtin/tag.c:539 -msgid "object" -msgstr "对象" - -#: builtin/notes.c:416 builtin/notes.c:573 +#: builtin/notes.c:403 builtin/notes.c:566 msgid "reuse and edit specified note object" msgstr "重用和编辑指定的注解对象" -#: builtin/notes.c:419 builtin/notes.c:576 +#: builtin/notes.c:406 builtin/notes.c:569 msgid "reuse specified note object" msgstr "重用指定的注解对象" -#: builtin/notes.c:421 builtin/notes.c:489 +#: builtin/notes.c:409 builtin/notes.c:572 +msgid "allow storing empty note" +msgstr "允许保存空白注释" + +#: builtin/notes.c:410 builtin/notes.c:481 msgid "replace existing notes" msgstr "替换已存在的注解" -#: builtin/notes.c:455 +#: builtin/notes.c:435 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:460 builtin/notes.c:537 +#: builtin/notes.c:450 builtin/notes.c:529 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" -#: builtin/notes.c:490 +#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887 +#, c-format +msgid "Removing note for object %s\n" +msgstr "删除对象 %s 的注解\n" + +#: builtin/notes.c:482 msgid "read objects from stdin" msgstr "从标准输入读取对象" -#: builtin/notes.c:492 +#: builtin/notes.c:484 msgid "load rewriting config for <command> (implies --stdin)" msgstr "重新加载 <命令> 的配置（隐含 --stdin）" -#: builtin/notes.c:510 +#: builtin/notes.c:502 msgid "too few parameters" msgstr "参数太少" -#: builtin/notes.c:531 +#: builtin/notes.c:523 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:543 +#: builtin/notes.c:535 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "源对象 %s 缺少注解。不能拷贝。" -#: builtin/notes.c:592 +#: builtin/notes.c:587 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -7392,242 +9337,294 @@ msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" -#: builtin/notes.c:739 +#: builtin/notes.c:753 +#, c-format +msgid "unknown notes merge strategy %s" +msgstr "未知的注解合并策略 %s" + +#: builtin/notes.c:769 msgid "General options" msgstr "通用选项" -#: builtin/notes.c:741 +#: builtin/notes.c:771 msgid "Merge options" msgstr "合并选项" -#: builtin/notes.c:743 +#: builtin/notes.c:773 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:745 +#: builtin/notes.c:775 msgid "Committing unmerged notes" msgstr "提交未合并的注解" -#: builtin/notes.c:747 +#: builtin/notes.c:777 msgid "finalize notes merge by committing unmerged notes" msgstr "通过提交未合并的注解来完成注解合并" -#: builtin/notes.c:749 +#: builtin/notes.c:779 msgid "Aborting notes merge resolution" msgstr "中止注解合并的方案" -#: builtin/notes.c:751 +#: builtin/notes.c:781 msgid "abort notes merge" msgstr "中止注解合并" -#: builtin/notes.c:846 +#: builtin/notes.c:792 +msgid "cannot mix --commit, --abort or -s/--strategy" +msgstr "不能混用 --commit、--abort 或 -s/--strategy" + +#: builtin/notes.c:797 +msgid "Must specify a notes ref to merge" +msgstr "必须指定一个注解引用来合并" + +#: builtin/notes.c:821 +#, c-format +msgid "Unknown -s/--strategy: %s" +msgstr "未知的 -s/--strategy：%s" + +#: builtin/notes.c:858 +#, c-format +msgid "A notes merge into %s is already in-progress at %s" +msgstr "一个到 %s 的注解合并已经在 %s 执行中" + +#: builtin/notes.c:861 +#, c-format +msgid "Failed to store link to current notes ref (%s)" +msgstr "无法存储链接到当前注解的引用（%s）" + +#: builtin/notes.c:863 +#, c-format +msgid "" +"Automatic notes merge failed. Fix conflicts in %s and commit the result with " +"'git notes merge --commit', or abort the merge with 'git notes merge --" +"abort'.\n" +msgstr "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提交结果，或者使用命令 'git notes merge --abort' 终止合并。\n" + +#: builtin/notes.c:885 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c:858 +#: builtin/notes.c:897 msgid "attempt to remove non-existent note is not an error" msgstr "尝试删除不存在的注解不是一个错误" -#: builtin/notes.c:861 +#: builtin/notes.c:900 msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c:942 +#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127 +msgid "do not remove, show only" +msgstr "不删除，只显示" + +#: builtin/notes.c:939 +msgid "report pruned notes" +msgstr "报告清除的注解" + +#: builtin/notes.c:981 msgid "notes-ref" msgstr "注解引用" -#: builtin/notes.c:943 -msgid "use notes from <notes_ref>" +#: builtin/notes.c:982 +msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:978 builtin/remote.c:1593 +#: builtin/notes.c:1017 builtin/remote.c:1623 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/pack-objects.c:25 -msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" -msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]" +#: builtin/pack-objects.c:28 +msgid "" +"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" +msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:26 -msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" -msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]" +#: builtin/pack-objects.c:29 +msgid "" +"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" +msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: builtin/pack-objects.c:771 +#: builtin/pack-objects.c:766 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个" + +#: builtin/pack-objects.c:779 msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1037 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" -#: builtin/pack-objects.c:2174 +#: builtin/pack-objects.c:2197 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c:2530 +#: builtin/pack-objects.c:2611 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:2534 +#: builtin/pack-objects.c:2615 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:2557 -#, c-format -msgid "option %s does not accept negative form" -msgstr "选项 %s 不接受否定格式" - -#: builtin/pack-objects.c:2561 -#, c-format -msgid "unable to parse value '%s' for option %s" -msgstr "不能解析选项 %1$s 的值 '%2$s'" - -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c:2645 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/pack-objects.c:2582 +#: builtin/pack-objects.c:2647 msgid "show progress meter" msgstr "显示进度表" -#: builtin/pack-objects.c:2584 +#: builtin/pack-objects.c:2649 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/pack-objects.c:2587 +#: builtin/pack-objects.c:2652 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2653 msgid "version[,offset]" msgstr "版本[,偏移]" -#: builtin/pack-objects.c:2589 +#: builtin/pack-objects.c:2654 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2657 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2659 msgid "ignore borrowed objects from alternate object store" -msgstr "忽略从替代对象存储里借用对象" +msgstr "忽略从备用对象存储里借用对象" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2661 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:2598 +#: builtin/pack-objects.c:2663 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2665 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:2602 +#: builtin/pack-objects.c:2667 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2669 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2671 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2673 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2675 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2677 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2679 msgid "read revision arguments from standard input" -msgstr "从标准输入读取修订号参数" +msgstr "从标准输入读取版本号参数" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2681 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:2619 +#: builtin/pack-objects.c:2684 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2687 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2690 +msgid "include objects referred to by the index" +msgstr "包括被索引引用到的对象" + +#: builtin/pack-objects.c:2693 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2695 msgid "include tag objects that refer to objects to be packed" -msgstr "包括引用了打包对象的 tag" +msgstr "包括那些引用了待打包对象的标签对象" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:2697 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:2630 parse-options.h:140 +#: builtin/pack-objects.c:2699 +msgid "pack loose unreachable objects" +msgstr "打包松散的不可达对象" + +#: builtin/pack-objects.c:2700 parse-options.h:142 msgid "time" msgstr "时间" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2701 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2704 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2706 +msgid "create packs suitable for shallow fetches" +msgstr "创建适合浅克隆仓库获取的包" + +#: builtin/pack-objects.c:2708 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:2638 +#: builtin/pack-objects.c:2710 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2712 msgid "do not hide commits by grafts" msgstr "显示被嫁接隐藏的提交" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2714 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2716 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同时创建 bitmap 索引" -#: builtin/pack-objects.c:2723 +#: builtin/pack-objects.c:2829 msgid "Counting objects" msgstr "对象计数中" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" -msgstr "git pack-refs [选项]" +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<选项>]" #: builtin/pack-refs.c:14 msgid "pack everything" @@ -7638,42 +9635,205 @@ msgid "prune loose refs (default)" msgstr "清除松散的引用（默认）" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:49 +#: builtin/prune-packed.c:40 msgid "Removing duplicate objects" msgstr "正在删除重复对象" -#: builtin/prune.c:12 +#: builtin/prune.c:11 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" -#: builtin/prune.c:142 -msgid "do not remove, show only" -msgstr "不删除，只显示" - -#: builtin/prune.c:143 +#: builtin/prune.c:106 builtin/worktree.c:128 msgid "report pruned objects" msgstr "报告清除的对象" -#: builtin/prune.c:146 +#: builtin/prune.c:109 builtin/worktree.c:130 msgid "expire objects older than <time>" msgstr "使早于给定时间的对象过期" -#: builtin/push.c:14 +#: builtin/prune.c:123 +msgid "cannot prune in a precious-objects repo" +msgstr "不能在珍品仓库中执行清理操作" + +#: builtin/pull.c:72 +msgid "git pull [<options>] [<repository> [<refspec>...]]" +msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" + +#: builtin/pull.c:120 +msgid "Options related to merging" +msgstr "和合并相关的选项" + +#: builtin/pull.c:123 +msgid "incorporate changes by rebasing rather than merging" +msgstr "使用变基操作取代合并操作以合入修改" + +#: builtin/pull.c:147 builtin/revert.c:101 +msgid "allow fast-forward" +msgstr "允许快进式" + +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "自动在变基操作前后执行 stash/stash pop" + +#: builtin/pull.c:172 +msgid "Options related to fetching" +msgstr "和获取相关的参数" + +#: builtin/pull.c:194 +msgid "number of submodules pulled in parallel" +msgstr "并发拉取的子模组的数量" + +#: builtin/pull.c:283 +#, c-format +msgid "Invalid value for pull.ff: %s" +msgstr "pull.ff 的取值无效：%s" + +#: builtin/pull.c:379 git-sh-setup.sh:226 +msgid "Cannot pull with rebase: You have unstaged changes." +msgstr "无法通过变基方式拉取：您有未暂存的变更。" + +#: builtin/pull.c:385 git-sh-setup.sh:252 +msgid "Additionally, your index contains uncommitted changes." +msgstr "而且您的索引中包含未提交的变更。" + +#: builtin/pull.c:387 git-sh-setup.sh:245 +msgid "Cannot pull with rebase: Your index contains uncommitted changes." +msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。" + +#: builtin/pull.c:463 +msgid "" +"There is no candidate for rebasing against among the refs that you just " +"fetched." +msgstr "在您刚刚获取到的引用中没有变基操作的候选。" + +#: builtin/pull.c:465 +msgid "" +"There are no candidates for merging among the refs that you just fetched." +msgstr "在您刚刚获取到的引用中没有合并操作的候选。" + +#: builtin/pull.c:466 +msgid "" +"Generally this means that you provided a wildcard refspec which had no\n" +"matches on the remote end." +msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" + +#: builtin/pull.c:469 +#, c-format +msgid "" +"You asked to pull from the remote '%s', but did not specify\n" +"a branch. Because this is not the default configured remote\n" +"for your current branch, you must specify a branch on the command line." +msgstr "" +"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n" +"分支默认的远程仓库，您必须在命令行中指定一个分支名。" + +#: builtin/pull.c:474 git-parse-remote.sh:73 +msgid "You are not currently on a branch." +msgstr "您当前不在一个分支上。" + +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 +msgid "Please specify which branch you want to rebase against." +msgstr "请指定您要变基到哪一个分支。" + +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 +msgid "Please specify which branch you want to merge with." +msgstr "请指定您要合并哪一个分支。" + +#: builtin/pull.c:479 builtin/pull.c:494 +msgid "See git-pull(1) for details." +msgstr "详见 git-pull(1)。" + +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<远程>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<分支>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 +msgid "There is no tracking information for the current branch." +msgstr "当前分支没有跟踪信息。" + +#: builtin/pull.c:498 git-parse-remote.sh:95 +msgid "" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "如果您想要为此分支创建跟踪信息，您可以执行：" + +#: builtin/pull.c:503 +#, c-format +msgid "" +"Your configuration specifies to merge with the ref '%s'\n" +"from the remote, but no such ref was fetched." +msgstr "" +"您的配置中指定要合并远程的引用 '%s'，\n" +"但是没有获取到这个引用。" + +#: builtin/pull.c:820 +msgid "ignoring --verify-signatures for rebase" +msgstr "为变基操作忽略 --verify-signatures" + +#: builtin/pull.c:867 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" + +#: builtin/pull.c:875 +msgid "Updating an unborn branch with changes added to the index." +msgstr "更新尚未诞生的分支，变更添加至索引。" + +#: builtin/pull.c:903 +#, c-format +msgid "" +"fetch updated the current branch head.\n" +"fast-forwarding your working tree from\n" +"commit %s." +msgstr "" +"fetch 更新了当前的分支。快进您的工作区\n" +"至提交 %s。" + +#: builtin/pull.c:908 +#, c-format +msgid "" +"Cannot fast-forward your working tree.\n" +"After making sure that you saved anything precious from\n" +"$ git diff %s\n" +"output, run\n" +"$ git reset --hard\n" +"to recover." +msgstr "" +"您当前的工作区无法执行快进操作。\n" +"首先执行如下命令：\n" +"$ git diff %s\n" +"以确认所有有用的数据均已保存。然后执行下面的命令\n" +"$ git reset --hard\n" +"恢复之前的状态。" + +#: builtin/pull.c:923 +msgid "Cannot merge multiple branches into empty head." +msgstr "无法将多个分支合并到空分支。" + +#: builtin/pull.c:927 +msgid "Cannot rebase onto multiple branches." +msgstr "无法变基到多个分支。" + +#: builtin/push.c:16 msgid "git push [<options>] [<repository> [<refspec>...]]" -msgstr "git push [<选项>] [<版本库> [<引用规则>...]]" +msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/push.c:85 +#: builtin/push.c:89 msgid "tag shorthand without <tag>" -msgstr "tag 简写没有跟 <tag> 参数" +msgstr "标签后面未提供 <标签> 参数" -#: builtin/push.c:95 +#: builtin/push.c:99 msgid "--delete only accepts plain target ref names" msgstr "--delete 只接受简单的目标引用名" -#: builtin/push.c:140 +#: builtin/push.c:143 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -7681,7 +9841,7 @@ msgstr "" "\n" "为了永久地选择任一选项，参见 'git help config' 中的 push.default。" -#: builtin/push.c:143 +#: builtin/push.c:146 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -7705,7 +9865,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:158 +#: builtin/push.c:161 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7717,9 +9877,9 @@ msgstr "" "您当前不在一个分支上。\n" "现在为推送当前（分离头指针）的历史，使用\n" "\n" -" git push %s HEAD:<name-of-remote-branch>\n" +" git push %s HEAD:<远程分支名字>\n" -#: builtin/push.c:172 +#: builtin/push.c:175 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7732,12 +9892,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:180 +#: builtin/push.c:183 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当前分支 %s 有多个上游分支，拒绝推送。" -#: builtin/push.c:183 +#: builtin/push.c:186 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7747,56 +9907,12 @@ msgstr "" "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n" "而没有告诉我要推送什么、更新哪个远程分支。" -# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短 -#: builtin/push.c:206 -msgid "" -"push.default is unset; its implicit value has changed in\n" -"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" -"and maintain the traditional behavior, use:\n" -"\n" -" git config --global push.default matching\n" -"\n" -"To squelch this message and adopt the new behavior now, use:\n" -"\n" -" git config --global push.default simple\n" -"\n" -"When push.default is set to 'matching', git will push local branches\n" -"to the remote branches that already exist with the same name.\n" -"\n" -"Since Git 2.0, Git defaults to the more conservative 'simple'\n" -"behavior, which only pushes the current branch to the corresponding\n" -"remote branch that 'git pull' uses to update the current branch.\n" -"\n" -"See 'git help config' and search for 'push.default' for further " -"information.\n" -"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" -"'current' instead of 'simple' if you sometimes use older versions of Git)" -msgstr "" -"push.default 尚未设置，它的默认值在 Git 2.0 已从 'matching'\n" -"变更为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n" -"\n" -" git config --global push.default matching\n" -"\n" -"若要不再显示本信息并从现在开始采用新的使用习惯，设置：\n" -"\n" -" git config --global push.default simple\n" -"\n" -"当 push.default 设置为 'matching' 后，git 将推送和远程同名的所有\n" -"本地分支。\n" -"\n" -"从 Git 2.0 开始，Git 缺省采用更为保守的 'simple' 模式，只推送当前\n" -"分支到远程关联的同名分支，即 'git push' 推送当前分支。\n" -"\n" -"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n" -"（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n" -"为保持兼容，请用 'current' 代替 'simple'）" - -#: builtin/push.c:273 +#: builtin/push.c:242 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "您没有为推送指定任何引用规则，并且 push.default 为 \"nothing\"。" +msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。" -#: builtin/push.c:280 +#: builtin/push.c:249 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -7807,7 +9923,7 @@ msgstr "" "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:286 +#: builtin/push.c:255 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" @@ -7818,7 +9934,7 @@ msgstr "" "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:292 +#: builtin/push.c:261 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" @@ -7826,16 +9942,16 @@ msgid "" "(e.g., 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"更新被拒绝，因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n" -"一个版本库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n" +"更新被拒绝，因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" +"一个仓库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n" "（如 'git pull ...'）。\n" "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:299 +#: builtin/push.c:268 msgid "Updates were rejected because the tag already exists in the remote." -msgstr "更新被拒绝因为 tag 在远程已经存在。" +msgstr "更新被拒绝，因为该标签在远程已经存在。" -#: builtin/push.c:302 +#: builtin/push.c:271 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -7844,22 +9960,22 @@ msgstr "" "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n" "也不能更新远程引用让其指向一个非提交对象。\n" -#: builtin/push.c:361 +#: builtin/push.c:331 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:365 +#: builtin/push.c:335 #, c-format msgid "failed to push some refs to '%s'" msgstr "无法推送一些引用到 '%s'" -#: builtin/push.c:395 +#: builtin/push.c:366 #, c-format msgid "bad repository '%s'" -msgstr "坏的版本库 '%s'" +msgstr "坏的仓库 '%s'" -#: builtin/push.c:396 +#: builtin/push.c:367 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7872,186 +9988,215 @@ msgid "" " git push <name>\n" msgstr "" "没有配置推送目标。\n" -"或通过命令行指定URL，或用下面命令配置一个远程版本库\n" +"或通过命令行指定 URL，或用下面命令配置一个远程仓库\n" "\n" -" git remote add <name> <url>\n" +" git remote add <名称> <地址>\n" "\n" -"然后使用该远程版本库名执行推送\n" +"然后使用该远程仓库名执行推送\n" "\n" -" git push <name>\n" +" git push <名称>\n" -#: builtin/push.c:411 +#: builtin/push.c:385 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" -#: builtin/push.c:412 +#: builtin/push.c:386 msgid "--all can't be combined with refspecs" -msgstr "--all 不能和引用规则同时使用" +msgstr "--all 不能和引用规格同时使用" -#: builtin/push.c:417 +#: builtin/push.c:391 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" -#: builtin/push.c:418 +#: builtin/push.c:392 msgid "--mirror can't be combined with refspecs" -msgstr "--mirror 不能和引用规则同时使用" +msgstr "--mirror 不能和引用规格同时使用" -#: builtin/push.c:423 +#: builtin/push.c:397 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:483 +#: builtin/push.c:515 msgid "repository" -msgstr "版本库" +msgstr "仓库" -#: builtin/push.c:484 +#: builtin/push.c:516 builtin/send-pack.c:161 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:485 +#: builtin/push.c:517 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "镜像所有引用" -#: builtin/push.c:487 +#: builtin/push.c:519 msgid "delete refs" msgstr "删除引用" -#: builtin/push.c:488 +#: builtin/push.c:520 msgid "push tags (can't be used with --all or --mirror)" -msgstr "推送 tags（不能使用 --all or --mirror）" +msgstr "推送标签（不能使用 --all or --mirror）" -#: builtin/push.c:491 +#: builtin/push.c:523 builtin/send-pack.c:164 msgid "force updates" msgstr "强制更新" -#: builtin/push.c:493 +#: builtin/push.c:525 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "引用名>:<期望值" -#: builtin/push.c:494 +#: builtin/push.c:526 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "要求引用旧的取值为设定值" -#: builtin/push.c:496 -msgid "check" -msgstr "检查" - -#: builtin/push.c:497 +#: builtin/push.c:529 msgid "control recursive pushing of submodules" msgstr "控制子模组的递归推送" -#: builtin/push.c:499 +#: builtin/push.c:531 builtin/send-pack.c:169 msgid "use thin pack" msgstr "使用精简打包" -#: builtin/push.c:500 builtin/push.c:501 +#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158 +#: builtin/send-pack.c:159 msgid "receive pack program" msgstr "接收包程序" -#: builtin/push.c:502 +#: builtin/push.c:534 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" -#: builtin/push.c:505 +#: builtin/push.c:537 msgid "prune locally removed refs" msgstr "清除本地删除的引用" -#: builtin/push.c:507 +#: builtin/push.c:539 msgid "bypass pre-push hook" msgstr "绕过 pre-push 钩子" -#: builtin/push.c:508 +#: builtin/push.c:540 msgid "push missing but relevant tags" -msgstr "推送缺失的有关的 tags" +msgstr "推送缺失但有关的标签" + +#: builtin/push.c:543 builtin/send-pack.c:166 +msgid "GPG sign the push" +msgstr "用 GPG 为推送签名" + +#: builtin/push.c:545 builtin/send-pack.c:170 +msgid "request atomic transaction on remote side" +msgstr "需要远端支持原子事务" + +#: builtin/push.c:546 +msgid "server-specific" +msgstr "server-specific" -#: builtin/push.c:518 +#: builtin/push.c:546 +msgid "option to transmit" +msgstr "传输选项" + +#: builtin/push.c:560 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:520 +#: builtin/push.c:562 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" -#: builtin/read-tree.c:36 +#: builtin/push.c:579 +msgid "push options must not have new line characters" +msgstr "推送选项不能有换行符" + +#: builtin/read-tree.c:37 msgid "" -"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" -"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])" +"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" -#: builtin/read-tree.c:109 +#: builtin/read-tree.c:110 msgid "write resulting index to <file>" -msgstr "将索引结果写入 <file>" +msgstr "将索引结果写入 <文件>" -#: builtin/read-tree.c:112 +#: builtin/read-tree.c:113 msgid "only empty the index" msgstr "只是清空索引" -#: builtin/read-tree.c:114 +#: builtin/read-tree.c:115 msgid "Merging" msgstr "合并" -#: builtin/read-tree.c:116 +#: builtin/read-tree.c:117 msgid "perform a merge in addition to a read" msgstr "读取之余再执行一个合并" -#: builtin/read-tree.c:118 +#: builtin/read-tree.c:119 msgid "3-way merge if no file level merging required" -msgstr "如果没有文件级合并需要，执行三路合并" +msgstr "如果没有文件级合并需要，执行三方合并" -#: builtin/read-tree.c:120 +#: builtin/read-tree.c:121 msgid "3-way merge in presence of adds and removes" -msgstr "存在添加和删除时，也执行三路合并" +msgstr "存在添加和删除时，也执行三方合并" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:123 msgid "same as -m, but discard unmerged entries" msgstr "类似于 -m，但丢弃未合并的条目" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "<subdirectory>/" msgstr "<子目录>/" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:125 msgid "read the tree into the index under <subdirectory>/" msgstr "读取树对象到索引的 <子目录>/ 下" -#: builtin/read-tree.c:127 +#: builtin/read-tree.c:128 msgid "update working tree with merge result" msgstr "用合并的结果更新工作区" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:131 msgid "allow explicitly ignored files to be overwritten" msgstr "允许忽略文件中设定的文件可以被覆盖" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't check the working tree after merging" msgstr "合并后不检查工作区" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:135 msgid "don't update the index or the work tree" msgstr "不更新索引区和工作区" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" msgstr "跳过应用稀疏检出过滤器" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "调试 unpack-trees" -#: builtin/reflog.c:499 +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <git-dir>" + +#: builtin/receive-pack.c:1843 +msgid "quiet" +msgstr "静默模式" + +#: builtin/receive-pack.c:1857 +msgid "You must specify a directory." +msgstr "您必须指定一个目录。" + +#: builtin/reflog.c:423 #, c-format -msgid "%s' for '%s' is not a valid timestamp" +msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:540 builtin/reflog.c:545 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' 不是一个有效的时间戳" @@ -8062,23 +10207,23 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--" -"mirror=<fetch|push>] <名称> <url>" +"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" +"mirror=<fetch|push>] <名称> <地址>" -#: builtin/remote.c:14 builtin/remote.c:33 +#: builtin/remote.c:14 builtin/remote.c:34 msgid "git remote rename <old> <new>" msgstr "git remote rename <旧名称> <新名称>" -#: builtin/remote.c:15 builtin/remote.c:38 +#: builtin/remote.c:15 builtin/remote.c:39 msgid "git remote remove <name>" msgstr "git remote remove <名称>" -#: builtin/remote.c:16 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" -msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)" +#: builtin/remote.c:16 builtin/remote.c:44 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" +msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" #: builtin/remote.c:17 msgid "git remote [-v | --verbose] show [-n] <name>" @@ -8097,52 +10242,52 @@ msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)... msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <名称> <分支>..." -#: builtin/remote.c:21 builtin/remote.c:69 +#: builtin/remote.c:21 builtin/remote.c:70 +msgid "git remote get-url [--push] [--all] <name>" +msgstr "git remote get-url [--push] [--all] <名称>" + +#: builtin/remote.c:22 builtin/remote.c:75 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" -#: builtin/remote.c:22 builtin/remote.c:70 +#: builtin/remote.c:23 builtin/remote.c:76 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <名称> <新的地址>" -#: builtin/remote.c:23 builtin/remote.c:71 +#: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <名称> <地址>" -#: builtin/remote.c:28 +#: builtin/remote.c:29 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<选项>] <名称> <地址>" -#: builtin/remote.c:43 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" - -#: builtin/remote.c:48 +#: builtin/remote.c:49 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <名称> <分支>..." -#: builtin/remote.c:49 +#: builtin/remote.c:50 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <名称> <分支>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote show [<options>] <name>" msgstr "git remote show [<选项>] <名称>" -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<选项>] <名称>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<选项>] [<组> | <远程>]..." -#: builtin/remote.c:88 +#: builtin/remote.c:94 #, c-format msgid "Updating %s" msgstr "更新 %s 中" -#: builtin/remote.c:120 +#: builtin/remote.c:126 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -8150,137 +10295,107 @@ msgstr "" "--mirror 选项危险且过时，请使用 --mirror=fetch\n" "\t 或 --mirror=push" -#: builtin/remote.c:137 +#: builtin/remote.c:143 #, c-format msgid "unknown mirror argument: %s" msgstr "未知的镜像参数：%s" -#: builtin/remote.c:153 +#: builtin/remote.c:159 msgid "fetch the remote branches" msgstr "抓取远程的分支" -#: builtin/remote.c:155 +#: builtin/remote.c:161 msgid "import all tags and associated objects when fetching" -msgstr "抓取时导入所有的 tags 和关联对象" +msgstr "抓取时导入所有的标签和关联对象" -#: builtin/remote.c:158 +#: builtin/remote.c:164 msgid "or do not fetch any tag at all (--no-tags)" -msgstr "或不抓取任何 tag（--no-tags）" +msgstr "或不抓取任何标签（--no-tags）" -#: builtin/remote.c:160 +#: builtin/remote.c:166 msgid "branch(es) to track" msgstr "跟踪的分支" -#: builtin/remote.c:161 +#: builtin/remote.c:167 msgid "master branch" msgstr "主线分支" -#: builtin/remote.c:162 +#: builtin/remote.c:168 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:163 +#: builtin/remote.c:169 msgid "set up remote as a mirror to push to or fetch from" msgstr "把远程设置为用以推送或抓取的镜像" -#: builtin/remote.c:175 +#: builtin/remote.c:181 msgid "specifying a master branch makes no sense with --mirror" msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" -#: builtin/remote.c:177 +#: builtin/remote.c:183 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" -#: builtin/remote.c:185 builtin/remote.c:641 +#: builtin/remote.c:190 builtin/remote.c:629 #, c-format msgid "remote %s already exists." msgstr "远程 %s 已经存在。" -#: builtin/remote.c:189 builtin/remote.c:645 +#: builtin/remote.c:194 builtin/remote.c:633 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一个有效的远程名称" -#: builtin/remote.c:233 +#: builtin/remote.c:234 #, c-format msgid "Could not setup master '%s'" msgstr "无法设置 master '%s'" -#: builtin/remote.c:289 -#, c-format -msgid "more than one %s" -msgstr "多于一个 %s" - -#: builtin/remote.c:334 +#: builtin/remote.c:336 #, c-format msgid "Could not get fetch map for refspec %s" -msgstr "无法得到引用规则 %s 的获取列表" +msgstr "无法得到引用规格 %s 的获取列表" -#: builtin/remote.c:435 builtin/remote.c:443 +#: builtin/remote.c:437 builtin/remote.c:445 msgid "(matching)" msgstr "（匹配）" -#: builtin/remote.c:447 +#: builtin/remote.c:449 msgid "(delete)" msgstr "（删除）" -#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 -#, c-format -msgid "Could not append '%s' to '%s'" -msgstr "不能添加 '%s' 至 '%s'" - -#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885 +#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854 #, c-format msgid "No such remote: %s" msgstr "没有这样的远程：%s" -#: builtin/remote.c:651 +#: builtin/remote.c:639 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "不能重命名配置小节 '%s' 到 '%s'" -#: builtin/remote.c:657 builtin/remote.c:794 -#, c-format -msgid "Could not remove config section '%s'" -msgstr "不能移除配置小节 '%s'" - -#: builtin/remote.c:672 +#: builtin/remote.c:659 #, c-format msgid "" "Not updating non-default fetch refspec\n" "\t%s\n" "\tPlease update the configuration manually if necessary." msgstr "" -"没有更新非默认的获取引用规则\n" +"没有更新非默认的获取引用规格\n" "\t%s\n" "\t如果必要请手动更新配置。" -#: builtin/remote.c:678 -#, c-format -msgid "Could not append '%s'" -msgstr "不能追加 '%s'" - -#: builtin/remote.c:689 -#, c-format -msgid "Could not set '%s'" -msgstr "不能设置 '%s'" - -#: builtin/remote.c:711 +#: builtin/remote.c:695 #, c-format msgid "deleting '%s' failed" msgstr "删除 '%s' 失败" -#: builtin/remote.c:745 +#: builtin/remote.c:729 #, c-format msgid "creating '%s' failed" msgstr "创建 '%s' 失败" -#: builtin/remote.c:759 -#, c-format -msgid "Could not remove branch %s" -msgstr "无法移除分支 %s" - -#: builtin/remote.c:829 +#: builtin/remote.c:792 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8290,126 +10405,144 @@ msgid_plural "" msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用：" msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用：" -#: builtin/remote.c:938 +#: builtin/remote.c:806 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "不能移除配置小节 '%s'" + +#: builtin/remote.c:907 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的（下一次获取将存储于 remotes/%s）" -#: builtin/remote.c:941 +#: builtin/remote.c:910 msgid " tracked" msgstr " 已跟踪" -#: builtin/remote.c:943 +#: builtin/remote.c:912 msgid " stale (use 'git remote prune' to remove)" msgstr " 过时（使用 'git remote prune' 来移除）" -#: builtin/remote.c:945 +#: builtin/remote.c:914 msgid " ???" msgstr " ???" -#: builtin/remote.c:986 +#: builtin/remote.c:955 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支" -#: builtin/remote.c:993 +#: builtin/remote.c:963 +#, c-format +msgid "rebases interactively onto remote %s" +msgstr "交互式变基到远程 %s" + +#: builtin/remote.c:964 #, c-format msgid "rebases onto remote %s" msgstr "变基到远程 %s" -#: builtin/remote.c:996 +#: builtin/remote.c:967 #, c-format msgid " merges with remote %s" msgstr " 与远程 %s 合并" -#: builtin/remote.c:997 -msgid " and with remote" -msgstr " 且有远程" - -#: builtin/remote.c:999 +#: builtin/remote.c:970 #, c-format msgid "merges with remote %s" msgstr "与远程 %s 合并" -#: builtin/remote.c:1000 -msgid " and with remote" -msgstr " 且有远程" +#: builtin/remote.c:973 +#, c-format +msgid "%-*s and with remote %s\n" +msgstr "%-*s 以及和远程 %s\n" -#: builtin/remote.c:1046 +#: builtin/remote.c:1016 msgid "create" msgstr "创建" -#: builtin/remote.c:1049 +#: builtin/remote.c:1019 msgid "delete" msgstr "删除" -#: builtin/remote.c:1053 +#: builtin/remote.c:1023 msgid "up to date" msgstr "最新" -#: builtin/remote.c:1056 +#: builtin/remote.c:1026 msgid "fast-forwardable" msgstr "可快进" -#: builtin/remote.c:1059 +#: builtin/remote.c:1029 msgid "local out of date" msgstr "本地已过时" -#: builtin/remote.c:1066 +#: builtin/remote.c:1036 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 强制推送至 %-*s (%s)" -#: builtin/remote.c:1069 +#: builtin/remote.c:1039 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推送至 %-*s (%s)" -#: builtin/remote.c:1073 +#: builtin/remote.c:1043 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 强制推送至 %s" -#: builtin/remote.c:1076 +#: builtin/remote.c:1046 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" -#: builtin/remote.c:1144 +#: builtin/remote.c:1114 msgid "do not query remotes" msgstr "不查询远程" -#: builtin/remote.c:1171 +#: builtin/remote.c:1141 #, c-format msgid "* remote %s" msgstr "* 远程 %s" -#: builtin/remote.c:1172 +#: builtin/remote.c:1142 #, c-format msgid " Fetch URL: %s" msgstr " 获取地址：%s" -#: builtin/remote.c:1173 builtin/remote.c:1318 +#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296 msgid "(no URL)" msgstr "(无 URL)" -#: builtin/remote.c:1182 builtin/remote.c:1184 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1154 builtin/remote.c:1156 #, c-format msgid " Push URL: %s" msgstr " 推送地址：%s" -#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190 +#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162 #, c-format msgid " HEAD branch: %s" -msgstr " HEAD分支：%s" +msgstr " HEAD 分支：%s" + +# 译者：中文字符串拼接，可删除前导空格 +#: builtin/remote.c:1158 +msgid "(not queried)" +msgstr "（未查询）" + +#: builtin/remote.c:1160 +msgid "(unknown)" +msgstr "（未知）" -#: builtin/remote.c:1192 +#: builtin/remote.c:1164 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n" -#: builtin/remote.c:1204 +#: builtin/remote.c:1176 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -8417,424 +10550,504 @@ msgstr[0] " 远程分支：%s" msgstr[1] " 远程分支：%s" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/remote.c:1207 builtin/remote.c:1234 +#: builtin/remote.c:1179 builtin/remote.c:1206 msgid " (status not queried)" msgstr "（状态未查询）" -#: builtin/remote.c:1216 +#: builtin/remote.c:1188 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " 为 'git pull' 配置的本地分支：" msgstr[1] " 为 'git pull' 配置的本地分支：" -#: builtin/remote.c:1224 +#: builtin/remote.c:1196 msgid " Local refs will be mirrored by 'git push'" msgstr " 本地引用将在 'git push' 时被镜像" -#: builtin/remote.c:1231 +#: builtin/remote.c:1203 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 为 'git push' 配置的本地引用%s：" msgstr[1] " 为 'git push' 配置的本地引用%s：" -#: builtin/remote.c:1252 +#: builtin/remote.c:1224 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "根据远程设置 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1254 +#: builtin/remote.c:1226 msgid "delete refs/remotes/<name>/HEAD" msgstr "删除 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1269 +#: builtin/remote.c:1241 msgid "Cannot determine remote HEAD" msgstr "无法确定远程 HEAD" -#: builtin/remote.c:1271 +#: builtin/remote.c:1243 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多个远程 HEAD 分支。请明确地选择一个用命令：" -#: builtin/remote.c:1281 +#: builtin/remote.c:1253 #, c-format msgid "Could not delete %s" msgstr "无法删除 %s" -#: builtin/remote.c:1289 +#: builtin/remote.c:1261 #, c-format msgid "Not a valid ref: %s" msgstr "不是一个有效引用：%s" -#: builtin/remote.c:1291 +#: builtin/remote.c:1263 #, c-format msgid "Could not setup %s" msgstr "不能设置 %s" # 译者：注意保持前导空格 -#: builtin/remote.c:1307 +#: builtin/remote.c:1281 #, c-format msgid " %s will become dangling!" msgstr " %s 将成为摇摆状态！" # 译者：注意保持前导空格 -#: builtin/remote.c:1308 +#: builtin/remote.c:1282 #, c-format msgid " %s has become dangling!" msgstr " %s 已成为摇摆状态！" -#: builtin/remote.c:1314 +#: builtin/remote.c:1292 #, c-format msgid "Pruning %s" msgstr "修剪 %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1293 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: builtin/remote.c:1328 +#: builtin/remote.c:1309 #, c-format msgid " * [would prune] %s" msgstr " * [将删除] %s" -#: builtin/remote.c:1331 +#: builtin/remote.c:1312 #, c-format msgid " * [pruned] %s" msgstr " * [已删除] %s" -#: builtin/remote.c:1374 +#: builtin/remote.c:1357 msgid "prune remotes after fetching" msgstr "抓取后清除远程" -#: builtin/remote.c:1440 builtin/remote.c:1514 +#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542 #, c-format msgid "No such remote '%s'" msgstr "没有此远程 '%s'" -#: builtin/remote.c:1460 +#: builtin/remote.c:1436 msgid "add branch" msgstr "添加分支" -#: builtin/remote.c:1467 +#: builtin/remote.c:1443 msgid "no remote specified" msgstr "未指定远程" -#: builtin/remote.c:1489 +#: builtin/remote.c:1460 +msgid "query push URLs rather than fetch URLs" +msgstr "查询推送 URL 地址，而非获取 URL 地址" + +#: builtin/remote.c:1462 +msgid "return all URLs" +msgstr "返回所有 URL 地址" + +#: builtin/remote.c:1490 +#, c-format +msgid "no URLs configured for remote '%s'" +msgstr "没有给远程仓库 '%s' 设定 URL" + +#: builtin/remote.c:1516 msgid "manipulate push URLs" msgstr "操作推送 URLS" -#: builtin/remote.c:1491 +#: builtin/remote.c:1518 msgid "add URL" msgstr "添加 URL" -#: builtin/remote.c:1493 +#: builtin/remote.c:1520 msgid "delete URLs" msgstr "删除 URLS" -#: builtin/remote.c:1500 +#: builtin/remote.c:1527 msgid "--add --delete doesn't make sense" msgstr "--add --delete 无意义" -#: builtin/remote.c:1540 +#: builtin/remote.c:1568 #, c-format msgid "Invalid old URL pattern: %s" -msgstr "无效的旧URL匹配模版：%s" +msgstr "无效的旧 URL 匹配模版：%s" -#: builtin/remote.c:1548 +#: builtin/remote.c:1576 #, c-format msgid "No such URL found: %s" -msgstr "未找到此URL：%s" +msgstr "未找到此 URL：%s" -#: builtin/remote.c:1550 +#: builtin/remote.c:1578 msgid "Will not delete all non-push URLs" -msgstr "将不会删除所有非推送URL地址" +msgstr "将不会删除所有非推送 URL 地址" -#: builtin/remote.c:1564 +#: builtin/remote.c:1592 msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于子命令之前" -#: builtin/repack.c:16 -msgid "git repack [options]" -msgstr "git repack [选项]" +#: builtin/repack.c:17 +msgid "git repack [<options>]" +msgstr "git repack [<选项>]" -#: builtin/repack.c:156 +#: builtin/repack.c:160 msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件中" -#: builtin/repack.c:158 +#: builtin/repack.c:162 msgid "same as -a, and turn unreachable objects loose" msgstr "和 -a 相同，并将不可达的对象设为松散对象" -#: builtin/repack.c:161 +#: builtin/repack.c:165 msgid "remove redundant packs, and run git-prune-packed" msgstr "删除多余的包，运行 git-prune-packed" -#: builtin/repack.c:163 +#: builtin/repack.c:167 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" -#: builtin/repack.c:165 +#: builtin/repack.c:169 msgid "pass --no-reuse-object to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-object" -#: builtin/repack.c:167 +#: builtin/repack.c:171 msgid "do not run git-update-server-info" msgstr "不运行 git-update-server-info" -#: builtin/repack.c:170 +#: builtin/repack.c:174 msgid "pass --local to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --local" -#: builtin/repack.c:172 +#: builtin/repack.c:176 msgid "write bitmap index" msgstr "写 bitmap 索引" -#: builtin/repack.c:173 +#: builtin/repack.c:177 msgid "approxidate" msgstr "近似日期" -#: builtin/repack.c:174 +#: builtin/repack.c:178 msgid "with -A, do not loosen objects older than this" msgstr "使用 -A，不要将早于给定时间的对象过期" -#: builtin/repack.c:176 +#: builtin/repack.c:180 +msgid "with -a, repack unreachable objects" +msgstr "使用 -a ，重新对不可达对象打包" + +#: builtin/repack.c:182 msgid "size of the window used for delta compression" msgstr "用于增量压缩的窗口值" -#: builtin/repack.c:177 builtin/repack.c:181 +#: builtin/repack.c:183 builtin/repack.c:187 msgid "bytes" msgstr "字节" -#: builtin/repack.c:178 +#: builtin/repack.c:184 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上面的相似，但限制内存大小而非条目数" -#: builtin/repack.c:180 +#: builtin/repack.c:186 msgid "limits the maximum delta depth" msgstr "限制最大增量深度" -#: builtin/repack.c:182 +#: builtin/repack.c:188 msgid "maximum size of each packfile" -msgstr "每个包的最大尺寸" +msgstr "每个包文件的最大尺寸" -#: builtin/repack.c:184 +#: builtin/repack.c:190 msgid "repack objects in packs marked with .keep" msgstr "对标记为 .keep 的包中的对象重新打包" -#: builtin/repack.c:371 +#: builtin/repack.c:200 +msgid "cannot delete packs in a precious-objects repo" +msgstr "不能删除珍品仓库中的打包文件" + +#: builtin/repack.c:204 +msgid "--keep-unreachable and -A are incompatible" +msgstr "--keep-unreachable 和 -A 不兼容" + +#: builtin/repack.c:391 builtin/worktree.c:115 #, c-format -msgid "removing '%s' failed" -msgstr "删除 '%s' 失败" +msgid "failed to remove '%s'" +msgstr "无法删除 '%s'" -#: builtin/replace.c:17 +#: builtin/replace.c:19 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <对象> <替换物>" -#: builtin/replace.c:18 +#: builtin/replace.c:20 +msgid "git replace [-f] --edit <object>" +msgstr "git replace [-f] --edit <对象>" + +#: builtin/replace.c:21 +msgid "git replace [-f] --graft <commit> [<parent>...]" +msgstr "git replace [-f] --graft <提交> [<父提交>...]" + +#: builtin/replace.c:22 msgid "git replace -d <object>..." msgstr "git replace -d <对象>..." -#: builtin/replace.c:19 +#: builtin/replace.c:23 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<格式>] [-l [<模式>]]" -#: builtin/replace.c:174 +#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 +#, c-format +msgid "Not a valid object name: '%s'" +msgstr "不是一个有效的对象名：'%s'" + +#: builtin/replace.c:355 +#, c-format +msgid "bad mergetag in commit '%s'" +msgstr "提交 '%s' 中含有损坏的合并标签" + +#: builtin/replace.c:357 +#, c-format +msgid "malformed mergetag in commit '%s'" +msgstr "提交 '%s' 中含有非法的合并标签" + +#: builtin/replace.c:368 +#, c-format +msgid "" +"original commit '%s' contains mergetag '%s' that is discarded; use --edit " +"instead of --graft" +msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft" + +#: builtin/replace.c:401 +#, c-format +msgid "the original commit '%s' has a gpg signature." +msgstr "原始提交 '%s' 中包含一个 GPG 签名" + +#: builtin/replace.c:402 +msgid "the signature will be removed in the replacement commit!" +msgstr "在替换的提交中签名将被移除！" + +#: builtin/replace.c:408 +#, c-format +msgid "could not write replacement commit for: '%s'" +msgstr "不能为 '%s' 写替换提交" + +#: builtin/replace.c:432 msgid "list replace refs" msgstr "列出替换的引用" -#: builtin/replace.c:175 +#: builtin/replace.c:433 msgid "delete replace refs" msgstr "删除替换的引用" -#: builtin/replace.c:176 +#: builtin/replace.c:434 +msgid "edit existing object" +msgstr "编辑现存的对象" + +#: builtin/replace.c:435 +msgid "change a commit's parents" +msgstr "修改一个提交的父提交" + +#: builtin/replace.c:436 msgid "replace the ref if it exists" msgstr "如果存在则替换引用" -#: builtin/replace.c:177 +#: builtin/replace.c:437 +msgid "do not pretty-print contents for --edit" +msgstr "不要为 --edit 操作美观显示内容" + +#: builtin/replace.c:438 msgid "use this format" msgstr "使用此格式" #: builtin/rerere.c:12 -msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" -#: builtin/rerere.c:57 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "在索引中注册干净的解决方案" -#: builtin/reset.c:25 +#: builtin/reset.c:26 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" -#: builtin/reset.c:26 +#: builtin/reset.c:27 msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "git reset [-q] <树或提交> [--] <路径>..." -#: builtin/reset.c:27 +#: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "mixed" msgstr "混杂" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "soft" msgstr "软性" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "hard" msgstr "硬性" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "merge" msgstr "合并" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "keep" msgstr "保持" -#: builtin/reset.c:73 +#: builtin/reset.c:74 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" -#: builtin/reset.c:75 +#: builtin/reset.c:76 msgid "Failed to find tree of HEAD." msgstr "无法找到 HEAD 指向的树。" -#: builtin/reset.c:81 +#: builtin/reset.c:82 #, c-format msgid "Failed to find tree of %s." msgstr "无法找到 %s 指向的树。" -#: builtin/reset.c:99 +#: builtin/reset.c:100 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在位于 %s" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:182 +#: builtin/reset.c:183 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:273 +#: builtin/reset.c:276 msgid "be quiet, only report errors" msgstr "安静模式，只报告错误" -#: builtin/reset.c:275 +#: builtin/reset.c:278 msgid "reset HEAD and index" msgstr "重置 HEAD 和索引" -#: builtin/reset.c:276 +#: builtin/reset.c:279 msgid "reset only HEAD" msgstr "只重置 HEAD" -#: builtin/reset.c:278 builtin/reset.c:280 +#: builtin/reset.c:281 builtin/reset.c:283 msgid "reset HEAD, index and working tree" msgstr "重置 HEAD、索引和工作区" -#: builtin/reset.c:282 +#: builtin/reset.c:285 msgid "reset HEAD but keep local changes" msgstr "重置 HEAD 但保存本地变更" -#: builtin/reset.c:285 +#: builtin/reset.c:288 msgid "record only the fact that removed paths will be added later" msgstr "将删除的路径标记为稍后添加" -#: builtin/reset.c:302 +#: builtin/reset.c:305 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "无法将 '%s' 解析为一个有效的版本。" -#: builtin/reset.c:305 builtin/reset.c:313 -#, c-format -msgid "Could not parse object '%s'." -msgstr "不能解析对象 '%s'。" - -#: builtin/reset.c:310 +#: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "无法将 '%s' 解析为一个有效的树对象。" -#: builtin/reset.c:319 +#: builtin/reset.c:322 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" -#: builtin/reset.c:328 +#: builtin/reset.c:331 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." -msgstr "--mixed 带路径已弃用，而是用 'git reset -- <paths>'。" +msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:330 +#: builtin/reset.c:333 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:340 +#: builtin/reset.c:343 #, c-format msgid "%s reset is not allowed in a bare repository" -msgstr "不能对裸版本库进行%s重置" +msgstr "不能对纯仓库进行%s重置" -#: builtin/reset.c:344 +#: builtin/reset.c:347 msgid "-N can only be used with --mixed" msgstr "-N 只能和 --mixed 同时使用" -#: builtin/reset.c:361 +#: builtin/reset.c:364 msgid "Unstaged changes after reset:" -msgstr "重置后撤出暂存区的变更：" +msgstr "重置后取消暂存的变更：" -#: builtin/reset.c:367 +#: builtin/reset.c:370 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" -#: builtin/reset.c:372 +#: builtin/reset.c:374 msgid "Could not write new index file." msgstr "不能写入新的索引文件。" -#: builtin/rev-parse.c:359 -msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git rev-parse --parseopt [选项] -- [<参数>...]" +#: builtin/rev-list.c:362 +msgid "rev-list does not support display of notes" +msgstr "rev-list 不支持显示注解" + +#: builtin/rev-parse.c:358 +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" -#: builtin/rev-parse.c:364 +#: builtin/rev-parse.c:363 msgid "keep the `--` passed as an arg" msgstr "保持 `--` 作为一个参数传递" -#: builtin/rev-parse.c:366 +#: builtin/rev-parse.c:365 msgid "stop parsing after the first non-option argument" msgstr "遇到第一个非选项参数后停止解析" -#: builtin/rev-parse.c:369 +#: builtin/rev-parse.c:368 msgid "output in stuck long form" msgstr "以固定长格式输出" -#: builtin/rev-parse.c:497 +#: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [选项] -- [<参数>...]\n" +"git rev-parse --parseopt [<选项>] -- [<参数>...]\n" " 或者：git rev-parse --sq-quote [<参数>...]\n" -" 或者：git rev-parse [选项] [<参数>...]\n" +" 或者：git rev-parse [<选项>] [<参数>...]\n" "\n" "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." -msgstr "git revert [选项] <提交号>..." +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<选项>] <提交号>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <子命令>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [选项] <提交号>..." +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<选项>] <提交号>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -8881,51 +11094,43 @@ msgstr "选项" msgid "option for merge strategy" msgstr "合并策略的选项" -#: builtin/revert.c:104 +#: builtin/revert.c:100 msgid "append commit name" msgstr "追加提交名称" -#: builtin/revert.c:105 -msgid "allow fast-forward" -msgstr "允许快进式" - -#: builtin/revert.c:106 +#: builtin/revert.c:102 msgid "preserve initially empty commits" msgstr "保留初始化的空提交" -#: builtin/revert.c:107 +#: builtin/revert.c:103 msgid "allow commits with empty messages" msgstr "允许提交说明为空" -#: builtin/revert.c:108 +#: builtin/revert.c:104 msgid "keep redundant, empty commits" msgstr "保持多余的、空的提交" -#: builtin/revert.c:112 -msgid "program error" -msgstr "程序错误" - -#: builtin/revert.c:197 +#: builtin/revert.c:192 msgid "revert failed" msgstr "还原失败" -#: builtin/revert.c:212 +#: builtin/revert.c:207 msgid "cherry-pick failed" msgstr "拣选失败" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." -msgstr "git rm [选项] [--] <文件>..." +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<选项>] [--] <文件>..." #: builtin/rm.c:65 msgid "" "the following submodule (or one of its nested submodules)\n" "uses a .git directory:" msgid_plural "" -"the following submodules (or one of its nested submodules)\n" +"the following submodules (or one of their nested submodules)\n" "use a .git directory:" -msgstr[0] "如下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" -msgstr[1] "如下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" +msgstr[0] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" +msgstr[1] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" #: builtin/rm.c:71 msgid "" @@ -8935,7 +11140,7 @@ msgstr "" "\n" "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" -#: builtin/rm.c:231 +#: builtin/rm.c:230 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -8945,7 +11150,7 @@ msgid_plural "" msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样：" msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样：" -#: builtin/rm.c:236 +#: builtin/rm.c:235 msgid "" "\n" "(use -f to force removal)" @@ -8953,13 +11158,13 @@ msgstr "" "\n" "（使用 -f 强制删除）" -#: builtin/rm.c:240 +#: builtin/rm.c:239 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" -msgstr[0] "如下文件相对索引区的内容有修改" -msgstr[1] "如下文件相对索引区的内容有修改" +msgstr[0] "下列文件索引中有变更" +msgstr[1] "下列文件索引中有变更" -#: builtin/rm.c:244 builtin/rm.c:255 +#: builtin/rm.c:243 builtin/rm.c:254 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -8967,202 +11172,437 @@ msgstr "" "\n" "（使用 --cached 保留本地文件，或用 -f 强制删除）" -#: builtin/rm.c:252 +#: builtin/rm.c:251 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "如下文件有本地修改：" msgstr[1] "如下文件有本地修改：" -#: builtin/rm.c:270 +#: builtin/rm.c:269 msgid "do not list removed files" msgstr "不列出删除的文件" -#: builtin/rm.c:271 +#: builtin/rm.c:270 msgid "only remove from the index" msgstr "只从索引区删除" -#: builtin/rm.c:272 +#: builtin/rm.c:271 msgid "override the up-to-date check" msgstr "忽略文件更新状态检查" -#: builtin/rm.c:273 +#: builtin/rm.c:272 msgid "allow recursive removal" msgstr "允许递归删除" -#: builtin/rm.c:275 +#: builtin/rm.c:274 msgid "exit with a zero status even if nothing matched" msgstr "即使没有匹配，也以零状态退出" -#: builtin/rm.c:336 +#: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" msgstr "未提供 -r 选项不会递归删除 '%s'" -#: builtin/rm.c:375 +#: builtin/rm.c:374 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm：不能删除 %s" +#: builtin/send-pack.c:18 +msgid "" +"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" +"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " +"[<ref>...]\n" +" --all and explicit <ref> specification are mutually exclusive." +msgstr "" +"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" +"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" +" --all 和明确的 <引用> 互斥。" + +#: builtin/send-pack.c:160 +msgid "remote name" +msgstr "远程名称" + +#: builtin/send-pack.c:171 +msgid "use stateless RPC protocol" +msgstr "使用无状态的 RPC 协议" + +#: builtin/send-pack.c:172 +msgid "read refs from stdin" +msgstr "从标准输入读取引用" + +#: builtin/send-pack.c:173 +msgid "print status from remote helper" +msgstr "打印来自远程 helper 的状态" + #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" -#: builtin/shortlog.c:131 -#, c-format -msgid "Missing author: %s" -msgstr "缺少作者：%s" - -#: builtin/shortlog.c:230 +#: builtin/shortlog.c:242 msgid "sort output according to the number of commits per author" msgstr "根据每个作者的提交数量排序" -#: builtin/shortlog.c:232 +#: builtin/shortlog.c:244 msgid "Suppress commit descriptions, only provides commit count" msgstr "隐藏提交说明，只提供提交数量" -#: builtin/shortlog.c:234 +#: builtin/shortlog.c:246 msgid "Show the email address of each author" msgstr "显示每个作者的电子邮件地址" -#: builtin/shortlog.c:235 +#: builtin/shortlog.c:247 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:236 +#: builtin/shortlog.c:248 msgid "Linewrap output" msgstr "折行输出" -#: builtin/show-branch.c:9 +#: builtin/show-branch.c:10 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" -"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" -"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " -"<glob>)...]" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" +"\t\t[--more=<n> | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" -"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" -"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " -"<glob>)...]" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" +"\t\t[--more=<n> | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" -#: builtin/show-branch.c:10 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" +#: builtin/show-branch.c:14 +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:640 msgid "show remote-tracking and local branches" msgstr "显示远程跟踪的和本地的分支" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:642 msgid "show remote-tracking branches" msgstr "显示远程跟踪的分支" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:644 msgid "color '*!+-' corresponding to the branch" msgstr "着色 '*!+-' 到相应的分支" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:646 msgid "show <n> more commits after the common ancestor" msgstr "显示共同祖先后的 <n> 个提交" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:648 msgid "synonym to more=-1" msgstr "和 more=-1 同义" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:649 msgid "suppress naming strings" msgstr "不显示字符串命名" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:651 msgid "include the current branch" msgstr "包括当前分支" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:653 msgid "name commits with their object names" msgstr "以对象名字命名提交" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:655 msgid "show possible merge bases" msgstr "显示可能合并的基线" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:657 msgid "show refs unreachable from any other ref" msgstr "显示没有任何引用的的引用" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:659 msgid "show commits in topological order" msgstr "以拓扑顺序显示提交" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:662 msgid "show only commits not on the first branch" msgstr "只显示不在第一个分支上的提交" -#: builtin/show-branch.c:673 +#: builtin/show-branch.c:664 msgid "show merges reachable from only one tip" msgstr "显示仅一个分支可访问的合并提交" -#: builtin/show-branch.c:675 +#: builtin/show-branch.c:666 msgid "topologically sort, maintaining date order where possible" msgstr "拓扑方式排序，并尽可能地保持日期顺序" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:669 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:679 +#: builtin/show-branch.c:670 msgid "show <n> most recent ref-log entries starting at base" msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" #: builtin/show-ref.c:11 -msgid "git show-ref --exclude-existing[=pattern] < ref-list" -msgstr "git show-ref --exclude-existing[=模式] < 引用列表" +msgid "git show-ref --exclude-existing[=<pattern>]" +msgstr "git show-ref --exclude-existing[=<模式>]" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:165 msgid "only show tags (can be combined with heads)" -msgstr "只显示 tags（可以和头共用）" +msgstr "只显示标签（可以和头共用）" -#: builtin/show-ref.c:169 +#: builtin/show-ref.c:166 msgid "only show heads (can be combined with tags)" -msgstr "只显示头（可以和 tags 共用）" +msgstr "只显示头（可以和标签共用）" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:167 msgid "stricter reference checking, requires exact ref path" msgstr "更严格的引用检测，需要精确的引用路径" -#: builtin/show-ref.c:173 builtin/show-ref.c:175 +#: builtin/show-ref.c:170 builtin/show-ref.c:172 msgid "show the HEAD reference, even if it would be filtered out" msgstr "显示 HEAD 引用，即使被过滤掉" -#: builtin/show-ref.c:177 +#: builtin/show-ref.c:174 msgid "dereference tags into object IDs" -msgstr "转换 tags 到对象ID" +msgstr "转换标签到对象 ID" -#: builtin/show-ref.c:179 +#: builtin/show-ref.c:176 msgid "only show SHA1 hash using <n> digits" msgstr "只显示使用 <n> 个数字的 SHA1 哈希" -#: builtin/show-ref.c:183 +#: builtin/show-ref.c:180 msgid "do not print results to stdout (useful with --verify)" msgstr "不打印结果到标准输出（例如与 --verify 参数共用）" -#: builtin/show-ref.c:185 +#: builtin/show-ref.c:182 msgid "show refs from stdin that aren't in local repository" -msgstr "显示从标准输入中读入的不在本地版本库中的引用" +msgstr "显示从标准输入中读入的不在本地仓库中的引用" + +#: builtin/stripspace.c:17 +msgid "git stripspace [-s | --strip-comments]" +msgstr "git stripspace [-s | --strip-comments]" + +#: builtin/stripspace.c:18 +msgid "git stripspace [-c | --comment-lines]" +msgstr "git stripspace [-c | --comment-lines]" + +#: builtin/stripspace.c:35 +msgid "skip and remove all lines starting with comment character" +msgstr "跳过和移除所有的注释行" + +#: builtin/stripspace.c:38 +msgid "prepend comment character and space to each line" +msgstr "为每一行的行首添加注释符和空格" + +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923 +#, c-format +msgid "No such ref: %s" +msgstr "没有这样的引用：%s" + +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "期望一个完整的引用名称，却得到 %s" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "无法从 url '%s' 剥离一个组件" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403 +#: builtin/submodule--helper.c:483 +msgid "alternative anchor for relative paths" +msgstr "相对路径的替代锚记（anchor）" + +#: builtin/submodule--helper.c:283 +msgid "git submodule--helper list [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" + +#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" + +#: builtin/submodule--helper.c:364 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "无法为子模组 '%s' 注册 url" + +#: builtin/submodule--helper.c:368 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n" + +# +#: builtin/submodule--helper.c:378 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "警告：建议子模组 '%s' 使用命令更新模式\n" + +#: builtin/submodule--helper.c:385 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "无法为子模组 '%s' 注册更新模式" + +#: builtin/submodule--helper.c:404 +msgid "Suppress output for initializing a submodule" +msgstr "初始化子模组时抑制输出" + +#: builtin/submodule--helper.c:409 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<路径>]" + +#: builtin/submodule--helper.c:430 +msgid "git submodule--helper name <path>" +msgstr "git submodule--helper name <路径>" + +#: builtin/submodule--helper.c:436 +#, c-format +msgid "no submodule mapping found in .gitmodules for path '%s'" +msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" + +#: builtin/submodule--helper.c:486 +msgid "where the new submodule will be cloned to" +msgstr "新的子模组将要克隆的路径" + +#: builtin/submodule--helper.c:489 +msgid "name of the new submodule" +msgstr "新子模组的名称" + +#: builtin/submodule--helper.c:492 +msgid "url where to clone the submodule from" +msgstr "克隆子模组的 url 地址" + +#: builtin/submodule--helper.c:498 +msgid "depth for shallow clones" +msgstr "浅克隆的深度" + +#: builtin/submodule--helper.c:504 +msgid "" +"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +msgstr "" +"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " +"[--name <名字>] [--depth <深度>] --url <url> --path <路径>" + +#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535 +#, c-format +msgid "could not create directory '%s'" +msgstr "不能创建目录 '%s'" + +#: builtin/submodule--helper.c:531 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "无法克隆 '%s' 到子模组路径 '%s'" + +#: builtin/submodule--helper.c:547 +#, c-format +msgid "cannot open file '%s'" +msgstr "无法打开文件 '%s'" + +#: builtin/submodule--helper.c:552 +#, c-format +msgid "could not close file %s" +msgstr "无法关闭文件 %s" + +#: builtin/submodule--helper.c:559 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "无法得到 '%s' 的子模组目录" + +#: builtin/submodule--helper.c:611 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "子模组 '%s' 尚未初始化" + +#: builtin/submodule--helper.c:615 +msgid "Maybe you want to use 'update --init'?" +msgstr "也许您想要执行 'update --init'？" + +#: builtin/submodule--helper.c:641 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "略过未合并的子模组 %s" + +#: builtin/submodule--helper.c:662 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "略过子模组 '%s'" + +#: builtin/submodule--helper.c:792 +#, c-format +msgid "Failed to clone '%s'. Retry scheduled" +msgstr "克隆 '%s' 失败。按计划重试" + +#: builtin/submodule--helper.c:803 +#, c-format +msgid "Failed to clone '%s' a second time, aborting" +msgstr "第二次尝试克隆 '%s' 失败，退出" + +#: builtin/submodule--helper.c:824 +msgid "path into the working tree" +msgstr "到工作区的路径" + +#: builtin/submodule--helper.c:827 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "工作区中的路径，递归嵌套子模组" + +#: builtin/submodule--helper.c:831 +msgid "rebase, merge, checkout or none" +msgstr "rebase、merge、checkout 或 none" + +#: builtin/submodule--helper.c:835 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "创建一个指定深度的浅克隆" + +#: builtin/submodule--helper.c:838 +msgid "parallel jobs" +msgstr "并发任务" + +#: builtin/submodule--helper.c:840 +msgid "whether the initial clone should follow the shallow recommendation" +msgstr "初始克隆是否应该遵守推荐的浅克隆选项" + +#: builtin/submodule--helper.c:841 +msgid "don't print cloning progress" +msgstr "不要输出克隆进度" + +#: builtin/submodule--helper.c:846 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" + +#: builtin/submodule--helper.c:856 +msgid "bad value for update parameter" +msgstr "update 参数取值错误" + +#: builtin/submodule--helper.c:927 +#, c-format +msgid "" +"Submodule (%s) branch configured to inherit branch from superproject, but " +"the superproject is not on any branch" +msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上" + +#: builtin/submodule--helper.c:977 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "submodule-helper 子命令必须由另外的子命令调用" + +#: builtin/submodule--helper.c:984 +#, c-format +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "'%s' 不是一个有效的 submodule--helper 子命令" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" -msgstr "git symbolic-ref [选项] 名称 [引用]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" -msgstr "git symbolic-ref -d [-q] 名称" +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <名称>" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" @@ -9176,376 +11616,431 @@ msgstr "删除符号引用" msgid "shorten ref output" msgstr "简短的引用输出" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:255 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "原因" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:255 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "更新的原因" -#: builtin/tag.c:22 +#: builtin/tag.c:23 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" -msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" +msgstr "" +"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" -#: builtin/tag.c:23 +#: builtin/tag.c:24 msgid "git tag -d <tagname>..." msgstr "git tag -d <标签名>..." -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" -"\t\t[<pattern>...]" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" +"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "" -"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n" -"\t\t[<模式>...]" +"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n" +"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "git tag -v <tagname>..." msgstr "git tag -v <标签名>..." -#: builtin/tag.c:67 -#, c-format -msgid "malformed object at '%s'" -msgstr "非法的对象于 '%s'" - -#: builtin/tag.c:239 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." -msgstr "tag 名字太长：%.*s..." +msgstr "标签名称太长：%.*s..." -#: builtin/tag.c:244 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." -msgstr "tag '%s' 未发现。" +msgstr "未发现标签 '%s'。" -#: builtin/tag.c:259 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" -msgstr "已删除 tag '%s'（曾为 %s）\n" +msgstr "已删除标签 '%s'（曾为 %s）\n" -#: builtin/tag.c:271 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "不能校验 tag '%s'" - -#: builtin/tag.c:281 +#: builtin/tag.c:117 #, c-format msgid "" "\n" -"Write a tag message\n" +"Write a message for tag:\n" +" %s\n" "Lines starting with '%c' will be ignored.\n" msgstr "" "\n" -"输入一个 tag 说明\n" +"输入一个标签说明：\n" +" %s\n" "以 '%c' 开头的行将被忽略。\n" -#: builtin/tag.c:285 +#: builtin/tag.c:121 #, c-format msgid "" "\n" -"Write a tag message\n" +"Write a message for tag:\n" +" %s\n" "Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" msgstr "" "\n" -"输入一个 tag 说明\n" +"输入一个标签说明：\n" +" %s\n" "以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n" -#: builtin/tag.c:324 +#: builtin/tag.c:199 msgid "unable to sign the tag" -msgstr "无法签署 tag" +msgstr "无法签署标签" -#: builtin/tag.c:326 +#: builtin/tag.c:201 msgid "unable to write tag file" -msgstr "无法写 tag 文件" +msgstr "无法写标签文件" -#: builtin/tag.c:351 +#: builtin/tag.c:226 msgid "bad object type." msgstr "坏的对象类型。" -#: builtin/tag.c:364 +#: builtin/tag.c:239 msgid "tag header too big." -msgstr "tag 头信息太大。" +msgstr "标签头信息太大。" -#: builtin/tag.c:400 +#: builtin/tag.c:275 msgid "no tag message?" -msgstr "无 tag 说明？" +msgstr "无标签说明？" -#: builtin/tag.c:406 +#: builtin/tag.c:281 #, c-format msgid "The tag message has been left in %s\n" -msgstr "tag 说明被保留在 %s\n" - -#: builtin/tag.c:455 -msgid "switch 'points-at' requires an object" -msgstr "开关 'points-at' 需要一个对象" - -#: builtin/tag.c:457 -#, c-format -msgid "malformed object name '%s'" -msgstr "非法的对象名 '%s'" - -#: builtin/tag.c:480 -#, c-format -msgid "unsupported sort specification %s" -msgstr "不支持的排序规格 %s" +msgstr "标签说明被保留在 %s\n" -#: builtin/tag.c:500 +#: builtin/tag.c:339 msgid "list tag names" -msgstr "列出tag名称" +msgstr "列出标签名称" -#: builtin/tag.c:502 +#: builtin/tag.c:341 msgid "print <n> lines of each tag message" -msgstr "每个 tag 信息打印 <n> 行" +msgstr "每个标签信息打印 <n> 行" -#: builtin/tag.c:504 +#: builtin/tag.c:343 msgid "delete tags" -msgstr "删除 tags" +msgstr "删除标签" -#: builtin/tag.c:505 +#: builtin/tag.c:344 msgid "verify tags" -msgstr "验证 tags" +msgstr "验证标签" -#: builtin/tag.c:507 +#: builtin/tag.c:346 msgid "Tag creation options" -msgstr "Tag 创建选项" +msgstr "标签创建选项" -#: builtin/tag.c:509 +#: builtin/tag.c:348 msgid "annotated tag, needs a message" -msgstr "注解 tag，需要一个说明" +msgstr "附注标签，需要一个说明" -#: builtin/tag.c:511 +#: builtin/tag.c:350 msgid "tag message" -msgstr "tag 说明" +msgstr "标签说明" -#: builtin/tag.c:513 +#: builtin/tag.c:352 msgid "annotated and GPG-signed tag" -msgstr "注解并 GPG 签名的 tag" +msgstr "附注并附加 GPG 签名的标签" -#: builtin/tag.c:517 +#: builtin/tag.c:356 msgid "use another key to sign the tag" -msgstr "使用另外的私钥签名 tag" +msgstr "使用另外的私钥签名该标签" -#: builtin/tag.c:518 +#: builtin/tag.c:357 msgid "replace the tag if exists" -msgstr "如果存在，替换现有的 tag" +msgstr "如果存在，替换现有的标签" -#: builtin/tag.c:519 -msgid "show tag list in columns" -msgstr "以列的方式显示 tag" - -#: builtin/tag.c:521 -msgid "sort tags" -msgstr "排序 tags" +#: builtin/tag.c:358 builtin/update-ref.c:368 +msgid "create a reflog" +msgstr "创建引用日志" -#: builtin/tag.c:525 +#: builtin/tag.c:360 msgid "Tag listing options" -msgstr "Tag 列表选项" +msgstr "标签列表选项" -#: builtin/tag.c:528 builtin/tag.c:534 +#: builtin/tag.c:361 +msgid "show tag list in columns" +msgstr "以列的方式显示标签列表" + +#: builtin/tag.c:362 builtin/tag.c:363 msgid "print only tags that contain the commit" -msgstr "只打印包含提交的tags" +msgstr "只打印包含提交的标签" -#: builtin/tag.c:540 +#: builtin/tag.c:364 +msgid "print only tags that are merged" +msgstr "只打印已经合并的标签" + +#: builtin/tag.c:365 +msgid "print only tags that are not merged" +msgstr "只打印尚未合并的标签" + +#: builtin/tag.c:370 msgid "print only tags of the object" -msgstr "只打印tags对象" +msgstr "只打印对象的标签" -#: builtin/tag.c:566 +#: builtin/tag.c:399 msgid "--column and -n are incompatible" msgstr "--column 和 -n 不兼容" -#: builtin/tag.c:578 -msgid "--sort and -n are incompatible" -msgstr "--sort 和 -n 不兼容" - -#: builtin/tag.c:585 +#: builtin/tag.c:419 msgid "-n option is only allowed with -l." msgstr "-n 选项只允许和 -l 同时使用。" -#: builtin/tag.c:587 +#: builtin/tag.c:421 msgid "--contains option is only allowed with -l." msgstr "--contains 选项只允许和 -l 同时使用。" -#: builtin/tag.c:589 +#: builtin/tag.c:423 msgid "--points-at option is only allowed with -l." msgstr "--points-at 选项只允许和 -l 同时使用。" -#: builtin/tag.c:597 +#: builtin/tag.c:425 +msgid "--merged and --no-merged option are only allowed with -l" +msgstr "选项 --merged 和 --no-merged 只能和 -l 共用" + +#: builtin/tag.c:433 msgid "only one -F or -m option is allowed." msgstr "只允许一个 -F 或 -m 选项。" -#: builtin/tag.c:617 +#: builtin/tag.c:452 msgid "too many params" msgstr "太多参数" -#: builtin/tag.c:623 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." -msgstr "'%s' 不是一个有效的tag名称。" +msgstr "'%s' 不是一个有效的标签名称。" -#: builtin/tag.c:628 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" -msgstr "tag '%s' 已存在" +msgstr "标签 '%s' 已存在" -#: builtin/tag.c:646 +#: builtin/tag.c:491 #, c-format -msgid "%s: cannot lock the ref" -msgstr "%s：不能锁定引用" +msgid "Updated tag '%s' (was %s)\n" +msgstr "已更新标签 '%s'（曾为 %s）\n" -#: builtin/tag.c:648 +#: builtin/unpack-objects.c:490 +msgid "Unpacking objects" +msgstr "展开对象中" + +#: builtin/update-index.c:79 #, c-format -msgid "%s: cannot update the ref" -msgstr "%s：不能更新引用" +msgid "failed to create directory %s" +msgstr "无法创建目录 %s" -#: builtin/tag.c:650 +#: builtin/update-index.c:85 #, c-format -msgid "Updated tag '%s' (was %s)\n" -msgstr "已更新tag '%s'（曾为 %s）\n" +msgid "failed to stat %s" +msgstr "无法枚举 %s 状态" -#: builtin/unpack-objects.c:483 -msgid "Unpacking objects" -msgstr "展开对象中" +#: builtin/update-index.c:95 +#, c-format +msgid "failed to create file %s" +msgstr "无法创建文件 %s" + +#: builtin/update-index.c:103 +#, c-format +msgid "failed to delete file %s" +msgstr "无法删除文件 %s" + +#: builtin/update-index.c:110 builtin/update-index.c:212 +#, c-format +msgid "failed to delete directory %s" +msgstr "无法删除目录 %s" + +#: builtin/update-index.c:133 +#, c-format +msgid "Testing mtime in '%s' " +msgstr "在 '%s' 中测试 mtime " + +#: builtin/update-index.c:145 +msgid "directory stat info does not change after adding a new file" +msgstr "添加一个新文件后，目录的状态信息未改变" + +#: builtin/update-index.c:158 +msgid "directory stat info does not change after adding a new directory" +msgstr "添加一个新目录后，目录的状态信息未改变" + +#: builtin/update-index.c:171 +msgid "directory stat info changes after updating a file" +msgstr "更新一个文件后，目录的状态信息被修改" -#: builtin/update-index.c:399 -msgid "git update-index [options] [--] [<file>...]" -msgstr "git update-index [选项] [--] [<文件>...]" +#: builtin/update-index.c:182 +msgid "directory stat info changes after adding a file inside subdirectory" +msgstr "在子目录中添加文件后，目录的状态信息被修改" -#: builtin/update-index.c:748 +#: builtin/update-index.c:193 +msgid "directory stat info does not change after deleting a file" +msgstr "删除一个文件后，目录的状态信息未改变" + +#: builtin/update-index.c:206 +msgid "directory stat info does not change after deleting a directory" +msgstr "删除一个目录后，目录的状态信息未改变" + +#: builtin/update-index.c:213 +msgid " OK" +msgstr " OK" + +#: builtin/update-index.c:575 +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<选项>] [--] [<文件>...]" + +#: builtin/update-index.c:930 msgid "continue refresh even when index needs update" msgstr "当索引需要更新时继续刷新" -#: builtin/update-index.c:751 +#: builtin/update-index.c:933 msgid "refresh: ignore submodules" msgstr "刷新：忽略子模组" -#: builtin/update-index.c:754 +#: builtin/update-index.c:936 msgid "do not ignore new files" msgstr "不忽略新的文件" -#: builtin/update-index.c:756 +#: builtin/update-index.c:938 msgid "let files replace directories and vice-versa" msgstr "让文件替换目录（反之亦然）" -#: builtin/update-index.c:758 +#: builtin/update-index.c:940 msgid "notice files missing from worktree" msgstr "通知文件从工作区丢失" -#: builtin/update-index.c:760 +#: builtin/update-index.c:942 msgid "refresh even if index contains unmerged entries" msgstr "即使索引区包含未合并的条目也执行刷新" -#: builtin/update-index.c:763 +#: builtin/update-index.c:945 msgid "refresh stat information" msgstr "刷新统计信息" -#: builtin/update-index.c:767 +#: builtin/update-index.c:949 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置" -#: builtin/update-index.c:771 +#: builtin/update-index.c:953 msgid "<mode>,<object>,<path>" -msgstr "<mode>,<object>,<path>" +msgstr "<存取模式>,<对象>,<路径>" -#: builtin/update-index.c:772 +#: builtin/update-index.c:954 msgid "add the specified entry to the index" msgstr "添加指定的条目到索引区" -#: builtin/update-index.c:776 -msgid "(+/-)x" -msgstr "(+/-)x" - -#: builtin/update-index.c:777 -msgid "override the executable bit of the listed files" -msgstr "覆盖列表里文件的可执行位" - -#: builtin/update-index.c:781 +#: builtin/update-index.c:963 msgid "mark files as \"not changing\"" msgstr "把文件标记为 \"没有变更\"" -#: builtin/update-index.c:784 +#: builtin/update-index.c:966 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged 位" -#: builtin/update-index.c:787 +#: builtin/update-index.c:969 msgid "mark files as \"index-only\"" msgstr "把文件标记为 \"仅索引\"" -#: builtin/update-index.c:790 +#: builtin/update-index.c:972 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree 位" -#: builtin/update-index.c:793 +#: builtin/update-index.c:975 msgid "add to index only; do not add content to object database" msgstr "只添加到索引区；不添加对象到对象库" -#: builtin/update-index.c:795 +#: builtin/update-index.c:977 msgid "remove named paths even if present in worktree" msgstr "即使存在工作区里，也删除路径" -#: builtin/update-index.c:797 +#: builtin/update-index.c:979 msgid "with --stdin: input lines are terminated by null bytes" msgstr "携带 --stdin：输入的行以 null 字符终止" -#: builtin/update-index.c:799 +#: builtin/update-index.c:981 msgid "read list of paths to be updated from standard input" msgstr "从标准输入中读取需要更新的路径列表" -#: builtin/update-index.c:803 +#: builtin/update-index.c:985 msgid "add entries from standard input to the index" msgstr "从标准输入添加条目到索引区" -#: builtin/update-index.c:807 +#: builtin/update-index.c:989 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "为指定文件重新生成第2和第3暂存区" -#: builtin/update-index.c:811 +#: builtin/update-index.c:993 msgid "only update entries that differ from HEAD" msgstr "只更新与 HEAD 不同的条目" -#: builtin/update-index.c:815 +#: builtin/update-index.c:997 msgid "ignore files missing from worktree" msgstr "忽略工作区丢失的文件" -#: builtin/update-index.c:818 +#: builtin/update-index.c:1000 msgid "report actions to standard output" msgstr "在标准输出显示操作" -#: builtin/update-index.c:820 +#: builtin/update-index.c:1002 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘记保存的未解决的冲突" -#: builtin/update-index.c:824 +#: builtin/update-index.c:1006 msgid "write index in this format" msgstr "以这种格式写入索引区" +#: builtin/update-index.c:1008 +msgid "enable or disable split index" +msgstr "启用或禁用索引拆分" + +#: builtin/update-index.c:1010 +msgid "enable/disable untracked cache" +msgstr "启用/禁用对未跟踪文件的缓存" + +#: builtin/update-index.c:1012 +msgid "test if the filesystem supports untracked cache" +msgstr "测试文件系统是否支持未跟踪文件缓存" + +#: builtin/update-index.c:1014 +msgid "enable untracked cache without testing the filesystem" +msgstr "无需检测文件系统，启用对未跟踪文件的缓存" + +#: builtin/update-index.c:1134 +msgid "Untracked cache disabled" +msgstr "缓存未跟踪文件被禁用" + +#: builtin/update-index.c:1146 +#, c-format +msgid "Untracked cache enabled for '%s'" +msgstr "缓存未跟踪文件在 '%s' 启用" + #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "git update-ref [选项] -d <引用名> [<旧值>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" -msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" +msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" -msgstr "git update-ref [选项] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<选项>] --stdin [-z]" -#: builtin/update-ref.c:256 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "删除引用" -#: builtin/update-ref.c:258 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "更新 <引用名> 本身而不是它指向的引用" -#: builtin/update-ref.c:259 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "标准输入有以 NUL 字符终止的参数" -#: builtin/update-ref.c:260 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "从标准输入读取更新" @@ -9557,25 +12052,145 @@ msgstr "git update-server-info [--force]" msgid "update the info files from scratch" msgstr "从头开始更新文件信息" -#: builtin/verify-pack.c:56 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +#: builtin/verify-commit.c:17 +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <提交>..." -#: builtin/verify-pack.c:66 +#: builtin/verify-commit.c:72 +msgid "print commit contents" +msgstr "打印提交内容" + +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 +msgid "print raw gpg status output" +msgstr "打印原始 gpg 状态输出" + +#: builtin/verify-pack.c:54 +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." + +#: builtin/verify-pack.c:64 msgid "verbose" msgstr "冗长输出" -#: builtin/verify-pack.c:68 +#: builtin/verify-pack.c:66 msgid "show statistics only" msgstr "只显示统计" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "git verify-tag [-v|--verbose] <tag>..." +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <标签>..." -#: builtin/verify-tag.c:73 +#: builtin/verify-tag.c:34 msgid "print tag contents" -msgstr "打印 tag 内容" +msgstr "打印标签内容" + +#: builtin/worktree.c:15 +msgid "git worktree add [<options>] <path> [<branch>]" +msgstr "git worktree add [<选项>] <路径> [<分支>]" + +#: builtin/worktree.c:16 +msgid "git worktree list [<options>]" +msgstr "git worktree list [<选项>]" + +#: builtin/worktree.c:17 +msgid "git worktree lock [<options>] <path>" +msgstr "git worktree lock [<选项>] <路径>" + +#: builtin/worktree.c:18 +msgid "git worktree prune [<options>]" +msgstr "git worktree prune [<选项>]" + +#: builtin/worktree.c:19 +msgid "git worktree unlock <path>" +msgstr "git worktree unlock <路径>" + +#: builtin/worktree.c:42 +#, c-format +msgid "Removing worktrees/%s: not a valid directory" +msgstr "删除工作区/%s：不是一个有效的目录" + +#: builtin/worktree.c:48 +#, c-format +msgid "Removing worktrees/%s: gitdir file does not exist" +msgstr "删除 worktrees/%s：gitdir 文件不存在" + +#: builtin/worktree.c:53 +#, c-format +msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)" + +#: builtin/worktree.c:64 +#, c-format +msgid "Removing worktrees/%s: invalid gitdir file" +msgstr "删除 worktrees/%s：无效的 gitdir 文件" + +#: builtin/worktree.c:80 +#, c-format +msgid "Removing worktrees/%s: gitdir file points to non-existent location" +msgstr "删除 worktrees/%s：gitdir 文件的指向不存在" + +#: builtin/worktree.c:204 +#, c-format +msgid "'%s' already exists" +msgstr "'%s' 已经存在" + +#: builtin/worktree.c:236 +#, c-format +msgid "could not create directory of '%s'" +msgstr "不能创建目录 '%s'" + +#: builtin/worktree.c:272 +#, c-format +msgid "Preparing %s (identifier %s)" +msgstr "准备 %s （标识符 %s）" + +#: builtin/worktree.c:323 +msgid "checkout <branch> even if already checked out in other worktree" +msgstr "检出分支 <branch> 即使已经被检出到其它工作区" + +#: builtin/worktree.c:325 +msgid "create a new branch" +msgstr "创建一个新分支" + +#: builtin/worktree.c:327 +msgid "create or reset a branch" +msgstr "创建或重置一个分支" + +#: builtin/worktree.c:329 +msgid "populate the new working tree" +msgstr "生成新的工作区" + +#: builtin/worktree.c:337 +msgid "-b, -B, and --detach are mutually exclusive" +msgstr "-b、-B 和 --detach 是互斥的" + +#: builtin/worktree.c:470 +msgid "reason for locking" +msgstr "锁定原因" + +#: builtin/worktree.c:482 builtin/worktree.c:515 +#, c-format +msgid "'%s' is not a working tree" +msgstr "'%s' 不是一个工作区" + +#: builtin/worktree.c:484 builtin/worktree.c:517 +msgid "The main working tree cannot be locked or unlocked" +msgstr "主工作区无法被加锁或解锁" + +#: builtin/worktree.c:489 +#, c-format +msgid "'%s' is already locked, reason: %s" +msgstr "'%s' 已被锁定，原因：%s" + +#: builtin/worktree.c:491 +#, c-format +msgid "'%s' is already locked" +msgstr "'%s' 已被锁定" + +#: builtin/worktree.c:519 +#, c-format +msgid "'%s' is not locked" +msgstr "'%s' 未被锁定" #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" @@ -9593,291 +12208,173 @@ msgstr "将 <前缀> 子目录内容写到一个树对象" msgid "only useful for debugging" msgstr "只对调试有用" -#: git.c:17 +#: upload-pack.c:20 +msgid "git upload-pack [<options>] <dir>" +msgstr "git upload-pack [<选项>] <目录>" + +#: upload-pack.c:837 +msgid "quit after a single request/response exchange" +msgstr "在一次单独的请求/响应（request/response）交换后退出" + +#: upload-pack.c:839 +msgid "exit immediately after initial ref advertisement" +msgstr "在初始的引用广告后立即退出" + +#: upload-pack.c:841 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录" + +#: upload-pack.c:843 +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "不活动 <n> 秒钟后终止传输" + +#: credential-cache--daemon.c:271 +msgid "print debugging messages to stderr" +msgstr "调试信息输出到标准错误" + +#: git.c:14 msgid "" -"'git help -a' and 'git help -g' lists available subcommands and some\n" +"'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" -"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n" -"'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。" +"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" +"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" +"帮助。" -#: parse-options.h:143 -msgid "expiry-date" -msgstr "逾期日期" +#: http.c:323 +msgid "Public key pinning not supported with cURL < 7.44.0" +msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0" -#: parse-options.h:158 -msgid "no-op (backward compatibility)" -msgstr "空操作（向后兼容）" +#: common-cmds.h:9 +msgid "start a working area (see also: git help tutorial)" +msgstr "开始一个工作区（参见：git help tutorial）" -#: parse-options.h:232 -msgid "be more verbose" -msgstr "更加详细" +#: common-cmds.h:10 +msgid "work on the current change (see also: git help everyday)" +msgstr "在当前变更上工作（参见：git help everyday）" -#: parse-options.h:234 -msgid "be more quiet" -msgstr "更加安静" +#: common-cmds.h:11 +msgid "examine the history and state (see also: git help revisions)" +msgstr "检查历史和状态（参见：git help revisions）" -#: parse-options.h:240 -msgid "use <n> digits to display SHA-1s" -msgstr "用 <n> 位数字显示 SHA-1 哈希值" +#: common-cmds.h:12 +msgid "grow, mark and tweak your common history" +msgstr "扩展、标记和调校您的历史记录" + +#: common-cmds.h:13 +msgid "collaborate (see also: git help workflows)" +msgstr "协同（参见：git help workflows）" -#: common-cmds.h:8 +#: common-cmds.h:17 msgid "Add file contents to the index" msgstr "添加文件内容至索引" -#: common-cmds.h:9 -msgid "Find by binary search the change that introduced a bug" -msgstr "通过二分查找定位引入 bug 的变更" +#: common-cmds.h:18 +msgid "Use binary search to find the commit that introduced a bug" +msgstr "通过二分查找定位引入 bug 的提交" -#: common-cmds.h:10 +#: common-cmds.h:19 msgid "List, create, or delete branches" msgstr "列出、创建或删除分支" -#: common-cmds.h:11 -msgid "Checkout a branch or paths to the working tree" -msgstr "检出一个分支或路径到工作区" +#: common-cmds.h:20 +msgid "Switch branches or restore working tree files" +msgstr "切换分支或恢复工作区文件" -#: common-cmds.h:12 +#: common-cmds.h:21 msgid "Clone a repository into a new directory" -msgstr "克隆一个版本库到一个新目录" +msgstr "克隆一个仓库到一个新目录" -#: common-cmds.h:13 +#: common-cmds.h:22 msgid "Record changes to the repository" -msgstr "记录变更到版本库" +msgstr "记录变更到仓库" -#: common-cmds.h:14 +#: common-cmds.h:23 msgid "Show changes between commits, commit and working tree, etc" msgstr "显示提交之间、提交和工作区之间等的差异" -#: common-cmds.h:15 +#: common-cmds.h:24 msgid "Download objects and refs from another repository" -msgstr "从另外一个版本库下载对象和引用" +msgstr "从另外一个仓库下载对象和引用" -#: common-cmds.h:16 +#: common-cmds.h:25 msgid "Print lines matching a pattern" msgstr "输出和模式匹配的行" -#: common-cmds.h:17 +#: common-cmds.h:26 msgid "Create an empty Git repository or reinitialize an existing one" -msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库" +msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" -#: common-cmds.h:18 +#: common-cmds.h:27 msgid "Show commit logs" msgstr "显示提交日志" -#: common-cmds.h:19 +#: common-cmds.h:28 msgid "Join two or more development histories together" msgstr "合并两个或更多开发历史" -#: common-cmds.h:20 +#: common-cmds.h:29 msgid "Move or rename a file, a directory, or a symlink" msgstr "移动或重命名一个文件、目录或符号链接" -#: common-cmds.h:21 +#: common-cmds.h:30 msgid "Fetch from and integrate with another repository or a local branch" -msgstr "获取并整合另外的版本库或一个本地分支" +msgstr "获取并整合另外的仓库或一个本地分支" -#: common-cmds.h:22 +#: common-cmds.h:31 msgid "Update remote refs along with associated objects" msgstr "更新远程引用和相关的对象" -#: common-cmds.h:23 -msgid "Forward-port local commits to the updated upstream head" -msgstr "本地提交转移至更新后的上游分支中" +#: common-cmds.h:32 +msgid "Reapply commits on top of another base tip" +msgstr "在另一个分支上重新应用提交" -#: common-cmds.h:24 +#: common-cmds.h:33 msgid "Reset current HEAD to the specified state" -msgstr "重置当前HEAD到指定状态" +msgstr "重置当前 HEAD 到指定状态" -#: common-cmds.h:25 +#: common-cmds.h:34 msgid "Remove files from the working tree and from the index" msgstr "从工作区和索引中删除文件" -#: common-cmds.h:26 +#: common-cmds.h:35 msgid "Show various types of objects" msgstr "显示各种类型的对象" -#: common-cmds.h:27 +#: common-cmds.h:36 msgid "Show the working tree status" msgstr "显示工作区状态" -#: common-cmds.h:28 +#: common-cmds.h:37 msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象" - -#: git-am.sh:52 -msgid "You need to set your committer info first" -msgstr "您需要先设置你的提交者信息" - -#: git-am.sh:97 -msgid "" -"You seem to have moved HEAD since the last 'am' failure.\n" -"Not rewinding to ORIG_HEAD" -msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" - -#: git-am.sh:107 -#, sh-format -msgid "" -"When you have resolved this problem, run \"$cmdline --continue\".\n" -"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" -"To restore the original branch and stop patching, run \"$cmdline --abort\"." -msgstr "" -"当您解决了此问题后，执行 \"$cmdline --continue\"。\n" -"如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n" -"要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" - -#: git-am.sh:123 -msgid "Cannot fall back to three-way merge." -msgstr "无法求助于三路合并。" - -#: git-am.sh:139 -msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "版本库缺乏必要的数据（blob）对象以进行三路合并。" +msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" -#: git-am.sh:141 -msgid "Using index info to reconstruct a base tree..." -msgstr "使用索引来重建一个（三路合并的）基础目录树..." - -#: git-am.sh:156 -msgid "" -"Did you hand edit your patch?\n" -"It does not apply to blobs recorded in its index." -msgstr "" -"您是否曾手动编辑过您的补丁？\n" -"无法应用补丁到索引中的数据（blob）对象上。" - -#: git-am.sh:165 -msgid "Falling back to patching base and 3-way merge..." -msgstr "转而在基础版本上打补丁及进行三路合并..." - -#: git-am.sh:181 -msgid "Failed to merge in the changes." -msgstr "无法合并变更。" - -#: git-am.sh:276 -msgid "Only one StGIT patch series can be applied at once" -msgstr "一次只能有一个 StGIT 补丁队列被应用" - -#: git-am.sh:363 -#, sh-format -msgid "Patch format $patch_format is not supported." -msgstr "不支持 $patch_format 补丁格式。" - -#: git-am.sh:365 -msgid "Patch format detection failed." -msgstr "补丁格式检测失败。" - -#: git-am.sh:392 -msgid "" -"The -b/--binary option has been a no-op for long time, and\n" -"it will be removed. Please do not use it anymore." -msgstr "" -"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被删除。\n" -"请不要再使用它了。" - -#: git-am.sh:486 -#, sh-format -msgid "previous rebase directory $dotest still exists but mbox given." -msgstr "之前的变基目录 $dotest 仍然存在，但却提供了 mbox。" - -#: git-am.sh:491 -msgid "Please make up your mind. --skip or --abort?" -msgstr "请下决心。--skip 或是 --abort ？" - -#: git-am.sh:527 -#, sh-format -msgid "" -"Stray $dotest directory found.\n" -"Use \"git am --abort\" to remove it." -msgstr "" -"发现了错误的 $dotest 目录。\n" -"使用 \"git am --abort\" 删除它。" - -#: git-am.sh:535 -msgid "Resolve operation not in progress, we are not resuming." -msgstr "解决操作未进行，我们不会继续。" - -#: git-am.sh:601 -#, sh-format -msgid "Dirty index: cannot apply patches (dirty: $files)" -msgstr "脏的索引：不能应用补丁（脏文件：$files）" - -#: git-am.sh:705 -#, sh-format -msgid "" -"Patch is empty. Was it split wrong?\n" -"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" -"To restore the original branch and stop patching run \"$cmdline --abort\"." -msgstr "" -"补丁为空。是不是切分错误？\n" -"如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n" -"要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" - -#: git-am.sh:732 -msgid "Patch does not have a valid e-mail address." -msgstr "补丁中没有一个有效的邮件地址。" - -#: git-am.sh:779 -msgid "cannot be interactive without stdin connected to a terminal." -msgstr "标准输入没有和终端关联，不能进行交互式操作。" - -#: git-am.sh:783 -msgid "Commit Body is:" -msgstr "提交内容为：" - -# 译者：注意保持句尾空格 -#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] -#. in your translation. The program will only accept English -#. input at this point. -#: git-am.sh:790 -msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " - -#: git-am.sh:826 -#, sh-format -msgid "Applying: $FIRSTLINE" -msgstr "正应用：$FIRSTLINE" - -#: git-am.sh:847 -msgid "" -"No changes - did you forget to use 'git add'?\n" -"If there is nothing left to stage, chances are that something else\n" -"already introduced the same changes; you might want to skip this patch." -msgstr "" -"没有变更 —— 您是不是忘了执行 'git add'？\n" -"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" -"您也许想要跳过这个补丁。" +#: parse-options.h:145 +msgid "expiry-date" +msgstr "到期时间" -#: git-am.sh:855 -msgid "" -"You still have unmerged paths in your index\n" -"did you forget to use 'git add'?" -msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？" +#: parse-options.h:160 +msgid "no-op (backward compatibility)" +msgstr "空操作（向后兼容）" -#: git-am.sh:871 -msgid "No changes -- Patch already applied." -msgstr "没有变更 —— 补丁已经应用过。" +#: parse-options.h:237 +msgid "be more verbose" +msgstr "更加详细" -#: git-am.sh:881 -#, sh-format -msgid "Patch failed at $msgnum $FIRSTLINE" -msgstr "补丁失败于 $msgnum $FIRSTLINE" +#: parse-options.h:239 +msgid "be more quiet" +msgstr "更加安静" -#: git-am.sh:884 -#, sh-format -msgid "" -"The copy of the patch that failed is found in:\n" -" $dotest/patch" -msgstr "" -"失败的补丁文件副本位于：\n" -" $dotest/patch" +#: parse-options.h:245 +msgid "use <n> digits to display SHA-1s" +msgstr "用 <n> 位数字显示 SHA-1 哈希值" -#: git-am.sh:902 -msgid "applying to an empty history" -msgstr "正应用到一个空历史上" +#: rerere.h:40 +msgid "update the index with reused conflict resolution if possible" +msgstr "如果可能，重用冲突解决更新索引" -#: git-bisect.sh:48 +#: git-bisect.sh:54 msgid "You need to start by \"git bisect start\"" msgstr "您需要执行 \"git bisect start\" 来开始" @@ -9885,101 +12382,106 @@ msgstr "您需要执行 \"git bisect start\" 来开始" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:54 +#: git-bisect.sh:60 msgid "Do you want me to do it for you [Y/n]? " msgstr "您想让我为您这样做么[Y/n]？ " -#: git-bisect.sh:95 +#: git-bisect.sh:121 #, sh-format msgid "unrecognised option: '$arg'" msgstr "未能识别的选项：'$arg'" -#: git-bisect.sh:99 +#: git-bisect.sh:125 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "'$arg' 看起来不像是一个有效的版本" -#: git-bisect.sh:117 +#: git-bisect.sh:154 msgid "Bad HEAD - I need a HEAD" msgstr "坏的 HEAD - 我需要一个 HEAD" -#: git-bisect.sh:130 +#: git-bisect.sh:167 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." -msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。" +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." +msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" -#: git-bisect.sh:140 +#: git-bisect.sh:177 msgid "won't bisect on cg-seek'ed tree" msgstr "不会在做了 cg-seek 的树上做二分查找" -#: git-bisect.sh:144 +#: git-bisect.sh:181 msgid "Bad HEAD - strange symbolic ref" msgstr "坏的 HEAD - 奇怪的符号引用" -#: git-bisect.sh:189 +#: git-bisect.sh:233 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "坏的 bisect_write 参数：$state" -#: git-bisect.sh:218 +#: git-bisect.sh:262 #, sh-format msgid "Bad rev input: $arg" -msgstr "输入坏的版本：$arg" +msgstr "坏的输入版本：$arg" -#: git-bisect.sh:232 -msgid "Please call 'bisect_state' with at least one argument." -msgstr "请在调用 'bisect_state' 时跟至少一个参数。" +#: git-bisect.sh:281 +#, sh-format +msgid "Bad rev input: $bisected_head" +msgstr "坏的输入版本：$bisected_head" -#: git-bisect.sh:244 +#: git-bisect.sh:290 #, sh-format msgid "Bad rev input: $rev" -msgstr "输入坏的版本：$rev" +msgstr "坏的输入版本：$rev" -#: git-bisect.sh:250 -msgid "'git bisect bad' can take only one argument." -msgstr "'git bisect bad' 只能带一个参数。" +#: git-bisect.sh:299 +#, sh-format +msgid "'git bisect $TERM_BAD' can take only one argument." +msgstr "'git bisect $TERM_BAD' 只能带一个参数。" -#: git-bisect.sh:273 -msgid "Warning: bisecting only with a bad commit." -msgstr "警告：在仅有一个坏提交下进行二分查找。" +#: git-bisect.sh:322 +#, sh-format +msgid "Warning: bisecting only with a $TERM_BAD commit." +msgstr "警告：在仅有一个坏（$TERM_BAD）提交下进行二分查找。" # 译者：注意保持句尾空格 #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:279 +#: git-bisect.sh:328 msgid "Are you sure [Y/n]? " msgstr "您确认么[Y/n]？ " -#: git-bisect.sh:289 +#: git-bisect.sh:340 +#, sh-format msgid "" -"You need to give me at least one good and one bad revisions.\n" -"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +"You need to give me at least one $bad_syn and one $good_syn revision.\n" +"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" "您需要给我至少一个好版本和一个坏版本。\n" -"（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）" +"（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）" -#: git-bisect.sh:292 +#: git-bisect.sh:343 +#, sh-format msgid "" "You need to start by \"git bisect start\".\n" -"You then need to give me at least one good and one bad revisions.\n" -"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +"You then need to give me at least one $good_syn and one $bad_syn revision.\n" +"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" "您需要执行 \"git bisect start\" 来开始。\n" "然后需要提供我至少一个好版本和一个坏版本。\n" -"（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）" +"（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）" -#: git-bisect.sh:363 git-bisect.sh:490 +#: git-bisect.sh:414 git-bisect.sh:546 msgid "We are not bisecting." msgstr "我们没有在二分查找。" -#: git-bisect.sh:370 +#: git-bisect.sh:421 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "'$invalid' 不是一个有效的提交" -#: git-bisect.sh:379 +#: git-bisect.sh:430 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" @@ -9988,25 +12490,25 @@ msgstr "" "不能检出原始 HEAD '$branch'。\n" "尝试 'git bisect reset <提交>'。" -#: git-bisect.sh:406 +#: git-bisect.sh:458 msgid "No logfile given" msgstr "未提供日志文件" -#: git-bisect.sh:407 +#: git-bisect.sh:459 #, sh-format msgid "cannot read $file for replaying" msgstr "不能读取 $file 来重放" -#: git-bisect.sh:424 +#: git-bisect.sh:480 msgid "?? what are you talking about?" msgstr "?? 您在说什么?" -#: git-bisect.sh:436 +#: git-bisect.sh:492 #, sh-format msgid "running $command" msgstr "运行 $command" -#: git-bisect.sh:443 +#: git-bisect.sh:499 #, sh-format msgid "" "bisect run failed:\n" @@ -10015,11 +12517,11 @@ msgstr "" "二分查找运行失败：\n" "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" -#: git-bisect.sh:469 +#: git-bisect.sh:525 msgid "bisect run cannot continue any more" msgstr "二分查找不能继续运行" -#: git-bisect.sh:475 +#: git-bisect.sh:531 #, sh-format msgid "" "bisect run failed:\n" @@ -10028,47 +12530,86 @@ msgstr "" "二分查找运行失败：\n" "'bisect_state $state' 退出码为 $res" -#: git-bisect.sh:482 +#: git-bisect.sh:538 msgid "bisect run success" msgstr "二分查找运行成功" -#: git-pull.sh:21 -msgid "" -"Pull is not possible because you have unmerged files.\n" -"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" -"as appropriate to mark resolution, or use 'git commit -a'." -msgstr "" -"Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件，\n" -"然后酌情使用 'git add/rm <file>' 标记解决方案，\n" -"或者使用 'git commit -a'。" +#: git-bisect.sh:565 +msgid "please use two different terms" +msgstr "请使用两个不同的术语" + +#: git-bisect.sh:575 +#, sh-format +msgid "'$term' is not a valid term" +msgstr "'$term' 不是一个有效的名称" -#: git-pull.sh:25 -msgid "Pull is not possible because you have unmerged files." -msgstr "Pull 不可用，因为您尚有未合并的文件。" +#: git-bisect.sh:578 +#, sh-format +msgid "can't use the builtin command '$term' as a term" +msgstr "不能使用内置命令 '$term' 作为术语" + +#: git-bisect.sh:587 git-bisect.sh:593 +#, sh-format +msgid "can't change the meaning of term '$term'" +msgstr "不能修改术语 '$term' 的含义" + +#: git-bisect.sh:606 +#, sh-format +msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." +msgstr "无效的命令：您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。" -#: git-pull.sh:247 -msgid "updating an unborn branch with changes added to the index" -msgstr "更新尚未诞生的分支，变更添加至索引" +#: git-bisect.sh:636 +msgid "no terms defined" +msgstr "未定义术语" -#: git-pull.sh:271 +#: git-bisect.sh:653 #, sh-format msgid "" -"Warning: fetch updated the current branch head.\n" -"Warning: fast-forwarding your working tree from\n" -"Warning: commit $orig_head." +"invalid argument $arg for 'git bisect terms'.\n" +"Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" -"警告：fetch 更新了当前的分支。您的工作区\n" -"警告：从原提交 $orig_head 快进。" +"参数 $arg 对命令 'git bisect terms' 无效。\n" +"支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。" -#: git-pull.sh:296 -msgid "Cannot merge multiple branches into empty head" -msgstr "无法将多个分支合并到空分支" +#: git-merge-octopus.sh:46 +msgid "" +"Error: Your local changes to the following files would be overwritten by " +"merge" +msgstr "错误：您对下列文件的本地修改将被合并操作覆盖" + +#: git-merge-octopus.sh:61 +msgid "Automated merge did not work." +msgstr "自动合并未生效。" -#: git-pull.sh:300 -msgid "Cannot rebase onto multiple branches" -msgstr "无法变基到多个分支" +#: git-merge-octopus.sh:62 +msgid "Should not be doing an Octopus." +msgstr "不应该执行章鱼式合并。" + +#: git-merge-octopus.sh:73 +#, sh-format +msgid "Unable to find common commit with $pretty_name" +msgstr "无法找到和 $pretty_name 的基线提交" -#: git-rebase.sh:57 +#: git-merge-octopus.sh:77 +#, sh-format +msgid "Already up-to-date with $pretty_name" +msgstr "已经和 $pretty_name 保持一致" + +#: git-merge-octopus.sh:89 +#, sh-format +msgid "Fast-forwarding to: $pretty_name" +msgstr "快进至：$pretty_name" + +#: git-merge-octopus.sh:97 +#, sh-format +msgid "Trying simple merge with $pretty_name" +msgstr "尝试和 $pretty_name 的简单合并" + +#: git-merge-octopus.sh:102 +msgid "Simple merge did not work, trying automatic merge." +msgstr "简单合并未生效，尝试自动合并。" + +#: git-rebase.sh:56 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -10079,16 +12620,21 @@ msgstr "" "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n" "要恢复原分支并停止变基，执行 \"git rebase --abort\"。" -#: git-rebase.sh:164 +#: git-rebase.sh:156 git-rebase.sh:395 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "无法移回 $head_name" + +#: git-rebase.sh:167 msgid "Applied autostash." msgstr "成功应用 autostash。" -#: git-rebase.sh:167 +#: git-rebase.sh:170 #, sh-format msgid "Cannot store $stash_sha1" msgstr "无法保存 $stash_sha1" -#: git-rebase.sh:168 +#: git-rebase.sh:171 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -10098,31 +12644,27 @@ msgstr "" "您的修改安全地保存在 stash 中。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: git-rebase.sh:207 +#: git-rebase.sh:210 msgid "The pre-rebase hook refused to rebase." msgstr "钩子 pre-rebase 拒绝变基操作。" -#: git-rebase.sh:212 +#: git-rebase.sh:215 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" -#: git-rebase.sh:350 -msgid "The --exec option must be used with the --interactive option" -msgstr "选项 --exec 必须和选项 --interactive 同时使用" - -#: git-rebase.sh:355 +#: git-rebase.sh:356 msgid "No rebase in progress?" msgstr "没有正在进行的变基？" -#: git-rebase.sh:366 +#: git-rebase.sh:367 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: git-rebase.sh:373 +#: git-rebase.sh:374 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" -#: git-rebase.sh:376 +#: git-rebase.sh:377 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -10130,12 +12672,7 @@ msgstr "" "您必须编辑所有的合并冲突，然后通过 git add\n" "命令将它们标记为已解决" -#: git-rebase.sh:394 -#, sh-format -msgid "Could not move back to $head_name" -msgstr "无法移回 $head_name" - -#: git-rebase.sh:413 +#: git-rebase.sh:414 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -10154,77 +12691,77 @@ msgstr "" "\t$cmd_clear_stale_rebase\n" "然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。" -#: git-rebase.sh:464 +#: git-rebase.sh:465 #, sh-format msgid "invalid upstream $upstream_name" msgstr "无效的上游 $upstream_name" -#: git-rebase.sh:488 +#: git-rebase.sh:489 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 有一个以上的合并基准" -#: git-rebase.sh:491 git-rebase.sh:495 +#: git-rebase.sh:492 git-rebase.sh:496 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 没有合并基准" -#: git-rebase.sh:500 +#: git-rebase.sh:501 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "没有指向一个有效的提交：$onto_name" -#: git-rebase.sh:523 +#: git-rebase.sh:524 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "严重错误：无此分支：$branch_name" -#: git-rebase.sh:556 +#: git-rebase.sh:557 msgid "Cannot autostash" msgstr "无法 autostash" -#: git-rebase.sh:561 +#: git-rebase.sh:562 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "创建了 autostash: $stash_abbrev" -#: git-rebase.sh:565 +#: git-rebase.sh:566 msgid "Please commit or stash them." msgstr "请提交或为它们保存进度。" -#: git-rebase.sh:585 +#: git-rebase.sh:586 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "当前分支 $branch_name 是最新的。" -#: git-rebase.sh:589 +#: git-rebase.sh:590 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "当前分支 $branch_name 是最新的，强制变基。" -#: git-rebase.sh:600 +#: git-rebase.sh:601 #, sh-format msgid "Changes from $mb to $onto:" msgstr "变更从 $mb 到 $onto：" -#: git-rebase.sh:609 +#: git-rebase.sh:610 msgid "First, rewinding head to replay your work on top of it..." -msgstr "首先，重置头指针以便在上面重放您的工作..." +msgstr "首先，回退分支以便在上面重放您的工作..." -#: git-rebase.sh:619 +#: git-rebase.sh:620 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "快进 $branch_name 至 $onto_name。" -#: git-stash.sh:51 +#: git-stash.sh:50 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear 不支持参数" -#: git-stash.sh:74 +#: git-stash.sh:73 msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" -#: git-stash.sh:89 +#: git-stash.sh:88 msgid "Cannot save the current index state" msgstr "无法保存当前索引状态" @@ -10244,7 +12781,7 @@ msgstr "无法删除临时索引（不应发生）" msgid "Cannot record working tree state" msgstr "不能记录工作区状态" -#: git-stash.sh:190 +#: git-stash.sh:188 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "无法用 $w_commit 更新 $ref_stash" @@ -10259,7 +12796,7 @@ msgstr "无法用 $w_commit 更新 $ref_stash" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:237 +#: git-stash.sh:238 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -10268,123 +12805,117 @@ msgstr "" "错误：'stash save' 的未知选项：$option\n" " 要提供一个描述信息，使用 git stash save -- '$option'" -#: git-stash.sh:258 +#: git-stash.sh:259 msgid "No local changes to save" msgstr "没有要保存的本地修改" -#: git-stash.sh:262 +#: git-stash.sh:263 msgid "Cannot initialize stash" msgstr "无法初始化 stash" -#: git-stash.sh:266 +#: git-stash.sh:267 msgid "Cannot save the current status" msgstr "无法保存当前状态" -#: git-stash.sh:284 +#: git-stash.sh:268 +#, sh-format +msgid "Saved working directory and index state $stash_msg" +msgstr "保存工作目录和索引状态 $stash_msg" + +#: git-stash.sh:285 msgid "Cannot remove worktree changes" msgstr "无法删除工作区变更" -#: git-stash.sh:383 +#: git-stash.sh:404 +#, sh-format +msgid "unknown option: $opt" +msgstr "未知选项: $opt" + +#: git-stash.sh:414 msgid "No stash found." msgstr "未发现 stash。" -#: git-stash.sh:390 +#: git-stash.sh:421 #, sh-format msgid "Too many revisions specified: $REV" msgstr "指定了太多的版本：$REV" -#: git-stash.sh:396 +#: git-stash.sh:427 #, sh-format -msgid "$reference is not valid reference" -msgstr "$reference 不是有效的引用" +msgid "$reference is not a valid reference" +msgstr "$reference 不是一个有效的引用" -#: git-stash.sh:424 +#: git-stash.sh:455 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' 不是 stash 样提交" -#: git-stash.sh:435 +#: git-stash.sh:466 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' 不是一个 stash 引用" -#: git-stash.sh:443 +#: git-stash.sh:474 msgid "unable to refresh index" msgstr "无法刷新索引" -#: git-stash.sh:447 +#: git-stash.sh:478 msgid "Cannot apply a stash in the middle of a merge" msgstr "无法在合并过程中恢复进度" -#: git-stash.sh:455 +#: git-stash.sh:486 msgid "Conflicts in index. Try without --index." msgstr "索引中有冲突。尝试不使用 --index。" -#: git-stash.sh:457 +#: git-stash.sh:488 msgid "Could not save index tree" msgstr "不能保存索引树" -#: git-stash.sh:491 +#: git-stash.sh:522 msgid "Cannot unstage modified files" -msgstr "无法还原修改的文件" +msgstr "无法将修改的文件取消暂存" -#: git-stash.sh:506 +#: git-stash.sh:537 msgid "Index was not unstashed." msgstr "索引的进度没有被恢复。" -#: git-stash.sh:529 +#: git-stash.sh:551 +msgid "The stash is kept in case you need it again." +msgstr "暂存被保留以备您再次需要。" + +#: git-stash.sh:560 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" -#: git-stash.sh:530 +#: git-stash.sh:561 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}：不能丢弃进度条目" -#: git-stash.sh:537 +#: git-stash.sh:569 msgid "No branch name specified" msgstr "未指定分支名" -#: git-stash.sh:609 +#: git-stash.sh:641 msgid "(To restore them type \"git stash apply\")" msgstr "（为恢复数据输入 \"git stash apply\"）" -#: git-submodule.sh:95 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "无法从 url '$remoteurl' 剥离一个组件" - -#: git-submodule.sh:237 -#, sh-format -msgid "No submodule mapping found in .gitmodules for path '$sm_path'" -msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射" - -#: git-submodule.sh:287 -#, sh-format -msgid "Clone of '$url' into submodule path '$sm_path' failed" -msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" - -#: git-submodule.sh:299 -#, sh-format -msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" -msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反" - -#: git-submodule.sh:409 +#: git-submodule.sh:183 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "只能在工作区的顶级目录中使用相对路径" -#: git-submodule.sh:419 +#: git-submodule.sh:193 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" -msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始" +msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:436 +#: git-submodule.sh:210 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:440 +#: git-submodule.sh:214 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -10395,574 +12926,662 @@ msgstr "" "$sm_path\n" "如果您确实想添加它，使用 -f 参数。" -#: git-submodule.sh:458 +#: git-submodule.sh:232 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" -msgstr "添加位于 '$sm_path' 的现存版本库到索引" +msgstr "添加位于 '$sm_path' 的现存仓库到索引" -#: git-submodule.sh:460 +#: git-submodule.sh:234 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库" +msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" -#: git-submodule.sh:468 +#: git-submodule.sh:242 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程版本库：" +msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库：" -#: git-submodule.sh:470 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from" -msgstr "如果您想重用此本地 git 目录而不是重新克隆自" - -#: git-submodule.sh:472 -#, sh-format -msgid "" -"use the '--force' option. If the local git directory is not the correct repo" -msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库" - -#: git-submodule.sh:473 +#: git-submodule.sh:244 #, sh-format msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" $realrepo\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" "or you are unsure what this means choose another name with the '--name' " "option." -msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。" +msgstr "" +"如果您想要重用这个本地 git 目录而非重新克隆自\n" +" $realrepo\n" +"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" +"或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。" -#: git-submodule.sh:475 +#: git-submodule.sh:250 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "激活本地 git 目录到子模组 '$sm_name'。" -#: git-submodule.sh:487 +#: git-submodule.sh:262 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:492 +#: git-submodule.sh:267 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:501 +#: git-submodule.sh:276 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:545 -#, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "正在进入 '$prefix$displaypath'" - -#: git-submodule.sh:565 -#, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." -msgstr "停止于 '$prefix$displaypath'，脚本返回非零值。" - -#: git-submodule.sh:611 -#, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url" - -#: git-submodule.sh:620 -#, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "无法为子模组路径 '$displaypath' 注册 url" - -#: git-submodule.sh:622 +#: git-submodule.sh:323 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" +msgid "Entering '$displaypath'" +msgstr "正在进入 '$displaypath'" -#: git-submodule.sh:639 +#: git-submodule.sh:343 #, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "无法为子模组路径 '$displaypath' 注册更新模式" +msgid "Stopping at '$displaypath'; script returned non-zero status." +msgstr "停止于 '$displaypath'；脚本返回非零值。" -#: git-submodule.sh:677 +#: git-submodule.sh:414 #, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化" +msgid "pathspec and --all are incompatible" +msgstr "pathspec 和 --all 不兼容" -#: git-submodule.sh:694 +#: git-submodule.sh:419 #, sh-format -msgid "Submodule work tree '$displaypath' contains a .git directory" -msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'" -#: git-submodule.sh:695 +#: git-submodule.sh:439 #, sh-format msgid "" +"Submodule work tree '$displaypath' contains a .git directory\n" "(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" +msgstr "" +"子模组工作区 '$displaypath' 包含一个 .git 目录\n" +"（如果您真的想删除它及其全部历史，使用 'rm -rf' 命令）" -#: git-submodule.sh:701 +#: git-submodule.sh:447 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们" -#: git-submodule.sh:704 +#: git-submodule.sh:450 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "已清除目录 '$displaypath'" -#: git-submodule.sh:705 +#: git-submodule.sh:451 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "无法移除子模组工作区 '$displaypath'" -#: git-submodule.sh:708 +#: git-submodule.sh:454 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "不能创建空的子模组目录 '$displaypath'" -#: git-submodule.sh:717 +#: git-submodule.sh:463 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" -#: git-submodule.sh:833 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"子模组路径 '$displaypath' 没有初始化\n" -"也许您想用 'update --init'？" - -#: git-submodule.sh:846 +#: git-submodule.sh:612 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" -#: git-submodule.sh:855 +#: git-submodule.sh:622 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:879 +#: git-submodule.sh:627 +#, sh-format +msgid "" +"Unable to find current ${remote_name}/${branch} revision in submodule path " +"'$sm_path'" +msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" + +#: git-submodule.sh:645 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中获取" -#: git-submodule.sh:893 +#: git-submodule.sh:651 +#, sh-format +msgid "" +"Fetched in submodule path '$displaypath', but it did not contain $sha1. " +"Direct fetching of that commit failed." +msgstr "获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。" + +#: git-submodule.sh:658 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" -#: git-submodule.sh:894 +#: git-submodule.sh:659 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "子模组路径 '$displaypath'：检出 '$sha1'" -#: git-submodule.sh:898 +#: git-submodule.sh:663 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" -#: git-submodule.sh:899 +#: git-submodule.sh:664 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模组路径 '$displaypath'：变基至 '$sha1'" -#: git-submodule.sh:904 +#: git-submodule.sh:669 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" -#: git-submodule.sh:905 +#: git-submodule.sh:670 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'" -#: git-submodule.sh:910 +#: git-submodule.sh:675 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" -msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" +msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" -#: git-submodule.sh:911 +#: git-submodule.sh:676 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "子模组 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:941 +#: git-submodule.sh:707 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "无法递归进子模组路径 '$displaypath'" -#: git-submodule.sh:1049 +#: git-submodule.sh:815 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached 不能和选项 --files 同时使用" -#: git-submodule.sh:1097 +#: git-submodule.sh:867 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:1117 +#: git-submodule.sh:887 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 警告：$display_name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:1120 +#: git-submodule.sh:890 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:1123 +#: git-submodule.sh:893 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst" -#: git-submodule.sh:1148 +#: git-submodule.sh:918 msgid "blob" msgstr "数据对象" -#: git-submodule.sh:1262 +#: git-submodule.sh:1040 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "无法递归进子模组路径 '$sm_path'" -#: git-submodule.sh:1326 +#: git-submodule.sh:1107 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "为 '$displaypath' 同步子模组 url" -#~ msgid "key id" -#~ msgstr "key id" +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "详见 git-${cmd}(1)。" -#~ msgid "Tracking not set up: name too long: %s" -#~ msgstr "跟踪未设置：名字太长：%s" +#: git-rebase--interactive.sh:131 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "变基中（$new_count/$total）" -#~ msgid "bug" -#~ msgstr "bug" +#: git-rebase--interactive.sh:147 +msgid "" +"\n" +"Commands:\n" +" p, pick = use commit\n" +" r, reword = use commit, but edit the commit message\n" +" e, edit = use commit, but stop for amending\n" +" s, squash = use commit, but meld into previous commit\n" +" f, fixup = like \"squash\", but discard this commit's log message\n" +" x, exec = run command (the rest of the line) using shell\n" +" d, drop = remove commit\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "" +"\n" +"命令:\n" +" p, pick = 使用提交\n" +" r, reword = 使用提交，但修改提交说明\n" +" e, edit = 使用提交，但停止以便进行提交修补\n" +" s, squash = 使用提交，但和前一个版本融合\n" +" f, fixup = 类似于 \"squash\"，但丢弃提交说明日志\n" +" x, exec = 使用 shell 运行命令（此行剩余部分）\n" +" d, drop = 删除提交\n" +"\n" +"这些行可以被重新排序；它们会被从上至下地执行。\n" +"\n" -# 译者：注意保持句尾空格 -#~ msgid "ahead " -#~ msgstr "领先 " +#: git-rebase--interactive.sh:162 +msgid "" +"\n" +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" +msgstr "\n不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" -# 译者：注意保持句尾空格 -#~ msgid ", behind " -#~ msgstr "，落后 " - -#~ msgid "could not find .gitmodules in index" -#~ msgstr "无法在索引中找到 .gitmodules" - -#~ msgid "reading updated .gitmodules failed" -#~ msgstr "读取更新后的 .gitmodules 失败" - -#~ msgid "unable to stat updated .gitmodules" -#~ msgstr "不能枚举更新后的 .gitmodules" - -#~ msgid "unable to remove .gitmodules from index" -#~ msgstr "不能从索引中移除 .gitmodules" - -#~ msgid "adding updated .gitmodules failed" -#~ msgstr "添加更新后的 .gitmodules 失败" - -# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短 -#~ msgid "" -#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n" -#~ "subdirectory of the tree will change in Git 2.0 and should not be used " -#~ "anymore.\n" -#~ "To add content for the whole tree, run:\n" -#~ "\n" -#~ " git add %s :/\n" -#~ " (or git add %s :/)\n" -#~ "\n" -#~ "To restrict the command to the current directory, run:\n" -#~ "\n" -#~ " git add %s .\n" -#~ " (or git add %s .)\n" -#~ "\n" -#~ "With the current Git version, the command is restricted to the current " -#~ "directory.\n" -#~ msgstr "" -#~ "在 Git 2.0 版本，位于一个子目录下不带任何路径参数地执行命令\n" -#~ "'git add %s (或 %s)' 的行为将被改变，不要再继续使用了。\n" -#~ "如果要添加整个目录树的内容，执行：\n" -#~ "\n" -#~ " git add %s :/\n" -#~ " (或 git add %s :/)\n" -#~ "\n" -#~ "如果要限制该命令只作用于当前目录，执行：\n" -#~ "\n" -#~ " git add %s .\n" -#~ " (或 git add %s .)\n" -#~ "\n" -#~ "对于当前版本的 Git，这条命令只作用于当前目录。\n" - -#~ msgid "" -#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" -#~ "whose behaviour will change in Git 2.0 with respect to paths you " -#~ "removed.\n" -#~ "Paths like '%s' that are\n" -#~ "removed from your working tree are ignored with this version of Git.\n" -#~ "\n" -#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n" -#~ " ignores paths you removed from your working tree.\n" -#~ "\n" -#~ "* 'git add --all <pathspec>' will let you also record the removals.\n" -#~ "\n" -#~ "Run 'git status' to check the paths you removed from your working tree.\n" -#~ msgstr "" -#~ "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal'，\n" -#~ "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n" -#~ "像本地工作区移除的路径 '%s'\n" -#~ "在此版本的 Git 中被忽略。\n" -#~ "\n" -#~ "* 'git add --ignore-removal <路径规则>'，是当前版本的默认操作，\n" -#~ " 忽略您本地工作区中移除的文件。\n" -#~ "\n" -#~ "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n" -#~ "\n" -#~ "运行 'git status' 来检查您本地工作区中移除的路径。\n" - -#~ msgid "" -#~ "Auto packing the repository for optimum performance. You may also\n" -#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n" -#~ msgstr "" -#~ "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n" -#~ "参见 \"git help gc\" 以获取更多信息。\n" - -#~ msgid "" -#~ "Updates were rejected because a pushed branch tip is behind its remote\n" -#~ "counterpart. If you did not intend to push that branch, you may want to\n" -#~ "specify branches to push or set the 'push.default' configuration " -#~ "variable\n" -#~ "to 'simple', 'current' or 'upstream' to push only the current branch." -#~ msgstr "" -#~ "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n" -#~ "如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n" -#~ "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n" -#~ "以便只推送当前分支。" +#: git-rebase--interactive.sh:166 +msgid "" +"\n" +"If you remove a line here THAT COMMIT WILL BE LOST.\n" +msgstr "\n如果您在这里删除一行，对应的提交将会丢失。\n" -# 译者：为保证在输出中对齐，注意调整句中空格！ -#~ msgid "copied: %s -> %s" -#~ msgstr "拷贝： %s -> %s" +#: git-rebase--interactive.sh:202 +#, sh-format +msgid "" +"You can amend the commit now, with\n" +"\n" +"\tgit commit --amend $gpg_sign_opt_quoted\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +"\tgit rebase --continue" +msgstr "" +"您现在可以修补这个提交，使用\n" +"\n" +"\tgit commit --amend $gpg_sign_opt_quoted\n" +"\n" +"当您对变更感到满意，执行\n" +"\n" +"\tgit rebase --continue" -# 译者：为保证在输出中对齐，注意调整句中空格！ -#~ msgid "deleted: %s" -#~ msgstr "删除： %s" +#: git-rebase--interactive.sh:227 +#, sh-format +msgid "$sha1: not a commit that can be picked" +msgstr "$sha1：不是一个可以被拣选的提交" -# 译者：为保证在输出中对齐，注意调整句中空格！ -#~ msgid "modified: %s" -#~ msgstr "修改： %s" +#: git-rebase--interactive.sh:266 +#, sh-format +msgid "Invalid commit name: $sha1" +msgstr "无效的提交名：$sha1" -# 译者：为保证在输出中对齐，注意调整句中空格！ -#~ msgid "renamed: %s -> %s" -#~ msgstr "重命名： %s -> %s" +#: git-rebase--interactive.sh:308 +msgid "Cannot write current commit's replacement sha1" +msgstr "不能写入当前提交的替代 sha1" -# 译者：为保证在输出中对齐，注意调整句中空格！ -#~ msgid "unmerged: %s" -#~ msgstr "未合并： %s" - -# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短 -#~ msgid "" -#~ "push.default is unset; its implicit value is changing in\n" -#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" -#~ "and maintain the current behavior after the default changes, use:\n" -#~ "\n" -#~ " git config --global push.default matching\n" -#~ "\n" -#~ "To squelch this message and adopt the new behavior now, use:\n" -#~ "\n" -#~ " git config --global push.default simple\n" -#~ "\n" -#~ "See 'git help config' and search for 'push.default' for further " -#~ "information.\n" -#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" -#~ "'current' instead of 'simple' if you sometimes use older versions of Git)" -#~ msgstr "" -#~ "push.default 未设置，它的默认值将在 Git 2.0 由 'matching'\n" -#~ "改变为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n" -#~ "\n" -#~ " git config --global push.default matching\n" -#~ "\n" -#~ "若要不再显示本信息并从现在开始采用新的使用习惯，设置：\n" -#~ "\n" -#~ " git config --global push.default simple\n" -#~ "\n" -#~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n" -#~ "（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n" -#~ "为保持兼容，请用 'current' 代替 'simple'）" - -#~ msgid "input paths are terminated by a null character" -#~ msgstr "输入路径以null字符终止" - -#~ msgid "" -#~ "The following untracked files would NOT be saved but need to be removed " -#~ "by stash save:" -#~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除：" - -#~ msgid "" -#~ "Aborting. Consider using either the --force or --include-untracked option." -#~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。" - -#~ msgid "" -#~ "the following submodule (or one of its nested submodule)\n" -#~ "uses a .git directory:" -#~ msgid_plural "" -#~ "the following submodules (or one of its nested submodule)\n" -#~ "use a .git directory:" -#~ msgstr[0] "如下子模组（或一个其嵌套的子模组）使用了一个 .git 目录：" -#~ msgstr[1] "如下子模组（或一个其嵌套的子模组）使用了一个 .git 目录：" +#: git-rebase--interactive.sh:360 +#, sh-format +msgid "Fast-forward to $sha1" +msgstr "快进到 $sha1" -# 译者：注意保持前导空格 -#~ msgid " (fix conflicts and then run \"git am --resolved\")" -#~ msgstr " （解决冲突，然后运行 \"git am --resolved\"）" +#: git-rebase--interactive.sh:362 +#, sh-format +msgid "Cannot fast-forward to $sha1" +msgstr "不能快进到 $sha1" -# 译者：注意保持前导空格 -#~ msgid " (all conflicts fixed: run \"git commit\")" -#~ msgstr " （解决所有冲突后，执行 \"git commit\"）" +#: git-rebase--interactive.sh:371 +#, sh-format +msgid "Cannot move HEAD to $first_parent" +msgstr "不能移动 HEAD 到 $first_parent" + +#: git-rebase--interactive.sh:376 +#, sh-format +msgid "Refusing to squash a merge: $sha1" +msgstr "拒绝压缩一个合并：$sha1" + +#: git-rebase--interactive.sh:390 +#, sh-format +msgid "Error redoing merge $sha1" +msgstr "无法重做合并 $sha1" + +#: git-rebase--interactive.sh:398 +#, sh-format +msgid "Could not pick $sha1" +msgstr "不能拣选 $sha1" + +#: git-rebase--interactive.sh:407 +#, sh-format +msgid "This is the commit message #${n}:" +msgstr "这是提交说明 #${n}：" + +#: git-rebase--interactive.sh:412 +#, sh-format +msgid "The commit message #${n} will be skipped:" +msgstr "提交说明 #${n} 将被跳过：" + +#: git-rebase--interactive.sh:423 +#, sh-format +msgid "This is a combination of $count commit." +msgid_plural "This is a combination of $count commits." +msgstr[0] "这是一个 $count 个提交的组合。" +msgstr[1] "这是一个 $count 个提交的组合。" + +#: git-rebase--interactive.sh:431 +#, sh-format +msgid "Cannot write $fixup_msg" +msgstr "不能写入 $fixup_msg" + +#: git-rebase--interactive.sh:434 +msgid "This is a combination of 2 commits." +msgstr "这是一个 2 个提交的组合。" + +#: git-rebase--interactive.sh:435 +msgid "This is the 1st commit message:" +msgstr "这是第一个提交说明：" + +#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518 +#: git-rebase--interactive.sh:521 +#, sh-format +msgid "Could not apply $sha1... $rest" +msgstr "不能应用 $sha1... $rest" -#~ msgid "more than %d trees given: '%s'" -#~ msgstr "提供了超过 %d 个树对象：'%s'" +#: git-rebase--interactive.sh:549 +#, sh-format +msgid "" +"Could not amend commit after successfully picking $sha1... $rest\n" +"This is most likely due to an empty commit message, or the pre-commit hook\n" +"failed. If the pre-commit hook failed, you may need to resolve the issue " +"before\n" +"you are able to reword the commit." +msgstr "" +"不能在成功拣选 $sha1... $rest 之后修补提交\n" +"这通常是因为空的提交说明，或者 pre-commit 钩子执行失败。如果是 pre-commit\n" +"钩子执行失败，你可能需要在重写提交说明前解决这个问题。" -#~ msgid "You cannot combine --no-ff with --ff-only." -#~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。" +#: git-rebase--interactive.sh:564 +#, sh-format +msgid "Stopped at $sha1_abbrev... $rest" +msgstr "停止在 $sha1_abbrev... $rest" -#~ msgid "" -#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n" -#~ "(use 'rm -rf' if you really want to remove it including all of its " -#~ "history)" -#~ msgstr "" -#~ "子模组 '%s'（或者它的一个嵌套子模组）使用一个 .git 目录\n" -#~ "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" +#: git-rebase--interactive.sh:579 +#, sh-format +msgid "Cannot '$squash_style' without a previous commit" +msgstr "没有父提交的情况下不能 '$squash_style'" -#~ msgid "" -#~ "'%s' has changes staged in the index\n" -#~ "(use --cached to keep the file, or -f to force removal)" -#~ msgstr "" -#~ "'%s' 有变更已暂存至索引中\n" -#~ "（使用 --cached 保存文件，或用 -f 强制删除）" +#: git-rebase--interactive.sh:621 +#, sh-format +msgid "Executing: $rest" +msgstr "执行：$rest" -#~ msgid "show commits where no parent comes before its children" -#~ msgstr "显示提交时以时间为序且父提交不能领先子提交" +#: git-rebase--interactive.sh:629 +#, sh-format +msgid "Execution failed: $rest" +msgstr "执行失败：$rest" -#~ msgid "show the HEAD reference" -#~ msgstr "显示 HEAD 引用" +#: git-rebase--interactive.sh:631 +msgid "and made changes to the index and/or the working tree" +msgstr "并且修改索引和/或工作区" -#~ msgid "Submodule '$name' ($url) registered for path '$sm_path'" -#~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册" +# 译者：注意保持前导空格 +#: git-rebase--interactive.sh:633 +msgid "" +"You can fix the problem, and then run\n" +"\n" +"\tgit rebase --continue" +msgstr "" +"您可以解决这个问题，然后运行\n" +"\n" +"\tgit rebase --continue" -#~ msgid "Change flags" -#~ msgstr "修改参数" +#. TRANSLATORS: after these lines is a command to be issued by the user +#: git-rebase--interactive.sh:646 +#, sh-format +msgid "" +"Execution succeeded: $rest\n" +"but left changes to the index and/or the working tree\n" +"Commit or stash your changes, and then run\n" +"\n" +"\tgit rebase --continue" +msgstr "" +"执行成功：$rest\n" +"但是在索引和/或工作区中存在变更。提交或暂存修改，然后运行\n" +"\n" +"\tgit rebase --continue" -#~ msgid "" -#~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean." -#~ msgstr "注意：没有要清理的文件；尝试按 \"t\" 切换 git-clean 的选项。" +#: git-rebase--interactive.sh:657 +#, sh-format +msgid "Unknown command: $command $sha1 $rest" +msgstr "未知命令：$command $sha1 $rest" -#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'" -#~ msgstr "无法递归进子模组路径 '$prefix$sm_path'" +#: git-rebase--interactive.sh:658 +msgid "Please fix this using 'git rebase --edit-todo'." +msgstr "要修改请使用命令 'git rebase --edit-todo'。" -#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" -#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]" +#: git-rebase--interactive.sh:693 +#, sh-format +msgid "Successfully rebased and updated $head_name." +msgstr "成功变基并更新 $head_name。" -#~ msgid "See 'git help <command>' for more information on a specific command." -#~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。" +#: git-rebase--interactive.sh:740 +msgid "Could not skip unnecessary pick commands" +msgstr "不能跳过不必要的拣选命令" -#~ msgid "BUG: impossible combination of %d and %p" -#~ msgstr "BUG: 无法组合 %d 和 %p" +#: git-rebase--interactive.sh:898 +#, sh-format +msgid "" +"Warning: the SHA-1 is missing or isn't a commit in the following line:\n" +" - $line" +msgstr "" +"警告：缺失 SHA-1 或者在下面一行中不是一个提交：\n" +" - $line" + +#: git-rebase--interactive.sh:931 +#, sh-format +msgid "" +"Warning: the command isn't recognized in the following line:\n" +" - $line" +msgstr "" +"警告：下面一行中的命令未能被识别：\n" +" - $line" + +#: git-rebase--interactive.sh:970 +msgid "could not detach HEAD" +msgstr "不能检出为分离头指针" + +#: git-rebase--interactive.sh:1008 +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):" +msgstr "警告：一些提交可能被意外丢弃。丢弃的提交（从新到旧）：" + +#: git-rebase--interactive.sh:1016 +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error." +msgstr "" +"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n" +"\n" +"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" +"可选值有：ignore、warn、error。" -# 译者：以下三条实际为一个段落 -#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'" -#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'" +#: git-rebase--interactive.sh:1027 +#, sh-format +msgid "" +"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " +"Ignoring." +msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。" -# 译者：为对齐，下面两句内容有调整 -#~ msgid "may speed it up, but you have to be careful not to forget to add" -#~ msgstr "也许能提高速度，但您需要小心不要忘了添加新文件" +#: git-rebase--interactive.sh:1044 +msgid "You can fix this with 'git rebase --edit-todo'." +msgstr "您可以使用 'git rebase --edit-todo' 命令修改。" -#~ msgid "new files yourself (see 'git help status')." -#~ msgstr "（参见 'git help status'）。" +#: git-rebase--interactive.sh:1045 +msgid "Or you can abort the rebase with 'git rebase --abort'." +msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。" -#~ msgid "use any ref in .git/refs" -#~ msgstr "使用 .git/refs 里的任意引用" +#: git-rebase--interactive.sh:1069 +msgid "Could not remove CHERRY_PICK_HEAD" +msgstr "不能删除 CHERRY_PICK_HEAD" -#~ msgid "use any tag in .git/refs/tags" -#~ msgstr "使用 .git/refs/tags 里的任意 tag" +#: git-rebase--interactive.sh:1074 +#, sh-format +msgid "" +"You have staged changes in your working tree.\n" +"If these changes are meant to be\n" +"squashed into the previous commit, run:\n" +"\n" +" git commit --amend $gpg_sign_opt_quoted\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit $gpg_sign_opt_quoted\n" +"\n" +"In both case, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" +msgstr "" +"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交，执行：\n" +"\n" +" git commit --amend $gpg_sign_opt_quoted\n" +"\n" +"如果这些变更要形成一个新提交，执行：\n" +"\n" +" git commit $gpg_sign_opt_quoted\n" +"\n" +"无论哪种情况，当您完成提交，继续执行：\n" +"\n" +" git rebase --continue\n" -#~ msgid "bad object %s" -#~ msgstr "坏对象 %s" +#: git-rebase--interactive.sh:1091 +msgid "Error trying to find the author identity to amend commit" +msgstr "在修补提交中查找作者信息时遇到错误" -#~ msgid "bogus committer info %s" -#~ msgstr "虚假的提交者信息 %s" +#: git-rebase--interactive.sh:1096 +msgid "" +"You have uncommitted changes in your working tree. Please commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" -#~ msgid "can't fdopen 'show' output fd" -#~ msgstr "不能打开 'show' 输出文件句柄" +#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105 +msgid "Could not commit staged changes." +msgstr "不能提交暂存的修改。" -#~ msgid "failed to close pipe to 'show' for object '%s'" -#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道" +#: git-rebase--interactive.sh:1129 +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "" +"\n" +"您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基，\n" +"请执行：\n" +" git rebase --continue\n" +"\n" -#~ msgid " 0 files changed" -#~ msgstr " 0 个文件被修改" +#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298 +msgid "Could not execute editor" +msgstr "无法运行编辑器" -#~ msgid " %d file changed" -#~ msgid_plural " %d files changed" -#~ msgstr[0] " %d 个文件被修改" -#~ msgstr[1] " %d 个文件被修改" +#: git-rebase--interactive.sh:1145 +msgid "You need to set your committer info first" +msgstr "您需要先设置您的提交者信息" -#~ msgid ", %d insertion(+)" -#~ msgid_plural ", %d insertions(+)" -#~ msgstr[0] "，插入 %d 行(+)" -#~ msgstr[1] "，插入 %d 行(+)" +#: git-rebase--interactive.sh:1153 +#, sh-format +msgid "Could not checkout $switch_to" +msgstr "不能检出 $switch_to" -#~ msgid ", %d deletion(-)" -#~ msgid_plural ", %d deletions(-)" -#~ msgstr[0] "，删除 %d 行(-)" -#~ msgstr[1] "，删除 %d 行(-)" +#: git-rebase--interactive.sh:1158 +msgid "No HEAD?" +msgstr "没有 HEAD？" -#~ msgid "You do not have a valid HEAD" -#~ msgstr "您没有一个有效的 HEAD" +#: git-rebase--interactive.sh:1159 +#, sh-format +msgid "Could not create temporary $state_dir" +msgstr "不能创建临时 $state_dir" -#~ msgid "oops" -#~ msgstr "哎哟" +#: git-rebase--interactive.sh:1161 +msgid "Could not mark as interactive" +msgstr "不能标记为交互式" -#~ msgid "Would not remove %s\n" -#~ msgstr "不会删除 %s\n" +#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176 +msgid "Could not init rewritten commits" +msgstr "不能对重写提交进行初始化" -#~ msgid "Not removing %s\n" -#~ msgstr "未删除 %s\n" +#: git-rebase--interactive.sh:1276 +#, sh-format +msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）" +msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）" -#~ msgid "git remote set-head <name> (-a | -d | <branch>])" -#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])" +#: git-rebase--interactive.sh:1281 +msgid "" +"\n" +"However, if you remove everything, the rebase will be aborted.\n" +"\n" +msgstr "\n然而，如果您删除全部内容，变基操作将会终止。\n\n" -#~ msgid "Could not read index" -#~ msgstr "不能读取索引" +#: git-rebase--interactive.sh:1288 +msgid "Note that empty commits are commented out" +msgstr "注意空提交已被注释掉" -# 译者：中文字符串拼接，可删除前导空格 -#~ msgid " (use \"git add\" to track)" -#~ msgstr "（使用 \"git add\" 建立跟踪）" +#: git-sh-setup.sh:89 git-sh-setup.sh:94 +#, sh-format +msgid "usage: $dashless $USAGE" +msgstr "用法：$dashless $USAGE" -#~ msgid "--detach cannot be used with -b/-B/--orphan" -#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用" +#: git-sh-setup.sh:190 +#, sh-format +msgid "Cannot chdir to $cdup, the toplevel of the working tree" +msgstr "不能切换目录到 $cdup，工作区的顶级目录" -#~ msgid "--detach cannot be used with -t" -#~ msgstr "--detach 不能和 -t 同时使用" +#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#, sh-format +msgid "fatal: $program_name cannot be used without a working tree." +msgstr "严重错误：$program_name 不能在没有工作区的情况下使用" -#~ msgid "--orphan and -b|-B are mutually exclusive" -#~ msgstr "--orphan 和 -b|-B 互斥" +#: git-sh-setup.sh:220 +msgid "Cannot rebase: You have unstaged changes." +msgstr "不能变基：您有未暂存的变更。" -#~ msgid "--orphan cannot be used with -t" -#~ msgstr "--orphan 不能和 -t 同时使用" +#: git-sh-setup.sh:223 +msgid "Cannot rewrite branches: You have unstaged changes." +msgstr "不能重写分支：您有未暂存的变更。" -#~ msgid "git checkout: -f and -m are incompatible" -#~ msgstr "git checkout：-f 和 -m 不兼容" +#: git-sh-setup.sh:229 +#, sh-format +msgid "Cannot $action: You have unstaged changes." +msgstr "不能 $action：您有未暂存的变更。" -#~ msgid "" -#~ "git checkout: updating paths is incompatible with switching branches." -#~ msgstr "git checkout：更新路径和切换分支不兼容。" +#: git-sh-setup.sh:242 +msgid "Cannot rebase: Your index contains uncommitted changes." +msgstr "不能变基：您的索引中包含未提交的变更。" -#~ msgid "diff setup failed" -#~ msgstr "diff 设置失败" +#: git-sh-setup.sh:248 +#, sh-format +msgid "Cannot $action: Your index contains uncommitted changes." +msgstr "不能 $action：您的索引中包含未提交的变更。" -#~ msgid "merge-recursive: disk full?" -#~ msgstr "merge-recursive：磁盘已满？" +#: git-sh-setup.sh:372 +msgid "You need to run this command from the toplevel of the working tree." +msgstr "您需要在工作区的顶级目录中运行这个命令。" -#~ msgid "diff_setup_done failed" -#~ msgstr "diff_setup_done 失败" +#: git-sh-setup.sh:377 +msgid "Unable to determine absolute path of git directory" +msgstr "不能确定 git 目录的绝对路径" |