diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 7028 |
1 files changed, 5824 insertions, 1204 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index b46b53e6d6..ba757d9afd 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,6 +1,6 @@ # Chinese translations for Git package # Git 软件包的简体中文翻译. -# Copyright (C) 2012 Jiang Xin <worldhello.net AT gmail.com> +# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> # This file is distributed under the same license as the Git package. # Contributers: # - Jiang Xin <worldhello.net AT gmail.com> @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-06-08 10:20+0800\n" -"PO-Revision-Date: 2012-06-08 12:24+0800\n" +"POT-Creation-Date: 2013-04-30 08:25+0800\n" +"PO-Revision-Date: 2013-04-12 09:23+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language: zh_CN\n" @@ -22,7 +22,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:40 +#: advice.c:53 #, c-format msgid "hint: %.*s\n" msgstr "提示：%.*s\n" @@ -31,7 +31,7 @@ msgstr "提示：%.*s\n" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:70 +#: advice.c:83 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -42,6 +42,220 @@ msgstr "" "'git add/rm <file>' 标记解决方案，\n" "或使用 'git commit -a'。" +#: archive.c:10 +msgid "git archive [options] <tree-ish> [<path>...]" +msgstr "git archive [选项] <树或提交> [<路径>...]" + +#: archive.c:11 +msgid "git archive --list" +msgstr "git archive --list" + +#: archive.c:12 +msgid "" +"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +msgstr "" +"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]" + +#: archive.c:13 +msgid "git archive --remote <repo> [--exec <cmd>] --list" +msgstr "git archive --remote <版本库> [--exec <命令>] --list" + +#: archive.c:323 +msgid "fmt" +msgstr "格式" + +#: archive.c:323 +msgid "archive format" +msgstr "归档格式" + +#: archive.c:324 builtin/log.c:1126 +msgid "prefix" +msgstr "前缀" + +#: archive.c:325 +msgid "prepend prefix to each pathname in the archive" +msgstr "为归档中每个路径名加上前缀" + +#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371 +#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665 +#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536 +#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 +msgid "file" +msgstr "文件" + +#: archive.c:327 builtin/archive.c:89 +msgid "write the archive to this file" +msgstr "归档写入此文件" + +#: archive.c:329 +msgid "read .gitattributes in working directory" +msgstr "读取工作区中的 .gitattributes" + +#: archive.c:330 +msgid "report archived files on stderr" +msgstr "在标准错误上报告归档文件" + +#: archive.c:331 +msgid "store only" +msgstr "只存储" + +#: archive.c:332 +msgid "compress faster" +msgstr "压缩速度更快" + +#: archive.c:340 +msgid "compress better" +msgstr "压缩效果更好" + +#: archive.c:343 +msgid "list supported archive formats" +msgstr "列出支持的归档格式" + +#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86 +msgid "repo" +msgstr "版本库" + +#: archive.c:346 builtin/archive.c:91 +msgid "retrieve the archive from remote repository <repo>" +msgstr "从远程版本库（<版本库>）提取归档文件" + +#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615 +msgid "command" +msgstr "命令" + +#: archive.c:348 builtin/archive.c:93 +msgid "path to the remote git-upload-archive command" +msgstr "远程 git-upload-archive 命令的路径" + +#: attr.c:259 +msgid "" +"Negative patterns are ignored in git attributes\n" +"Use '\\!' for literal leading exclamation." +msgstr "" +"负值模版在 git attributes 中被忽略\n" +"当字符串确实要以感叹号开始时，使用 '\\!'。" + +#: branch.c:60 +#, c-format +msgid "Not setting branch %s as its own upstream." +msgstr "未设置分支 %s 作为它自己的上游。" + +#: branch.c:82 +#, 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:83 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s." +msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。" + +#: branch.c:87 +#, c-format +msgid "Branch %s set up to track local branch %s by rebasing." +msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。" + +#: branch.c:88 +#, c-format +msgid "Branch %s set up to track local branch %s." +msgstr "分支 %s 设置为跟踪本地分支 %s。" + +#: branch.c:92 +#, c-format +msgid "Branch %s set up to track remote ref %s by rebasing." +msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。" + +#: branch.c:93 +#, c-format +msgid "Branch %s set up to track remote ref %s." +msgstr "分支 %s 设置为跟踪远程引用 %s。" + +#: branch.c:97 +#, c-format +msgid "Branch %s set up to track local ref %s by rebasing." +msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。" + +#: branch.c:98 +#, c-format +msgid "Branch %s set up to track local ref %s." +msgstr "分支 %s 设置为跟踪本地引用 %s。" + +#: branch.c:118 +#, c-format +msgid "Tracking not set up: name too long: %s" +msgstr "跟踪未设置：名字太长：%s" + +#: branch.c:137 +#, c-format +msgid "Not tracking: ambiguous information for ref %s" +msgstr "未跟踪：引用 %s 有歧义" + +#: branch.c:182 +#, c-format +msgid "'%s' is not a valid branch name." +msgstr "'%s' 不是一个有效的分支名称。" + +#: branch.c:187 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "一个分支名 '%s' 已经存在。" + +#: branch.c:195 +msgid "Cannot force update the current branch." +msgstr "无法强制更新当前分支。" + +#: branch.c:201 +#, c-format +msgid "Cannot setup tracking information; starting point '%s' is not a branch." +msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。" + +#: branch.c:203 +#, c-format +msgid "the requested upstream branch '%s' does not exist" +msgstr "请求的上游分支 '%s' 不存在" + +#: branch.c:205 +msgid "" +"\n" +"If you are planning on basing your work on an upstream\n" +"branch that already exists at the remote, you may need to\n" +"run \"git fetch\" to retrieve it.\n" +"\n" +"If you are planning to push out a new local branch that\n" +"will track its remote counterpart, you may want to use\n" +"\"git push -u\" to set the upstream config as you push." +msgstr "" +"\n" +"如果您正计划基于远程一个现存的上游分支开始你的工作，\n" +"您可能需要执行 \"git fetch\" 来获取分支。\n" +"\n" +"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n" +"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" + +#: branch.c:250 +#, c-format +msgid "Not a valid object name: '%s'." +msgstr "不是一个有效的对象名：'%s'。" + +#: branch.c:270 +#, c-format +msgid "Ambiguous object name: '%s'." +msgstr "歧义的对象名：'%s'。" + +#: branch.c:275 +#, c-format +msgid "Not a valid branch point: '%s'." +msgstr "无效的分支点：'%s'。" + +#: branch.c:281 +msgid "Failed to lock ref for update" +msgstr "无法为更新锁定引用" + +#: branch.c:299 +msgid "Failed to write ref" +msgstr "不能写引用" + #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -52,7 +266,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:89 builtin/commit.c:696 +#: bundle.c:89 builtin/commit.c:676 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" @@ -61,67 +275,71 @@ msgstr "不能打开 '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的提交：" -#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289 -#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347 -#: builtin/shortlog.c:181 +#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300 +#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349 +#: builtin/shortlog.c:155 msgid "revision walk setup failed" msgstr "版本遍历设置失败" #: bundle.c:186 #, c-format -msgid "The bundle contains %d ref" -msgid_plural "The bundle contains %d refs" -msgstr[0] "这个包中含有 %d 个引用" -msgstr[1] "这个包中含有 %d 个引用" +msgid "The bundle contains this ref:" +msgid_plural "The bundle contains these %d refs:" +msgstr[0] "这个包中含有这个引用：" +msgstr[1] "这个包中含有 %d 个引用：" + +#: bundle.c:193 +msgid "The bundle records a complete history." +msgstr "这个包记录一个完整历史。" -#: bundle.c:192 +#: bundle.c:195 #, c-format -msgid "The bundle requires this ref" -msgid_plural "The bundle requires these %d refs" -msgstr[0] "这个包需要这个引用" -msgstr[1] "这个包需要 %d 个这些引用" +msgid "The bundle requires this ref:" +msgid_plural "The bundle requires these %d refs:" +msgstr[0] "这个包需要这个引用：" +msgstr[1] "这个包需要 %d 个引用：" -#: bundle.c:290 +#: bundle.c:294 msgid "rev-list died" msgstr "rev-list 终止" -#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" -#: bundle.c:331 +#: bundle.c:335 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:376 +#: bundle.c:380 msgid "Refusing to create empty bundle." msgstr "不能创建空包。" -#: bundle.c:394 +#: bundle.c:398 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 进程" -#: bundle.c:412 +#: bundle.c:416 msgid "pack-objects died" msgstr "pack-objects 终止" -#: bundle.c:415 +#: bundle.c:419 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" -#: bundle.c:437 +#: bundle.c:441 msgid "index-pack died" msgstr "index-pack 终止" -#: commit.c:48 +#: commit.c:50 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" -#: commit.c:50 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s 不是一个提交!" @@ -212,19 +430,24 @@ msgstr[0] "%lu 年前" msgstr[1] "%lu 年前" # 译者：注意保持前导空格 -#: diff.c:105 +#: diff.c:112 #, c-format -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" -msgstr " 无法解析 dirstat 阈值 '%.*s'\n" +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n" # 译者：注意保持前导空格 -#: diff.c:110 +#: diff.c:117 #, c-format -msgid " Unknown dirstat parameter '%.*s'\n" -msgstr " 未知 dirstat 参数 '%.*s'\n" +msgid " Unknown dirstat parameter '%s'\n" +msgstr " 未知的 dirstat 参数 '%s'\n" #: diff.c:210 #, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" + +#: diff.c:260 +#, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" @@ -232,32 +455,7 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:1400 -msgid " 0 files changed\n" -msgstr " 0 个文件被修改\n" - -#: diff.c:1404 -#, c-format -msgid " %d file changed" -msgid_plural " %d files changed" -msgstr[0] " %d 个文件被修改" -msgstr[1] " %d 个文件被修改" - -#: diff.c:1421 -#, c-format -msgid ", %d insertion(+)" -msgid_plural ", %d insertions(+)" -msgstr[0] "，插入 %d 行(+)" -msgstr[1] "，插入 %d 行(+)" - -#: diff.c:1432 -#, c-format -msgid ", %d deletion(-)" -msgid_plural ", %d deletions(-)" -msgstr[0] "，删除 %d 行(-)" -msgstr[1] "，删除 %d 行(-)" - -#: diff.c:3478 +#: diff.c:3481 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -266,7 +464,12 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: gpg-interface.c:59 +#: diff.c:3495 +#, 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。" @@ -278,31 +481,45 @@ msgstr "gpg 没有接受数据" msgid "gpg failed to sign the data" msgstr "gpg 无法为数据签名" -#: grep.c:1320 +#: gpg-interface.c:115 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "不能创建临时文件 '%s'：%s" + +#: gpg-interface.c:118 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "无法将分离式签名写入 '%s'：%s" + +#: grep.c:1623 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1337 +#: grep.c:1640 #, c-format msgid "'%s': %s" msgstr "'%s'：%s" -#: grep.c:1348 +#: grep.c:1651 #, c-format msgid "'%s': short read %s" msgstr "'%s'：读取不完整 %s" -#: help.c:207 +#: help.c:212 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" -#: help.c:214 +#: help.c:219 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" -#: help.c:270 +#: help.c:235 +msgid "The most commonly used git commands are:" +msgstr "最常用的 git 命令有：" + +#: help.c:292 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -311,11 +528,11 @@ msgstr "" "'%s' 像是一个 git 命令，但却无法运行。\n" "可能是 git-%s 受损？" -#: help.c:327 +#: help.c:349 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" -#: help.c:349 +#: help.c:371 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -324,17 +541,17 @@ msgstr "" "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" "是 '%s'" -#: help.c:354 +#: help.c:376 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟后自动运行..." -#: help.c:361 +#: help.c:383 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:365 +#: help.c:387 msgid "" "\n" "Did you mean this?" @@ -346,38 +563,324 @@ msgstr[0] "" "您指的是这个么？" msgstr[1] "" "\n" -"您指的是这些其中一个么？" +"您指的是这其中的某一个么？" + +#: merge.c:56 +msgid "failed to read the cache" +msgstr "无法读取缓存" + +#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566 +#: builtin/clone.c:645 +msgid "unable to write new index file" +msgstr "无法写新的索引文件" + +#: merge-recursive.c:190 +#, c-format +msgid "(bad commit)\n" +msgstr "（坏提交）\n" -#: parse-options.c:493 +#: merge-recursive.c:206 +#, c-format +msgid "addinfo_cache failed for path '%s'" +msgstr "为路径 '%s' addinfo_cache 失败" + +#: merge-recursive.c:268 +msgid "error building trees" +msgstr "无法创建树" + +#: merge-recursive.c:672 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "无法创建路径 '%s'%s" + +#: merge-recursive.c:683 +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "删除 %s 以便为子目录留出空间\n" + +#. something else exists +#. .. but not some other error (who really cares what?) +#: merge-recursive.c:697 merge-recursive.c:718 +msgid ": perhaps a D/F conflict?" +msgstr "：可能是一个目录/文件冲突？" + +#: merge-recursive.c:708 +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "拒绝丢弃 '%s' 中的未跟踪文件" + +#: merge-recursive.c:748 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "不能读取对象 %s '%s'" + +#: merge-recursive.c:750 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "%s '%s' 应为数据（blob）对象" + +#: merge-recursive.c:773 builtin/clone.c:313 +#, c-format +msgid "failed to open '%s'" +msgstr "无法打开 '%s'" + +#: merge-recursive.c:781 +#, c-format +msgid "failed to symlink '%s'" +msgstr "无法创建符号链接 '%s'" + +#: merge-recursive.c:784 +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "不知道如何处理 %06o %s '%s'" + +#: merge-recursive.c:922 +msgid "Failed to execute internal merge" +msgstr "无法执行内部合并" + +#: merge-recursive.c:926 +#, c-format +msgid "Unable to add %s to database" +msgstr "不能添加 %s 至对象库" + +#: merge-recursive.c:942 +msgid "unsupported object type in the tree" +msgstr "在树中有不支持的对象类型" + +#: merge-recursive.c:1021 merge-recursive.c:1035 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." +msgstr "" +"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" +"的版本被保留。" + +#: merge-recursive.c:1027 merge-recursive.c:1040 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." +msgstr "" +"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" +"的版本保留于 %8$s 中。" + +#: merge-recursive.c:1081 +msgid "rename" +msgstr "重命名" + +#: merge-recursive.c:1081 +msgid "renamed" +msgstr "重命名" + +#: merge-recursive.c:1137 +#, c-format +msgid "%s is a directory in %s adding as %s instead" +msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" + +#: merge-recursive.c:1159 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" +msgstr "" +"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " +"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" + +#: merge-recursive.c:1164 +msgid " (left unresolved)" +msgstr "（留下未解决）" + +#: merge-recursive.c:1218 +#, 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:1248 +#, c-format +msgid "Renaming %s to %s and %s to %s instead" +msgstr "而是重命名 %s 至 %s，以及 %s 至 %s" + +#: merge-recursive.c:1447 +#, 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:1457 +#, c-format +msgid "Adding merged %s" +msgstr "添加合并后的 %s" + +#: merge-recursive.c:1462 merge-recursive.c:1660 +#, c-format +msgid "Adding as %s instead" +msgstr "而是以 %s 为名添加" + +#: merge-recursive.c:1513 +#, c-format +msgid "cannot read object %s" +msgstr "不能读取对象 %s" + +#: merge-recursive.c:1516 +#, c-format +msgid "object %s is not a blob" +msgstr "对象 %s 不是一个数据（blob）对象" + +#: merge-recursive.c:1564 +msgid "modify" +msgstr "修改" + +#: merge-recursive.c:1564 +msgid "modified" +msgstr "修改" + +#: merge-recursive.c:1574 +msgid "content" +msgstr "内容" + +#: merge-recursive.c:1581 +msgid "add/add" +msgstr "添加/添加" + +#: merge-recursive.c:1615 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "略过 %s（已经做过相同合并）" + +#: merge-recursive.c:1629 +#, c-format +msgid "Auto-merging %s" +msgstr "自动合并 %s" + +#: merge-recursive.c:1633 git-submodule.sh:1029 +msgid "submodule" +msgstr "子模组" + +#: merge-recursive.c:1634 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "冲突（%s）：合并冲突于 %s" + +#: merge-recursive.c:1724 +#, c-format +msgid "Removing %s" +msgstr "删除 %s" + +#: merge-recursive.c:1749 +msgid "file/directory" +msgstr "文件/目录" + +#: merge-recursive.c:1755 +msgid "directory/file" +msgstr "目录/文件" + +#: merge-recursive.c:1760 +#, 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:1770 +#, c-format +msgid "Adding %s" +msgstr "添加 %s" + +#: merge-recursive.c:1787 +msgid "Fatal merge failure, shouldn't happen." +msgstr "严重的合并错误，不应发生。" + +#: merge-recursive.c:1806 +msgid "Already up-to-date!" +msgstr "已经是最新的！" + +#: merge-recursive.c:1815 +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "无法合并树 %s 和 %s" + +#: merge-recursive.c:1845 +#, c-format +msgid "Unprocessed path??? %s" +msgstr "未处理的路径??? %s" + +#: merge-recursive.c:1890 +msgid "Merging:" +msgstr "合并：" + +#: merge-recursive.c:1903 +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "发现 %u 个共同祖先：" +msgstr[1] "发现 %u 个共同祖先：" + +#: merge-recursive.c:1940 +msgid "merge returned no commit" +msgstr "合并未返回提交" + +#: merge-recursive.c:1997 +#, c-format +msgid "Could not parse object '%s'" +msgstr "不能解析对象 '%s'" + +#: merge-recursive.c:2009 builtin/merge.c:658 +msgid "Unable to write index." +msgstr "不能写入索引。" + +#: object.c:195 +#, c-format +msgid "unable to parse object: %s" +msgstr "不能解析对象：%s" + +#: parse-options.c:489 msgid "..." msgstr "..." -#: parse-options.c:511 +#: parse-options.c:507 #, c-format msgid "usage: %s" msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:515 +#: parse-options.c:511 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:518 +#: parse-options.c:514 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1629 +#: parse-options.c:548 +msgid "-NUM" +msgstr "-数字" + +#: pathspec.c:83 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "路径 '%s' 属于模组 '%.*s'" + +#: pathspec.c:99 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "'%s' 位于符号链接中" + +#: remote.c:1781 #, 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:1635 +#: remote.c:1787 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " （使用 \"git push\" 来发布您的本地提交）\n" + +#: remote.c:1790 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -385,7 +888,12 @@ msgid_plural "" msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" -#: remote.c:1643 +# 译者：注意保持前导空格 +#: remote.c:1798 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" + +#: remote.c:1801 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -395,24 +903,29 @@ msgid_plural "" "and have %d and %d different commits each, respectively.\n" msgstr[0] "" "您的分支和 '%s' 出现了偏离，\n" -"并且各自分别有 %d 和 %d 处不同的提交。\n" +"并且分别有 %d 和 %d 处不同的提交。\n" msgstr[1] "" "您的分支和 '%s' 出现了偏离，\n" -"并且各自分别有 %d 和 %d 处不同的提交。\n" +"并且分别有 %d 和 %d 处不同的提交。\n" -#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 -#: builtin/merge.c:1088 builtin/merge.c:1098 +# 译者：注意保持前导空格 +#: remote.c:1811 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr " （使用 \"git pull\" 来合并远程分支）\n" + +#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999 +#: builtin/merge.c:1009 #, c-format msgid "Could not open '%s' for writing" msgstr "不能为写入打开 '%s'" -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 -#: builtin/merge.c:1090 builtin/merge.c:1103 +#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779 +#: builtin/merge.c:1001 builtin/merge.c:1014 #, c-format msgid "Could not write to '%s'" msgstr "不能写入 '%s'" -#: sequencer.c:144 +#: sequencer.c:229 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -420,7 +933,7 @@ msgstr "" "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" "命令标记修正后的文件" -#: sequencer.c:147 +#: sequencer.c:232 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -429,667 +942,986 @@ msgstr "" "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:160 sequencer.c:758 sequencer.c:841 +#: sequencer.c:245 sequencer.c:859 sequencer.c:942 #, c-format msgid "Could not write to %s" msgstr "不能写入 %s" -#: sequencer.c:163 +#: sequencer.c:248 #, c-format msgid "Error wrapping up %s" msgstr "错误收尾 %s" -#: sequencer.c:178 +#: sequencer.c:263 msgid "Your local changes would be overwritten by cherry-pick." msgstr "您的本地修改将被拣选操作覆盖。" -#: sequencer.c:180 +#: sequencer.c:265 msgid "Your local changes would be overwritten by revert." msgstr "您的本地修改将被还原操作覆盖。" -#: sequencer.c:183 +#: sequencer.c:268 msgid "Commit your changes or stash them to proceed." msgstr "提交您的修改或保存进度后再继续。" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:233 +#: sequencer.c:319 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新索引文件" -#: sequencer.c:261 +#: sequencer.c:350 msgid "Could not resolve HEAD commit\n" msgstr "不能解析 HEAD 提交\n" -#: sequencer.c:282 +#: sequencer.c:371 msgid "Unable to update cache tree\n" msgstr "不能更新缓存\n" -#: sequencer.c:324 +#: sequencer.c:416 #, c-format msgid "Could not parse commit %s\n" msgstr "不能解析提交 %s\n" -#: sequencer.c:329 +#: sequencer.c:421 #, c-format msgid "Could not parse parent commit %s\n" msgstr "不能解析父提交 %s\n" -#: sequencer.c:395 +#: sequencer.c:487 msgid "Your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:398 -msgid "You do not have a valid HEAD" -msgstr "您没有一个有效的 HEAD" - -#: sequencer.c:413 +#: sequencer.c:506 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:421 +#: sequencer.c:514 #, c-format msgid "Commit %s does not have parent %d" msgstr "提交 %s 没有父提交 %d" -#: sequencer.c:425 +#: sequencer.c:518 #, 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:436 +#: sequencer.c:531 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:440 +#: sequencer.c:535 #, c-format msgid "Cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" -#: sequencer.c:524 +#: sequencer.c:621 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:525 +#: sequencer.c:622 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:553 +#: sequencer.c:654 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:561 +#: sequencer.c:662 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:566 +#: sequencer.c:667 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:624 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "无法 %s 在一个 %s 过程中" -#: sequencer.c:646 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "不能解析第 %d 行。" -#: sequencer.c:651 +#: sequencer.c:752 msgid "No commits parsed." msgstr "没有提交被解析。" -#: sequencer.c:664 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "不能打开 %s" -#: sequencer.c:668 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "不能读取 %s。" -#: sequencer.c:675 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "无用的指令表单：%s" -#: sequencer.c:703 +#: sequencer.c:804 #, c-format msgid "Invalid key: %s" msgstr "无效键名：%s" -#: sequencer.c:706 +#: sequencer.c:807 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:718 +#: sequencer.c:819 #, c-format msgid "Malformed options sheet: %s" msgstr "非法的选项表单：%s" -#: sequencer.c:739 +#: sequencer.c:840 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" -#: sequencer.c:740 +#: sequencer.c:841 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:744 +#: sequencer.c:845 #, c-format msgid "Could not create sequencer directory %s" msgstr "不能创建序列目录 %s" -#: sequencer.c:760 sequencer.c:845 +#: sequencer.c:861 sequencer.c:946 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" -#: sequencer.c:779 sequencer.c:913 +#: sequencer.c:880 sequencer.c:1014 msgid "no cherry-pick or revert in progress" -msgstr "没有拣选或还原操作在进行" +msgstr "拣选或还原操作并未进行" -#: sequencer.c:781 +#: sequencer.c:882 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:783 +#: sequencer.c:884 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:805 builtin/apply.c:3697 +#: sequencer.c:906 builtin/apply.c:4060 #, c-format msgid "cannot open %s: %s" msgstr "不能打开 %s：%s" -#: sequencer.c:808 +#: sequencer.c:909 #, c-format msgid "cannot read %s: %s" msgstr "不能读取 %s：%s" -#: sequencer.c:809 +#: sequencer.c:910 msgid "unexpected end of file" -msgstr "未预期的文件结束" +msgstr "意外的文件结束" -#: sequencer.c:815 +#: sequencer.c:916 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:838 +#: sequencer.c:939 #, c-format msgid "Could not format %s." msgstr "不能格式化 %s。" -#: sequencer.c:1000 +#: sequencer.c:1083 +#, c-format +msgid "%s: can't cherry-pick a %s" +msgstr "%s：不能拣选一个%s" + +#: sequencer.c:1085 +#, c-format +msgid "%s: bad revision" +msgstr "%s：错误的版本" + +#: sequencer.c:1119 msgid "Can't revert as initial commit" msgstr "不能作为初始提交还原" -#: sequencer.c:1001 +#: sequencer.c:1120 msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" -#: sha1_name.c:864 +#: sha1_name.c:1036 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" -#: sha1_name.c:867 +#: sha1_name.c:1039 #, c-format msgid "No such branch: '%s'" msgstr "没有此分支：'%s'" -#: sha1_name.c:869 +#: sha1_name.c:1041 #, c-format msgid "No upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: sha1_name.c:872 +#: sha1_name.c:1044 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" -#: wrapper.c:413 +#: wrapper.c:408 +#, c-format +msgid "unable to access '%s': %s" +msgstr "不能访问 '%s'：%s" + +#: wrapper.c:423 +#, c-format +msgid "unable to access '%s'" +msgstr "不能访问 '%s'" + +#: wrapper.c:434 #, c-format msgid "unable to look up current user in the passwd file: %s" -msgstr "无法在 passwd 文件中查询到当前用户：%s" +msgstr "无法在口令文件中查询到当前用户：%s" -#: wrapper.c:414 +#: wrapper.c:435 msgid "no such user" msgstr "无此用户" -#: wt-status.c:135 +#: wt-status.c:140 msgid "Unmerged paths:" msgstr "未合并的路径：" # 译者：注意保持前导空格 -#: wt-status.c:141 wt-status.c:158 +#: wt-status.c:167 wt-status.c:194 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）" # 译者：注意保持前导空格 -#: wt-status.c:143 wt-status.c:160 +#: wt-status.c:169 wt-status.c:196 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）" # 译者：注意保持前导空格 -#: wt-status.c:144 +#: wt-status.c:173 +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr " （使用 \"git add <file>...\" 标记解决方案）" + +# 译者：注意保持前导空格 +#: wt-status.c:175 wt-status.c:179 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）" -#: wt-status.c:152 +# 译者：注意保持前导空格 +#: wt-status.c:177 +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr " （使用 \"git rm <file>...\" 标记解决方案）" + +#: wt-status.c:188 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:170 +#: wt-status.c:206 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" # 译者：注意保持前导空格 -#: wt-status.c:174 +#: wt-status.c:210 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " （使用 \"git add <file>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:176 +#: wt-status.c:212 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:177 +#: wt-status.c:213 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）" # 译者：注意保持前导空格 -#: wt-status.c:179 +#: wt-status.c:215 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" -#: wt-status.c:188 -#, c-format -msgid "%s files:" -msgstr "%s文件：" - # 译者：注意保持前导空格 -#: wt-status.c:191 +#: wt-status.c:227 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）" -#: wt-status.c:208 +#: wt-status.c:244 msgid "bug" msgstr "bug" -#: wt-status.c:213 +#: wt-status.c:249 msgid "both deleted:" msgstr "双方删除：" -#: wt-status.c:214 +#: wt-status.c:250 msgid "added by us:" msgstr "由我们添加：" -#: wt-status.c:215 +#: wt-status.c:251 msgid "deleted by them:" msgstr "由他们删除：" -#: wt-status.c:216 +#: wt-status.c:252 msgid "added by them:" msgstr "由他们添加：" -#: wt-status.c:217 +#: wt-status.c:253 msgid "deleted by us:" msgstr "由我们删除：" -#: wt-status.c:218 +#: wt-status.c:254 msgid "both added:" msgstr "双方添加：" -#: wt-status.c:219 +#: wt-status.c:255 msgid "both modified:" msgstr "双方修改：" # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:249 +#: wt-status.c:285 msgid "new commits, " msgstr "新提交, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:251 +#: wt-status.c:287 msgid "modified content, " msgstr "修改的内容, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:253 +#: wt-status.c:289 msgid "untracked content, " msgstr "未跟踪的内容, " # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:267 +#: wt-status.c:306 #, c-format msgid "new file: %s" msgstr "新文件： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:270 +#: wt-status.c:309 #, c-format msgid "copied: %s -> %s" msgstr "拷贝： %s -> %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:273 +#: wt-status.c:312 #, c-format msgid "deleted: %s" msgstr "删除： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:276 +#: wt-status.c:315 #, c-format msgid "modified: %s" msgstr "修改： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:279 +#: wt-status.c:318 #, c-format msgid "renamed: %s -> %s" msgstr "重命名： %s -> %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:282 +#: wt-status.c:321 #, c-format msgid "typechange: %s" msgstr "类型变更： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:285 +#: wt-status.c:324 #, c-format msgid "unknown: %s" msgstr "未知： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:288 +#: wt-status.c:327 #, c-format msgid "unmerged: %s" msgstr "未合并： %s" -#: wt-status.c:291 +#: wt-status.c:330 #, c-format msgid "bug: unhandled diff status %c" msgstr "bug：未处理的差异状态 %c" -#: wt-status.c:737 +#: wt-status.c:803 +msgid "You have unmerged paths." +msgstr "您有尚未合并的路径。" + +# 译者：注意保持前导空格 +#: wt-status.c:806 wt-status.c:958 +msgid " (fix conflicts and run \"git commit\")" +msgstr " （解决冲突并运行 \"git commit\"）" + +#: wt-status.c:809 +msgid "All conflicts fixed but you are still merging." +msgstr "所有冲突已解决但您仍处于合并中。" + +# 译者：注意保持前导空格 +#: wt-status.c:812 +msgid " (use \"git commit\" to conclude merge)" +msgstr " （使用 \"git commit\" 结束合并）" + +#: wt-status.c:822 +msgid "You are in the middle of an am session." +msgstr "您正处于一个 am 过程中。" + +#: wt-status.c:825 +msgid "The current patch is empty." +msgstr "当前的补丁为空。" + +# 译者：注意保持前导空格 +#: wt-status.c:829 +msgid " (fix conflicts and then run \"git am --resolved\")" +msgstr " （解决冲突，然后运行 \"git am --resolved\"）" + +# 译者：注意保持前导空格 +#: wt-status.c:831 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " （使用 \"git am --skip\" 跳过此补丁）" + +# 译者：注意保持前导空格 +#: wt-status.c:833 +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr " （使用 \"git am --abort\" 恢复原有分支）" + +#: wt-status.c:893 wt-status.c:910 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "您正在将分支 '%s' 变基到 '%s'。" + +#: wt-status.c:898 wt-status.c:915 +msgid "You are currently rebasing." +msgstr "您正在变基。" + +# 译者：注意保持前导空格 +#: wt-status.c:901 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" + +# 译者：注意保持前导空格 +#: wt-status.c:903 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" + +# 译者：注意保持前导空格 +#: wt-status.c:905 +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" + +# 译者：注意保持前导空格 +#: wt-status.c:918 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" + +#: wt-status.c:922 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。" + +#: wt-status.c:927 +msgid "You are currently splitting a commit during a rebase." +msgstr "您正在变基过程中拆分一个提交。" + +# 译者：注意保持前导空格 +#: wt-status.c:930 +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" + +#: wt-status.c:934 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。" + +#: wt-status.c:939 +msgid "You are currently editing a commit during a rebase." +msgstr "您正在变基过程中编辑一个提交。" + +# 译者：注意保持前导空格 +#: wt-status.c:942 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr " （使用 \"git commit --amend\" 修补当前提交）" + +# 译者：注意保持前导空格 +#: wt-status.c:944 +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" + +#: wt-status.c:954 +msgid "You are currently cherry-picking." +msgstr "您正在做拣选操作。" + +# 译者：注意保持前导空格 +#: wt-status.c:961 +msgid " (all conflicts fixed: run \"git commit\")" +msgstr " （解决所有冲突后，执行 \"git commit\"）" + +#: wt-status.c:970 +#, c-format +msgid "You are currently reverting commit %s." +msgstr "您正在反转提交 %s 。" + +# 译者：注意保持前导空格 +#: wt-status.c:975 +msgid " (fix conflicts and run \"git revert --continue\")" +msgstr " （解决冲突并运行 \"git revert --continue\"）" + +# 译者：注意保持前导空格 +#: wt-status.c:978 +msgid " (all conflicts fixed: run \"git revert --continue\")" +msgstr " （所有冲突已解决：运行 \"git revert --continue\"）" + +# 译者：注意保持前导空格 +#: wt-status.c:980 +msgid " (use \"git revert --abort\" to cancel the revert operation)" +msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" + +#: wt-status.c:991 +#, c-format +msgid "You are currently bisecting, started from branch '%s'." +msgstr "您正在从分支 '%s' 开始做二分查找。" + +#: wt-status.c:995 +msgid "You are currently bisecting." +msgstr "您正在做二分查找。" + +# 译者：注意保持前导空格 +#: wt-status.c:998 +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr " （使用 \"git bisect reset\" 以回到原有分支）" + +#: wt-status.c:1173 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:744 +#: wt-status.c:1184 +msgid "HEAD detached at " +msgstr "头指针分离于 " + +#: wt-status.c:1186 +msgid "HEAD detached from " +msgstr "头指针分离自 " + +#: wt-status.c:1189 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:755 +#: wt-status.c:1206 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:769 -msgid "Untracked" -msgstr "未跟踪的" +#: wt-status.c:1220 +msgid "Untracked files" +msgstr "未跟踪的文件" + +#: wt-status.c:1222 +msgid "Ignored files" +msgstr "忽略的文件" -#: wt-status.c:771 -msgid "Ignored" -msgstr "忽略的" +#: wt-status.c:1226 +#, c-format +msgid "" +"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" +"may speed it up, but you have to be careful not to forget to add\n" +"new files yourself (see 'git help status')." +msgstr "" +"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" +"但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:773 +#: wt-status.c:1232 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:775 +#: wt-status.c:1234 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:781 +#: wt-status.c:1240 msgid "No changes" msgstr "没有修改" -#: wt-status.c:785 +#: wt-status.c:1245 #, c-format -msgid "no changes added to commit%s\n" -msgstr "修改尚未加入提交%s\n" +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:787 -msgid " (use \"git add\" and/or \"git commit -a\")" -msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）" - -#: wt-status.c:789 +#: wt-status.c:1248 #, c-format -msgid "nothing added to commit but untracked files present%s\n" -msgstr "空提交但存在未跟踪文件%s\n" +msgid "no changes added to commit\n" +msgstr "修改尚未加入提交\n" -# 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:791 -msgid " (use \"git add\" to track)" -msgstr "（使用 \"git add\" 建立跟踪）" +#: wt-status.c:1251 +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:793 wt-status.c:796 wt-status.c:799 +#: wt-status.c:1254 #, c-format -msgid "nothing to commit%s\n" -msgstr "无须提交%s\n" +msgid "nothing added to commit but untracked files present\n" +msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:794 -msgid " (create/copy files and use \"git add\" to track)" -msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）" +#: wt-status.c:1257 +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" + +#: wt-status.c:1260 wt-status.c:1265 +#, c-format +msgid "nothing to commit\n" +msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:797 -msgid " (use -u to show untracked files)" -msgstr "（使用 -u 显示未跟踪文件）" +#: wt-status.c:1263 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:800 -msgid " (working directory clean)" -msgstr "（干净的工作区）" +#: wt-status.c:1267 +#, c-format +msgid "nothing to commit, working directory clean\n" +msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:908 +#: wt-status.c:1375 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" # 译者：注意保持句尾空格 -#: wt-status.c:914 +#: wt-status.c:1381 msgid "Initial commit on " msgstr "初始提交于 " # 译者：注意保持句尾空格 -#: wt-status.c:929 +#: wt-status.c:1396 msgid "behind " msgstr "落后 " # 译者：注意保持句尾空格 -#: wt-status.c:932 wt-status.c:935 +#: wt-status.c:1399 wt-status.c:1402 msgid "ahead " msgstr "领先 " # 译者：注意保持句尾空格 -#: wt-status.c:937 +#: wt-status.c:1404 msgid ", behind " msgstr "，落后 " -#: builtin/add.c:62 +#: compat/precompose_utf8.c:58 builtin/clone.c:352 +#, c-format +msgid "failed to unlink '%s'" +msgstr "无法删除 '%s'" + +#: builtin/add.c:20 +msgid "git add [options] [--] <pathspec>..." +msgstr "git add [选项] [--] <路径匹配>..." + +# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短 +#. +#. * To be consistent with "git add -p" and most Git +#. * commands, we should default to being tree-wide, but +#. * this is not the original behavior and can't be +#. * changed until users trained themselves not to type +#. * "git add -u" or "git add -A". For now, we warn and +#. * keep the old behavior. Later, the behavior can be changed +#. * to tree-wide, keeping the warning for a while, and +#. * eventually we can drop the warning. +#. +#: builtin/add.c:58 +#, c-format +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" + +#: builtin/add.c:100 +#, c-format +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 <pathspec>'，是当前版本的默认操作，\n" +" 忽略您本地工作区中移除的文件。\n" +"\n" +"* 'git add --all <pathspec>' 将让您同时对删除操作进行记录。\n" +"\n" +"运行 'git status' 来检查您本地工作区中移除的路径。\n" + +#: builtin/add.c:144 #, c-format msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:67 builtin/commit.c:226 +#: builtin/add.c:149 builtin/commit.c:233 msgid "updating files failed" msgstr "更新文件失败" -#: builtin/add.c:77 +#: builtin/add.c:163 #, c-format msgid "remove '%s'\n" msgstr "删除 '%s'\n" -#: builtin/add.c:176 -#, c-format -msgid "Path '%s' is in submodule '%.*s'" -msgstr "路径 '%s' 属于模组 '%.*s'" - -#: builtin/add.c:192 +#: builtin/add.c:253 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186 +#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径 '%s' 未匹配任何文件" -#: builtin/add.c:209 -#, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "'%s' 位于符号链接中" - -#: builtin/add.c:276 +#: builtin/add.c:339 msgid "Could not read the index" msgstr "不能读取索引" -#: builtin/add.c:286 +#: builtin/add.c:349 #, c-format msgid "Could not open '%s' for writing." -msgstr "不能为写入打开 '%s'。" +msgstr "不能打开 '%s' 以写入。" -#: builtin/add.c:290 +#: builtin/add.c:353 msgid "Could not write patch" -msgstr "不能写补丁" +msgstr "不能生成补丁" -#: builtin/add.c:295 +#: builtin/add.c:358 #, c-format msgid "Could not stat '%s'" msgstr "不能查看文件状态 '%s'" -#: builtin/add.c:297 +#: builtin/add.c:360 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" -#: builtin/add.c:303 +#: builtin/add.c:366 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" -#: builtin/add.c:312 +#: builtin/add.c:376 msgid "The following paths are ignored by one of your .gitignore files:\n" -msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n" +msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" + +#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 +#: builtin/rm.c:206 +msgid "dry run" +msgstr "演习" + +#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19 +#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613 +#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112 +msgid "be verbose" +msgstr "冗长输出" + +#: builtin/add.c:396 +msgid "interactive picking" +msgstr "交互式拣选" -#: builtin/add.c:352 +#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258 +msgid "select hunks interactively" +msgstr "交互式挑选数据块" + +#: builtin/add.c:398 +msgid "edit current diff and apply" +msgstr "编辑当前差异并应用" + +#: builtin/add.c:399 +msgid "allow adding otherwise ignored files" +msgstr "允许添加忽略的文件" + +#: builtin/add.c:400 +msgid "update tracked files" +msgstr "更新已跟踪的文件" + +#: builtin/add.c:401 +msgid "record only the fact that the path will be added later" +msgstr "只记录，该路径稍后再添加" + +#: builtin/add.c:402 +msgid "add changes from all tracked and untracked files" +msgstr "添加所有改变的已跟踪文件和未跟踪文件" + +#. takes no arguments +#: builtin/add.c:405 +msgid "ignore paths removed in the working tree (same as --no-all)" +msgstr "忽略工作区中移除的路径（和 --no-all 相同）" + +#: builtin/add.c:407 +msgid "don't add, only refresh the index" +msgstr "不添加，只刷新索引" + +#: builtin/add.c:408 +msgid "just skip files which cannot be added because of errors" +msgstr "跳过因出错不能添加的文件" + +#: builtin/add.c:409 +msgid "check if - even missing - files are ignored in dry run" +msgstr "检查在演习模式下文件（即使不存在）是否被忽略" + +#: builtin/add.c:431 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 参数如果您确实要添加它们。\n" -#: builtin/add.c:353 +#: builtin/add.c:432 msgid "no files added" msgstr "没有文件被添加" -#: builtin/add.c:359 +#: builtin/add.c:438 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:391 +#: builtin/add.c:477 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" -#: builtin/add.c:393 +#: builtin/add.c:495 msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "选项 --ignore-missing 只能和 --dry-run 共用" +msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" -#: builtin/add.c:413 +#: builtin/add.c:525 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" -#: builtin/add.c:414 +#: builtin/add.c:526 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82 -#: builtin/rm.c:162 +#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204 +#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: builtin/apply.c:53 +#: builtin/apply.c:57 msgid "git apply [options] [<patch>...]" msgstr "git apply [选项] [<补丁>...]" -#: builtin/apply.c:106 +#: builtin/apply.c:110 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" -#: builtin/apply.c:121 +#: builtin/apply.c:125 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: builtin/apply.c:815 +#: builtin/apply.c:823 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" -#: builtin/apply.c:824 +#: builtin/apply.c:832 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" -#: builtin/apply.c:905 +#: builtin/apply.c:913 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" -#: builtin/apply.c:937 +#: builtin/apply.c:945 #, 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" +msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s" -#: builtin/apply.c:941 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" -#: builtin/apply.c:942 +#: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" -#: builtin/apply.c:949 +#: builtin/apply.c:957 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply：错误的 git-diff - 期望 /dev/null 于第 %d 行" +msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" -#: builtin/apply.c:1394 +#: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: builtin/apply.c:1451 +#: builtin/apply.c:1479 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" -#: builtin/apply.c:1468 +#: builtin/apply.c:1496 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1100,82 +1932,78 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: builtin/apply.c:1628 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: builtin/apply.c:1630 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: builtin/apply.c:1656 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" -msgstr "补丁损坏位于第 %d 行" +msgstr "补丁在第 %d 行损坏" -#: builtin/apply.c:1692 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: builtin/apply.c:1694 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: builtin/apply.c:1697 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: builtin/apply.c:1843 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1872 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: builtin/apply.c:1958 +#: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: builtin/apply.c:2048 +#: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: builtin/apply.c:2052 +#: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: builtin/apply.c:2123 -msgid "oops" -msgstr "哎哟" - -#: builtin/apply.c:2645 +#: builtin/apply.c:2688 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: builtin/apply.c:2763 +#: builtin/apply.c:2806 #, 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 行）" +msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）" +msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）" -#: builtin/apply.c:2775 +#: builtin/apply.c:2818 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: builtin/apply.c:2781 +#: builtin/apply.c:2824 #, c-format msgid "" "while searching for:\n" @@ -1184,313 +2012,318 @@ msgstr "" "当查询：\n" "%.*s" -#: builtin/apply.c:2800 +#: builtin/apply.c:2843 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: builtin/apply.c:2903 +#: builtin/apply.c:2946 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: builtin/apply.c:2909 +#: builtin/apply.c:2952 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "到 '%s' 的二进制补丁产生了不正确的结果（预期 %s，得到 %s）" +msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" -#: builtin/apply.c:2930 +#: builtin/apply.c:2973 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: builtin/apply.c:3045 +#: builtin/apply.c:3095 #, c-format -msgid "patch %s has been renamed/deleted" -msgstr "补丁 %s 已经被重命名/删除" +msgid "cannot checkout %s" +msgstr "不能检出 %s" -#: builtin/apply.c:3052 builtin/apply.c:3069 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193 #, c-format msgid "read of %s failed" msgstr "读取 %s 失败" -#: builtin/apply.c:3084 -msgid "removal patch leaves file contents" -msgstr "移除补丁仍留下了文件内容" - -#: builtin/apply.c:3105 +#: builtin/apply.c:3173 builtin/apply.c:3395 #, c-format -msgid "%s: already exists in working directory" -msgstr "%s：已经存在于工作区中" +msgid "path %s has been renamed/deleted" +msgstr "路径 %s 已经被重命名/删除" -#: builtin/apply.c:3143 +#: builtin/apply.c:3254 builtin/apply.c:3409 #, c-format -msgid "%s: has been deleted/renamed" -msgstr "%s：已经被删除/重命名" +msgid "%s: does not exist in index" +msgstr "%s：不存在于索引中" -#: builtin/apply.c:3148 builtin/apply.c:3179 +#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: builtin/apply.c:3159 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s：不存在于索引中" - -#: builtin/apply.c:3173 +#: builtin/apply.c:3263 builtin/apply.c:3417 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: builtin/apply.c:3190 +#: builtin/apply.c:3365 +msgid "removal patch leaves file contents" +msgstr "移除补丁仍留下了文件内容" + +#: builtin/apply.c:3434 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: builtin/apply.c:3192 +#: builtin/apply.c:3436 #, c-format msgid "%s has type %o, expected %o" -msgstr "%s 的类型是 %o，预期是 %o" +msgstr "%s 的类型是 %o，应为 %o" -#: builtin/apply.c:3247 +#: builtin/apply.c:3537 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: builtin/apply.c:3267 +#: builtin/apply.c:3540 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s：已经存在于工作区中" + +#: builtin/apply.c:3560 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: builtin/apply.c:3272 +#: builtin/apply.c:3565 #, 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:3280 +#: builtin/apply.c:3573 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: builtin/apply.c:3293 +#: builtin/apply.c:3586 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." -#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158 +#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: builtin/apply.c:3491 +#: builtin/apply.c:3822 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: builtin/apply.c:3518 +#: builtin/apply.c:3850 #, c-format msgid "corrupt patch for subproject %s" msgstr "子项目 %s 损坏的补丁" -#: builtin/apply.c:3522 +#: builtin/apply.c:3854 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能枚举新建文件 '%s' 的状态" -#: builtin/apply.c:3527 +#: builtin/apply.c:3859 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: builtin/apply.c:3530 +#: builtin/apply.c:3862 builtin/apply.c:3970 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: builtin/apply.c:3563 +#: builtin/apply.c:3895 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: builtin/apply.c:3612 +#: builtin/apply.c:3944 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: builtin/apply.c:3668 +#: builtin/apply.c:4031 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: builtin/apply.c:3676 +#: builtin/apply.c:4039 msgid "internal error" msgstr "内部错误" #. Say this even without --verbose -#: builtin/apply.c:3679 +#: builtin/apply.c:4042 #, 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 个被拒绝..." +msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..." +msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..." -#: builtin/apply.c:3689 +#: builtin/apply.c:4052 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: builtin/apply.c:3710 +#: builtin/apply.c:4073 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: builtin/apply.c:3713 +#: builtin/apply.c:4076 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: builtin/apply.c:3844 +#: builtin/apply.c:4226 msgid "unrecognized input" msgstr "未能识别的输入" -#: builtin/apply.c:3855 +#: builtin/apply.c:4237 msgid "unable to read index file" msgstr "无法读取索引文件" -#: builtin/apply.c:3970 builtin/apply.c:3973 +#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92 +#: builtin/fetch.c:63 msgid "path" msgstr "路径" -#: builtin/apply.c:3971 +#: builtin/apply.c:4357 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: builtin/apply.c:3974 +#: builtin/apply.c:4360 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: builtin/apply.c:3976 +#: builtin/apply.c:4362 msgid "num" msgstr "数字" -#: builtin/apply.c:3977 +#: builtin/apply.c:4363 msgid "remove <num> leading slashes from traditional diff paths" -msgstr "从传统的 diff 路径中移除 <数字> 个前导路径" +msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: builtin/apply.c:3980 +#: builtin/apply.c:4366 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: builtin/apply.c:3982 +#: builtin/apply.c:4368 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: builtin/apply.c:3986 -msgid "shows number of added and deleted lines in decimal notation" -msgstr "以数字方式显示添加或删除行的数量" +#: builtin/apply.c:4372 +msgid "show number of added and deleted lines in decimal notation" +msgstr "以十进制数显示添加和删除的行数" -#: builtin/apply.c:3988 +#: builtin/apply.c:4374 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: builtin/apply.c:3990 +#: builtin/apply.c:4376 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: builtin/apply.c:3992 +#: builtin/apply.c:4378 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: builtin/apply.c:3994 +#: builtin/apply.c:4380 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: builtin/apply.c:3996 +#: builtin/apply.c:4382 msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "同时应用此补丁（和 --stat/--summary/--check 共用）" +msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" + +#: builtin/apply.c:4384 +msgid "attempt three-way merge if a patch does not apply" +msgstr "如果一个补丁不能应用则尝试三路合并" -#: builtin/apply.c:3998 +#: builtin/apply.c:4386 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: builtin/apply.c:4000 +#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: builtin/apply.c:4003 +#: builtin/apply.c:4391 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: builtin/apply.c:4004 +#: builtin/apply.c:4392 msgid "action" msgstr "动作" -#: builtin/apply.c:4005 +#: builtin/apply.c:4393 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: builtin/apply.c:4008 builtin/apply.c:4011 +#: builtin/apply.c:4396 builtin/apply.c:4399 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: builtin/apply.c:4014 +#: builtin/apply.c:4402 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: builtin/apply.c:4016 +#: builtin/apply.c:4404 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: builtin/apply.c:4018 +#: builtin/apply.c:4406 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: builtin/apply.c:4020 +#: builtin/apply.c:4408 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: builtin/apply.c:4021 -msgid "be verbose" -msgstr "冗长输出" - -#: builtin/apply.c:4023 +#: builtin/apply.c:4411 msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "宽容不正确的文件末尾换行符" +msgstr "允许不正确的文件末尾换行符" -#: builtin/apply.c:4026 +#: builtin/apply.c:4414 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: builtin/apply.c:4028 +#: builtin/apply.c:4416 msgid "root" msgstr "根目录" -#: builtin/apply.c:4029 +#: builtin/apply.c:4417 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: builtin/apply.c:4050 +#: builtin/apply.c:4439 +msgid "--3way outside a repository" +msgstr "--3way 在一个版本库之外" + +#: builtin/apply.c:4447 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" -#: builtin/apply.c:4053 +#: builtin/apply.c:4450 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" -#: builtin/apply.c:4069 +#: builtin/apply.c:4466 #, c-format msgid "can't open patch '%s'" msgstr "不能打开补丁 '%s'" -#: builtin/apply.c:4083 +#: builtin/apply.c:4480 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: builtin/apply.c:4089 builtin/apply.c:4099 +#: builtin/apply.c:4486 builtin/apply.c:4496 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1504,7 +2337,7 @@ msgstr "不能创建归档文件 '%s'" #: builtin/archive.c:20 msgid "could not redirect output" -msgstr "不能输出重定向" +msgstr "不能重定向输出" #: builtin/archive.c:37 msgid "git archive: Remote with no URL" @@ -1512,28 +2345,156 @@ 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:63 +#: builtin/archive.c:61 #, c-format msgid "git archive: NACK %s" msgstr "git archive：NACK %s" -#: builtin/archive.c:65 +#: builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "远程错误：%s" -#: builtin/archive.c:66 +#: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive：协议错误" -#: builtin/archive.c:71 +#: builtin/archive.c:68 msgid "git archive: expected a flush" -msgstr "git archive：预期一个刷新" +msgstr "git archive：应为刷新" + +#: builtin/bisect--helper.c:7 +msgid "git bisect--helper --next-all [--no-checkout]" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:17 +msgid "perform 'git bisect next'" +msgstr "执行 'git bisect next'" + +#: builtin/bisect--helper.c:19 +msgid "update BISECT_HEAD instead of checking out the current commit" +msgstr "更新 BISECT_HEAD 而非检出当前提交" + +#: builtin/blame.c:25 +msgid "git blame [options] [rev-opts] [rev] [--] file" +msgstr "git blame [选项] [版本选项] [版本] [--] 文件" + +#: builtin/blame.c:30 +msgid "[rev-opts] are documented in git-rev-list(1)" +msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中" + +#: builtin/blame.c:2355 +msgid "Show blame entries as we find them, incrementally" +msgstr "增量式地显示发现的 blame 条目" + +#: builtin/blame.c:2356 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "边界提交显示空的 SHA-1（默认：关闭）" + +#: builtin/blame.c:2357 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "不把根提交作为边界（默认：关闭）" + +#: builtin/blame.c:2358 +msgid "Show work cost statistics" +msgstr "显示命令消耗统计" + +#: builtin/blame.c:2359 +msgid "Show output score for blame entries" +msgstr "显示判断 blame 条目位移的得分诊断信息" + +#: builtin/blame.c:2360 +msgid "Show original filename (Default: auto)" +msgstr "显示原始文件名（默认：自动）" + +#: builtin/blame.c:2361 +msgid "Show original linenumber (Default: off)" +msgstr "显示原始的行号（默认：关闭）" + +#: builtin/blame.c:2362 +msgid "Show in a format designed for machine consumption" +msgstr "显示为一个适合机器读取的格式" + +#: builtin/blame.c:2363 +msgid "Show porcelain format with per-line commit information" +msgstr "为每一行显示机器适用的提交信息" + +#: builtin/blame.c:2364 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" + +#: builtin/blame.c:2365 +msgid "Show raw timestamp (Default: off)" +msgstr "显示原始时间戳（默认：关闭）" + +#: builtin/blame.c:2366 +msgid "Show long commit SHA1 (Default: off)" +msgstr "显示长的SHA1提交号（默认：关闭）" + +#: builtin/blame.c:2367 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "隐藏作者名字和时间戳（默认：关闭）" + +#: builtin/blame.c:2368 +msgid "Show author email instead of name (Default: off)" +msgstr "显示作者的邮箱而不是名字（默认：关闭）" + +#: builtin/blame.c:2369 +msgid "Ignore whitespace differences" +msgstr "忽略空白差异" + +#: builtin/blame.c:2370 +msgid "Spend extra cycles to find better match" +msgstr "花费额外的循环来找到更好的匹配" + +#: builtin/blame.c:2371 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list" + +#: builtin/blame.c:2372 +msgid "Use <file>'s contents as the final image" +msgstr "使用 <file> 的内容作为最终的图片" + +#: builtin/blame.c:2373 builtin/blame.c:2374 +msgid "score" +msgstr "得分" + +#: builtin/blame.c:2373 +msgid "Find line copies within and across files" +msgstr "找到文件内及跨文件的行拷贝" + +#: builtin/blame.c:2374 +msgid "Find line movements within and across files" +msgstr "找到文件内及跨文件的行移动" + +#: builtin/blame.c:2375 +msgid "n,m" +msgstr "n,m" + +#: builtin/blame.c:2375 +msgid "Process only line range n,m, counting from 1" +msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" + +#: 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) <分支名>..." + +#: builtin/branch.c:27 +msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:144 +#: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -1543,7 +2504,7 @@ msgstr "" " '%s'，但未合并到 HEAD。" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:148 +#: builtin/branch.c:154 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -1552,163 +2513,369 @@ msgstr "" "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" " 然而却尚未被合并到分支 '%s' 。" -#: builtin/branch.c:180 +#: builtin/branch.c:168 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "无法查询 '%s' 指向的提交对象" + +#: builtin/branch.c:172 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" +"分支 '%s' 没有完全合并。\n" +"如果您确认要删除它，执行 'git branch -D %s'。" + +#: builtin/branch.c:185 +msgid "Update of config-file failed" +msgstr "无法更新 config 文件" + +#: builtin/branch.c:213 msgid "cannot use -a with -d" -msgstr "不能将 -a 和 -d 共用" +msgstr "不能将 -a 和 -d 同时使用" -#: builtin/branch.c:186 +#: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "无法查询 HEAD 指向的提交对象" -#: builtin/branch.c:191 +#: builtin/branch.c:227 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "无法删除您当前所在的分支 '%s'。" -#: builtin/branch.c:202 +#: builtin/branch.c:240 #, c-format msgid "remote branch '%s' not found." msgstr "远程分支 '%s' 未发现。" -#: builtin/branch.c:203 +#: builtin/branch.c:241 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未发现。" -#: builtin/branch.c:210 -#, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "无法查询 '%s' 指向的提交对象" - -#: builtin/branch.c:216 -#, c-format -msgid "" -"The branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'." -msgstr "" -"分支 '%s' 没有完全合并。\n" -"如果您确认要删除它，执行 'git branch -D %s'。" - -#: builtin/branch.c:225 +#: builtin/branch.c:255 #, c-format msgid "Error deleting remote branch '%s'" msgstr "删除远程分支 '%s' 时出错" -#: builtin/branch.c:226 +#: builtin/branch.c:256 #, c-format msgid "Error deleting branch '%s'" msgstr "删除分支 '%s' 时出错" -#: builtin/branch.c:233 +#: builtin/branch.c:263 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "已删除远程分支 %s（曾为 %s）。\n" -#: builtin/branch.c:234 +#: builtin/branch.c:264 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s（曾为 %s）。\n" -#: builtin/branch.c:239 -msgid "Update of config-file failed" -msgstr "无法更新 config 文件" - -#: builtin/branch.c:337 +#: builtin/branch.c:366 #, c-format msgid "branch '%s' does not point at a commit" msgstr "分支 '%s' 未指向一个提交" -#: builtin/branch.c:409 +#: builtin/branch.c:453 #, c-format msgid "[%s: behind %d]" msgstr "[%s：落后 %d]" -#: builtin/branch.c:411 +#: builtin/branch.c:455 #, c-format msgid "[behind %d]" msgstr "[落后 %d]" -#: builtin/branch.c:415 +#: builtin/branch.c:459 #, c-format msgid "[%s: ahead %d]" msgstr "[%s：领先 %d]" -#: builtin/branch.c:417 +#: builtin/branch.c:461 #, c-format msgid "[ahead %d]" msgstr "[领先 %d]" -#: builtin/branch.c:420 +#: builtin/branch.c:464 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s：领先 %d，落后 %d]" -#: builtin/branch.c:423 +#: builtin/branch.c:467 #, c-format msgid "[ahead %d, behind %d]" msgstr "[领先 %d，落后 %d]" -#: builtin/branch.c:535 +#: builtin/branch.c:490 +msgid " **** invalid ref ****" +msgstr " **** 无效引用 ****" + +#: builtin/branch.c:582 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "（非分支，正变基 %s）" + +#: builtin/branch.c:585 +#, c-format +msgid "(no branch, bisect started on %s)" +msgstr "（非分支，二分查找开始于 %s）" + +#: builtin/branch.c:588 +#, c-format +msgid "(detached from %s)" +msgstr "（分离自 %s）" + +#: builtin/branch.c:591 msgid "(no branch)" msgstr "（非分支）" -#: builtin/branch.c:600 +#: builtin/branch.c:637 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "对象 '%s' 没有指向一个提交" + +#: builtin/branch.c:669 msgid "some refs could not be read" msgstr "一些引用不能读取" -#: builtin/branch.c:613 +#: builtin/branch.c:682 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" -#: builtin/branch.c:623 +#: builtin/branch.c:692 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c:638 +#: builtin/branch.c:707 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:642 +#: builtin/branch.c:711 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "重命名掉一个错误命名的旧分支 '%s'" -#: builtin/branch.c:646 +#: builtin/branch.c:715 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: builtin/branch.c:653 +#: builtin/branch.c:722 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新 config 文件失败" -#: builtin/branch.c:668 +#: builtin/branch.c:737 #, c-format msgid "malformed object name %s" msgstr "非法的对象名 %s" -#: builtin/branch.c:692 +#: builtin/branch.c:761 #, c-format msgid "could not write branch description template: %s" msgstr "不能写分支描述模版：%s" -#: builtin/branch.c:783 +#: builtin/branch.c:791 +msgid "Generic options" +msgstr "通用选项" + +#: builtin/branch.c:793 +msgid "show hash and subject, give twice for upstream branch" +msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" + +#: builtin/branch.c:794 +msgid "suppress informational messages" +msgstr "不显示信息" + +#: builtin/branch.c:795 +msgid "set up tracking mode (see git-pull(1))" +msgstr "设置跟踪模式（参见 git-pull(1)）" + +#: builtin/branch.c:797 +msgid "change upstream info" +msgstr "改变上游信息" + +#: builtin/branch.c:801 +msgid "use colored output" +msgstr "使用彩色输出" + +#: builtin/branch.c:802 +msgid "act on remote-tracking branches" +msgstr "作用于远程跟踪分支" + +#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832 +#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369 +#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468 +msgid "commit" +msgstr "提交" + +#: builtin/branch.c:806 builtin/branch.c:812 +msgid "print only branches that contain the commit" +msgstr "只打印包含该提交的分支" + +#: builtin/branch.c:818 +msgid "Specific git-branch actions:" +msgstr "具体的 git-branch 动作：" + +#: builtin/branch.c:819 +msgid "list both remote-tracking and local branches" +msgstr "列出远程跟踪及本地分支" + +#: builtin/branch.c:821 +msgid "delete fully merged branch" +msgstr "删除完全合并的分支" + +#: builtin/branch.c:822 +msgid "delete branch (even if not merged)" +msgstr "删除分支（即使没有合并）" + +#: builtin/branch.c:823 +msgid "move/rename a branch and its reflog" +msgstr "移动/重命名一个分支，以及它的引用日志" + +#: builtin/branch.c:824 +msgid "move/rename a branch, even if target exists" +msgstr "移动/重命名一个分支，即使目标已存在" + +#: builtin/branch.c:825 +msgid "list branch names" +msgstr "列出分支名" + +#: builtin/branch.c:826 +msgid "create the branch's reflog" +msgstr "创建分支的引用日志" + +#: builtin/branch.c:828 +msgid "edit the description for the branch" +msgstr "标记分支的描述" + +#: builtin/branch.c:829 +msgid "force creation (when already exists)" +msgstr "强制创建（当已经存在）" + +#: builtin/branch.c:832 +msgid "print only not merged branches" +msgstr "只打印没有合并的分支" + +#: builtin/branch.c:838 +msgid "print only merged branches" +msgstr "只打印合并的分支" + +#: builtin/branch.c:842 +msgid "list branches in columns" +msgstr "以列的方式显示分支" + +#: builtin/branch.c:855 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:788 builtin/clone.c:558 +#: builtin/branch.c:860 builtin/clone.c:619 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c:808 +#: builtin/branch.c:883 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" -#: builtin/branch.c:857 +#: builtin/branch.c:889 builtin/branch.c:928 +msgid "branch name required" +msgstr "必须提供分支名" + +#: builtin/branch.c:904 +msgid "Cannot give description to detached HEAD" +msgstr "不能向分离头指针提供描述" + +#: builtin/branch.c:909 +msgid "cannot edit description of more than one branch" +msgstr "不能为一个以上的分支编辑描述" + +#: builtin/branch.c:916 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "分支 '%s' 尚无提交。" + +#: builtin/branch.c:919 +#, c-format +msgid "No branch named '%s'." +msgstr "没有分支 '%s'。" + +#: builtin/branch.c:934 +msgid "too many branches for a rename operation" +msgstr "为重命名操作提供了太多的分支名" + +#: builtin/branch.c:939 +msgid "too many branches to set new upstream" +msgstr "为设置新上游提供了太多的分支名" + +#: builtin/branch.c:943 +#, 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:946 builtin/branch.c:968 builtin/branch.c:990 +#, c-format +msgid "no such branch '%s'" +msgstr "没有此分支 '%s'" + +#: builtin/branch.c:950 +#, c-format +msgid "branch '%s' does not exist" +msgstr "分支 '%s' 不存在" + +#: builtin/branch.c:962 +msgid "too many branches to unset upstream" +msgstr "为取消上游设置操作提供了太多的分支名" + +#: builtin/branch.c:966 +msgid "could not unset upstream of HEAD when it does not point to any branch." +msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" + +#: builtin/branch.c:972 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "分支 '%s' 没有上游信息" + +#: builtin/branch.c:987 +msgid "it does not make sense to create 'HEAD' manually" +msgstr "手工创建 'HEAD' 没有意义" + +#: builtin/branch.c:993 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" +#: builtin/branch.c:996 +#, c-format +msgid "" +"The --set-upstream flag is deprecated and will be removed. Consider using --" +"track or --set-upstream-to\n" +msgstr "" +"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" + +#: builtin/branch.c:1013 +#, c-format +msgid "" +"\n" +"If you wanted to make '%s' track '%s', do this:\n" +"\n" +msgstr "" +"\n" +"如果你想用 '%s' 跟踪 '%s', 这么做：\n" +"\n" + +#: builtin/branch.c:1014 +#, c-format +msgid " git branch -d %s\n" +msgstr " git branch -d %s\n" + +#: builtin/branch.c:1015 +#, c-format +msgid " git branch --set-upstream-to %s\n" +msgstr " git branch --set-upstream-to %s\n" + #: builtin/bundle.c:47 #, c-format msgid "%s is okay\n" @@ -1722,100 +2889,247 @@ msgstr "需要一个版本库来创建包。" msgid "Need a repository to unbundle." msgstr "需要一个版本库来解包。" -#: builtin/checkout.c:113 builtin/checkout.c:146 +#: builtin/cat-file.c:176 +msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" +msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>" + +#: builtin/cat-file.c:177 +msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" +msgstr "git cat-file (--batch|--batch-check) < <对象列表>" + +#: builtin/cat-file.c:195 +msgid "<type> can be one of: blob, tree, commit, tag" +msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" + +#: builtin/cat-file.c:196 +msgid "show object type" +msgstr "显示对象类型" + +#: builtin/cat-file.c:197 +msgid "show object size" +msgstr "显示对象大小" + +#: builtin/cat-file.c:199 +msgid "exit with zero when there's no error" +msgstr "当没有错误时退出并返回零" + +#: builtin/cat-file.c:200 +msgid "pretty-print object's content" +msgstr "美观地打印对象的内容" + +#: builtin/cat-file.c:202 +msgid "for blob objects, run textconv on object's content" +msgstr "对于数据（blob）对象，对其内容执行 textconv" + +#: builtin/cat-file.c:204 +msgid "show info and content of objects fed from the standard input" +msgstr "显示从标准输入提供的对象的信息和内容" + +#: builtin/cat-file.c:207 +msgid "show info about objects fed from the standard input" +msgstr "显示从标准输入提供的对象的信息" + +#: builtin/check-attr.c:11 +msgid "git check-attr [-a | --all | attr...] [--] pathname..." +msgstr "git check-attr [-a | --all | attr...] [--] 路径名..." + +#: 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...] < <路径列表>" + +#: builtin/check-attr.c:19 +msgid "report all attributes set on file" +msgstr "报告设置在文件上的所有属性" + +#: builtin/check-attr.c:20 +msgid "use .gitattributes only from the index" +msgstr "只使用索引中的 .gitattributes" + +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 +msgid "read file names from stdin" +msgstr "从标准输入读出文件名" + +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +msgid "input paths are terminated by a null character" +msgstr "输入路径以null字符终止" + +#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "不显示进度报告" + +#: builtin/check-ignore.c:146 +msgid "cannot specify pathnames with --stdin" +msgstr "不能同时提供路径及 --stdin 参数" + +#: builtin/check-ignore.c:149 +msgid "-z only makes sense with --stdin" +msgstr "-z 需要和 --stdin 参数共用才有意义" + +#: builtin/check-ignore.c:151 +msgid "no path specified" +msgstr "未指定路径" + +#: builtin/check-ignore.c:155 +msgid "--quiet is only valid with a single pathname" +msgstr "参数 --quiet 只在提供一个路径名时有效" + +#: builtin/check-ignore.c:157 +msgid "cannot have both --quiet and --verbose" +msgstr "不能同时提供 --quiet 和 --verbose 参数" + +#: builtin/checkout-index.c:126 +msgid "git checkout-index [options] [--] [<file>...]" +msgstr "git checkout-index [选项] [--] [<文件>...]" + +#: builtin/checkout-index.c:187 +msgid "check out all files in the index" +msgstr "检出索引区的所有文件" + +#: builtin/checkout-index.c:188 +msgid "force overwrite of existing files" +msgstr "强制覆盖现有的文件" + +#: builtin/checkout-index.c:190 +msgid "no warning for existing files and files not in index" +msgstr "存在或不在索引中的文件都没有警告" + +#: builtin/checkout-index.c:192 +msgid "don't checkout new files" +msgstr "不检出新文件" + +#: builtin/checkout-index.c:194 +msgid "update stat information in the index file" +msgstr "更新索引中文件的状态信息" + +#: builtin/checkout-index.c:200 +msgid "read list of paths from the standard input" +msgstr "从标准输入读取路径列表" + +#: builtin/checkout-index.c:202 +msgid "write the content to temporary files" +msgstr "将内容写入临时文件" + +#: builtin/checkout-index.c:203 builtin/column.c:30 +msgid "string" +msgstr "字符串" + +#: builtin/checkout-index.c:204 +msgid "when creating files, prepend <string>" +msgstr "在创建文件时，在前面加上<字符串>" + +#: builtin/checkout-index.c:207 +msgid "copy out the files from named stage" +msgstr "从指定暂存区中拷出文件" + +#: builtin/checkout.c:25 +msgid "git checkout [options] <branch>" +msgstr "git checkout [选项] <分支>" + +#: builtin/checkout.c:26 +msgid "git checkout [options] [<branch>] -- <file>..." +msgstr "git checkout [选项] [<分支>] -- <文件>..." + +#: builtin/checkout.c:117 builtin/checkout.c:150 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" -#: builtin/checkout.c:115 builtin/checkout.c:148 +#: builtin/checkout.c:119 builtin/checkout.c:152 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" -#: builtin/checkout.c:131 +#: builtin/checkout.c:135 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必须的版本" -#: builtin/checkout.c:175 +#: builtin/checkout.c:179 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必须的版本" -#: builtin/checkout.c:192 +#: builtin/checkout.c:196 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" -#: builtin/checkout.c:209 +#: builtin/checkout.c:213 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:234 builtin/checkout.c:392 +#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243 +#: builtin/checkout.c:246 +#, c-format +msgid "'%s' cannot be used with updating paths" +msgstr "'%s' 不能在更新路径时使用" + +#: builtin/checkout.c:249 builtin/checkout.c:252 +#, c-format +msgid "'%s' cannot be used with %s" +msgstr "'%s' 不能和 %s 同时使用" + +#: builtin/checkout.c:255 +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "不能同时更新路径并切换到分支'%s'。" + +#: builtin/checkout.c:266 builtin/checkout.c:458 msgid "corrupt index file" msgstr "损坏的索引文件" -#: builtin/checkout.c:264 builtin/checkout.c:271 +#: builtin/checkout.c:329 builtin/checkout.c:336 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 -#: builtin/merge.c:812 -msgid "unable to write new index file" -msgstr "无法写新的索引文件" - -#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 -msgid "diff_setup_done failed" -msgstr "diff_setup_done 失败" - -#: builtin/checkout.c:414 +#: builtin/checkout.c:480 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:533 +#: builtin/checkout.c:601 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "不能对 '%s' 执行 reflog 操作\n" -#: builtin/checkout.c:566 +#: builtin/checkout.c:634 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:573 +#: builtin/checkout.c:641 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:576 +#: builtin/checkout.c:644 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:580 +#: builtin/checkout.c:648 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:582 +#: builtin/checkout.c:650 builtin/checkout.c:987 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:584 +#: builtin/checkout.c:652 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:640 +#: builtin/checkout.c:708 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" #. The singular version -#: builtin/checkout.c:646 +#: builtin/checkout.c:714 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -1836,7 +3150,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:664 +#: builtin/checkout.c:732 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -1851,274 +3165,502 @@ msgstr "" " git branch new_branch_name %s\n" "\n" -#: builtin/checkout.c:694 +#: builtin/checkout.c:762 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:698 +#: builtin/checkout.c:766 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:724 +#: builtin/checkout.c:793 builtin/checkout.c:982 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" #. case (1) -#: builtin/checkout.c:855 +#: builtin/checkout.c:918 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" #. case (1): want a tree -#: builtin/checkout.c:894 +#: builtin/checkout.c:957 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:974 -msgid "-B cannot be used with -b" -msgstr "-B 不能和 -b 共用" +#: builtin/checkout.c:996 +msgid "paths cannot be used with switching branches" +msgstr "路径不能和切换分支同时使用" + +#: builtin/checkout.c:999 builtin/checkout.c:1003 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "'%s' 不能和切换分支同时使用" + +#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015 +#: builtin/checkout.c:1018 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:983 -msgid "--patch is incompatible with all other options" -msgstr "--patch 选项和其他选项不兼容" +#: builtin/checkout.c:1023 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:986 -msgid "--detach cannot be used with -b/-B/--orphan" -msgstr "--detach 不能和 -b/-B/--orphan 共用" +#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90 +#: builtin/remote.c:169 builtin/remote.c:171 +msgid "branch" +msgstr "分支" -#: builtin/checkout.c:988 -msgid "--detach cannot be used with -t" -msgstr "--detach 不能和 -t 共用" +#: builtin/checkout.c:1046 +msgid "create and checkout a new branch" +msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:994 -msgid "--track needs a branch name" -msgstr "--track 需要一个分支名" +#: builtin/checkout.c:1048 +msgid "create/reset and checkout a branch" +msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1001 -msgid "Missing branch name; try -b" -msgstr "缺少分支名；尝试 -b" +#: builtin/checkout.c:1049 +msgid "create reflog for new branch" +msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1007 -msgid "--orphan and -b|-B are mutually exclusive" -msgstr "--orphan 和 -b|-B 互斥" +#: builtin/checkout.c:1050 +msgid "detach the HEAD at named commit" +msgstr "成为指向该提交的分离头指针" -#: builtin/checkout.c:1009 -msgid "--orphan cannot be used with -t" -msgstr "--orphan 不能和 -t 共用" +#: builtin/checkout.c:1051 +msgid "set upstream info for new branch" +msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1019 -msgid "git checkout: -f and -m are incompatible" -msgstr "git checkout：-f 和 -m 不兼容" +#: builtin/checkout.c:1053 +msgid "new branch" +msgstr "新分支" #: builtin/checkout.c:1053 +msgid "new unparented branch" +msgstr "新的没有父提交的分支" + +#: builtin/checkout.c:1054 +msgid "checkout our version for unmerged files" +msgstr "对尚未合并的文件检出我们的版本" + +#: builtin/checkout.c:1056 +msgid "checkout their version for unmerged files" +msgstr "对尚未合并的文件检出他们的版本" + +#: builtin/checkout.c:1058 +msgid "force checkout (throw away local modifications)" +msgstr "强制检出（丢弃本地修改）" + +#: builtin/checkout.c:1059 +msgid "perform a 3-way merge with the new branch" +msgstr "和新的分支执行三路合并" + +#: builtin/checkout.c:1060 builtin/merge.c:217 +msgid "update ignored files (default)" +msgstr "更新忽略的文件（默认）" + +#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245 +msgid "style" +msgstr "风格" + +#: builtin/checkout.c:1062 +msgid "conflict style (merge or diff3)" +msgstr "冲突输出风格（merge 或 diff3）" + +#: builtin/checkout.c:1065 +msgid "do not limit pathspecs to sparse entries only" +msgstr "对路径不做稀疏检出的限制" + +#: builtin/checkout.c:1067 +msgid "second guess 'git checkout no-such-branch'" +msgstr "再者猜测'git checkout no-such-branch'" + +#: builtin/checkout.c:1091 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "-b、-B 和 --orphan 是互斥的" + +#: builtin/checkout.c:1108 +msgid "--track needs a branch name" +msgstr "--track 需要一个分支名" + +#: builtin/checkout.c:1115 +msgid "Missing branch name; try -b" +msgstr "缺少分支名；尝试 -b" + +#: builtin/checkout.c:1150 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1061 +#: builtin/checkout.c:1157 #, c-format msgid "" -"git checkout: updating paths is incompatible with switching branches.\n" +"Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -"git checkout：更新路径和切换分支不兼容。\n" -"您是想要检出 '%s' 但未能将其解析为提交么？" - -#: builtin/checkout.c:1063 -msgid "git checkout: updating paths is incompatible with switching branches." -msgstr "git checkout：更新路径和切换分支不兼容。" +"不能同时更新路径并切换到分支'%s'。\n" +"您是想要检出 '%s' 但其未能解析为提交么？" -#: builtin/checkout.c:1068 -msgid "git checkout: --detach does not take a path argument" -msgstr "git checkout：--detach 不跟路径参数" +#: builtin/checkout.c:1162 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1166 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/checkout.c:1090 -msgid "Cannot switch branch to a non-commit." -msgstr "无法切换分支到一个非提交。" +#: builtin/clean.c:20 +msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." + +#: builtin/clean.c:24 +#, c-format +msgid "Removing %s\n" +msgstr "正删除 %s\n" + +#: builtin/clean.c:25 +#, c-format +msgid "Would remove %s\n" +msgstr "将删除 %s\n" + +#: builtin/clean.c:26 +#, c-format +msgid "Skipping repository %s\n" +msgstr "忽略版本库 %s\n" + +#: builtin/clean.c:27 +#, c-format +msgid "Would skip repository %s\n" +msgstr "将忽略版本库 %s\n" + +#: builtin/clean.c:28 +#, c-format +msgid "failed to remove %s" +msgstr "无法删除 %s" + +#: builtin/clean.c:160 +msgid "do not print names of files removed" +msgstr "不打印删除文件的名称" + +#: builtin/clean.c:162 +msgid "force" +msgstr "强制" -#: builtin/checkout.c:1093 -msgid "--ours/--theirs is incompatible with switching branches." -msgstr "--ours/--theirs 和切换分支不兼容。" +#: builtin/clean.c:164 +msgid "remove whole directories" +msgstr "删除整个目录" -#: builtin/clean.c:78 +#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717 +#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182 +msgid "pattern" +msgstr "模式" + +#: builtin/clean.c:166 +msgid "add <pattern> to ignore rules" +msgstr "添加<模式>到忽略规则" + +#: builtin/clean.c:167 +msgid "remove ignored files, too" +msgstr "也删除忽略的文件" + +#: builtin/clean.c:169 +msgid "remove only ignored files" +msgstr "只删除忽略的文件" + +#: builtin/clean.c:187 msgid "-x and -X cannot be used together" -msgstr "-x 和 -X 不能共用" +msgstr "-x 和 -X 不能同时使用" -#: builtin/clean.c:82 +#: builtin/clean.c:191 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:85 +#: builtin/clean.c:194 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" -msgstr "将删除 %s\n" +#: builtin/clone.c:37 +msgid "git clone [options] [--] <repo> [<dir>]" +msgstr "git clone [选项] [--] <版本库> [<路径>]" -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" -msgstr "正删除 %s\n" +#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214 +#: builtin/push.c:436 +msgid "force progress reporting" +msgstr "强制显示进度报告" -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" -msgstr "无法删除 %s" +#: builtin/clone.c:67 +msgid "don't create a checkout" +msgstr "不创建一个检出" -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" -msgstr "不会删除 %s\n" +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 +msgid "create a bare repository" +msgstr "创建一个裸版本库" -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" -msgstr "未删除 %s\n" +#: builtin/clone.c:73 +msgid "create a mirror repository (implies bare)" +msgstr "创建一个镜像版本库（也是裸版本库）" -#: builtin/clone.c:243 -#, c-format -msgid "reference repository '%s' is not a local directory." -msgstr "引用版本库 '%s' 不是一个本地目录。" +#: builtin/clone.c:75 +msgid "to clone from a local repository" +msgstr "从本地版本库克隆" + +#: builtin/clone.c:77 +msgid "don't use local hardlinks, always copy" +msgstr "不使用本地硬链接，始终复制" -#: builtin/clone.c:302 +#: builtin/clone.c:79 +msgid "setup as shared repository" +msgstr "设置为共享版本库" + +#: builtin/clone.c:81 builtin/clone.c:83 +msgid "initialize submodules in the clone" +msgstr "在克隆时初始化子模组" + +#: builtin/clone.c:84 builtin/init-db.c:485 +msgid "template-directory" +msgstr "模板目录" + +#: builtin/clone.c:85 builtin/init-db.c:486 +msgid "directory from which templates will be used" +msgstr "模板目录将被使用" + +#: builtin/clone.c:87 +msgid "reference repository" +msgstr "引用版本库" + +#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +msgid "name" +msgstr "名称" + +#: builtin/clone.c:89 +msgid "use <name> instead of 'origin' to track upstream" +msgstr "使用<名称>而不是 'origin' 去跟踪上游" + +#: builtin/clone.c:91 +msgid "checkout <branch> instead of the remote's HEAD" +msgstr "检出<分支>而不是远程HEAD" + +#: builtin/clone.c:93 +msgid "path to git-upload-pack on the remote" +msgstr "远程 git-upload-pack 路径" + +#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662 +msgid "depth" +msgstr "深度" + +#: builtin/clone.c:95 +msgid "create a shallow clone of that depth" +msgstr "创建一个指定深度的浅克隆" + +#: builtin/clone.c:97 +msgid "clone only one branch, HEAD or --branch" +msgstr "只克隆一个分支、HEAD 或 --branch" + +#: builtin/clone.c:98 builtin/init-db.c:494 +msgid "gitdir" +msgstr "git目录" + +#: builtin/clone.c:99 builtin/init-db.c:495 +msgid "separate git dir from working tree" +msgstr "git目录和工作区分离" + +#: builtin/clone.c:100 +msgid "key=value" +msgstr "key=value" + +#: builtin/clone.c:101 +msgid "set config inside the new repository" +msgstr "在新版本库中设置配置信息" + +#: builtin/clone.c:254 #, c-format -msgid "failed to open '%s'" -msgstr "无法打开 '%s'" +msgid "reference repository '%s' is not a local repository." +msgstr "引用版本库 '%s' 不是一个本地版本库。" -#: builtin/clone.c:306 +#: builtin/clone.c:317 #, c-format msgid "failed to create directory '%s'" msgstr "无法创建目录 '%s'" -#: builtin/clone.c:308 builtin/diff.c:75 +#: builtin/clone.c:319 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "无法枚举 '%s' 状态" -#: builtin/clone.c:310 +#: builtin/clone.c:321 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" -#: builtin/clone.c:324 +#: builtin/clone.c:335 #, c-format msgid "failed to stat %s\n" msgstr "无法枚举 %s 状态\n" -#: builtin/clone.c:341 -#, c-format -msgid "failed to unlink '%s'" -msgstr "无法删除 '%s'" - -#: builtin/clone.c:346 +#: builtin/clone.c:357 #, c-format msgid "failed to create link '%s'" msgstr "无法创建链接 '%s'" -#: builtin/clone.c:350 +#: builtin/clone.c:361 #, c-format msgid "failed to copy file to '%s'" msgstr "无法拷贝文件至 '%s'" -#: builtin/clone.c:373 +#: builtin/clone.c:384 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:440 +#: builtin/clone.c:397 +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry the checkout with 'git checkout -f HEAD'\n" +msgstr "" +"克隆成功，但是检出失败。\n" +"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" +"'git checkout -f HEAD' 重试\n" + +#: builtin/clone.c:476 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:549 +#: builtin/clone.c:550 +msgid "remote did not send all necessary objects" +msgstr "远程没有发送所有必须的对象" + +#: builtin/clone.c:610 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:639 +#: builtin/clone.c:641 +msgid "unable to checkout working tree" +msgstr "不能检出工作区" + +#: builtin/clone.c:749 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:643 +#: builtin/clone.c:753 msgid "You must specify a repository to clone." msgstr "您必须指定一个版本库来克隆。" -#: builtin/clone.c:654 +#: builtin/clone.c:764 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:668 +#: builtin/clone.c:767 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "--bare 和 --separate-git-dir 选项不兼容。" + +#: builtin/clone.c:780 #, c-format msgid "repository '%s' does not exist" msgstr "版本库 '%s' 不存在" -#: builtin/clone.c:673 +#: builtin/clone.c:785 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" -#: builtin/clone.c:683 +#: builtin/clone.c:795 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:693 +#: builtin/clone.c:805 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:706 builtin/clone.c:720 +#: builtin/clone.c:818 builtin/clone.c:830 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:709 +#: builtin/clone.c:821 #, c-format msgid "could not create work tree dir '%s'." msgstr "不能为 '%s' 创建工作区目录。" -#: builtin/clone.c:728 +#: builtin/clone.c:840 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到裸版本库 '%s'...\n" -#: builtin/clone.c:730 +#: builtin/clone.c:842 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:786 +#: builtin/clone.c:877 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" -#: builtin/clone.c:835 +#: builtin/clone.c:926 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:842 +#: builtin/clone.c:933 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" +#: builtin/column.c:9 +msgid "git column [options]" +msgstr "git column [选项]" + +#: builtin/column.c:26 +msgid "lookup config vars" +msgstr "查找配置变量" + +#: builtin/column.c:27 builtin/column.c:28 +msgid "layout to use" +msgstr "要使用的布局" + +#: builtin/column.c:29 +msgid "Maximum width" +msgstr "最大宽度" + +#: builtin/column.c:30 +msgid "Padding space on left border" +msgstr "左边框的填充空间" + +#: builtin/column.c:31 +msgid "Padding space on right border" +msgstr "右边框的填充空间" + +#: builtin/column.c:32 +msgid "Padding space between columns" +msgstr "两列之间的填充空间" + #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" -#: builtin/commit.c:43 +#: builtin/commit.c:34 +msgid "git commit [options] [--] <pathspec>..." +msgstr "git commit [选项] [--] <路径匹配>..." + +#: builtin/commit.c:39 +msgid "git status [options] [--] <pathspec>..." +msgstr "git status [选项] [--] <路径匹配>..." + +#: builtin/commit.c:44 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -2141,7 +3683,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:55 +#: builtin/commit.c:56 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" @@ -2150,7 +3692,7 @@ msgstr "" "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" -#: builtin/commit.c:60 +#: builtin/commit.c:61 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -2166,93 +3708,93 @@ msgstr "" "\n" "否则，请使用命令 'git reset'\n" -#: builtin/commit.c:253 +#: builtin/commit.c:260 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" -#: builtin/commit.c:295 +#: builtin/commit.c:302 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:301 +#: builtin/commit.c:308 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405 +#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:386 +#: builtin/commit.c:393 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:388 +#: builtin/commit.c:395 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:398 +#: builtin/commit.c:405 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:418 +#: builtin/commit.c:425 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:493 builtin/commit.c:499 +#: builtin/commit.c:513 builtin/commit.c:519 #, c-format msgid "invalid commit: %s" msgstr "无效的提交：%s" -#: builtin/commit.c:522 +#: builtin/commit.c:542 msgid "malformed --author parameter" msgstr "非法的 --author 参数" -#: builtin/commit.c:582 +#: builtin/commit.c:562 #, c-format msgid "Malformed ident string: '%s'" msgstr "非法的身份字符串：'%s'" -#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967 +#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:632 builtin/shortlog.c:296 +#: builtin/commit.c:612 builtin/shortlog.c:270 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:634 +#: builtin/commit.c:614 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:638 +#: builtin/commit.c:618 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:644 +#: builtin/commit.c:624 msgid "commit has empty message" msgstr "提交说明为空" -#: builtin/commit.c:660 +#: builtin/commit.c:640 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:664 +#: builtin/commit.c:644 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:668 +#: builtin/commit.c:648 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: builtin/commit.c:720 +#: builtin/commit.c:709 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:731 +#: builtin/commit.c:720 #, c-format msgid "" "\n" @@ -2262,11 +3804,11 @@ msgid "" "and try again.\n" msgstr "" "\n" -"看起来您正在做一个合并提交。如果不对，请删除文件\n" +"似乎您正在做一个合并提交。如果不对，请删除文件\n" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:736 +#: builtin/commit.c:725 #, c-format msgid "" "\n" @@ -2276,182 +3818,379 @@ msgid "" "and try again.\n" msgstr "" "\n" -"看起来您正在做一个拣选提交。如果不对，请删除文件\n" +"似乎您正在做一个拣选提交。如果不对，请删除文件\n" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:748 +#: builtin/commit.c:737 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -"请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交\n" +"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:753 +#: builtin/commit.c:742 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be kept; you may remove them yourself if you want to.\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -"请为您的变更输入提交说明。以 '#' 开始的行将被保留，您可以删除它们\n" -"如果您想这样做的话。而一个空的提交说明将会终止提交。\n" +"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您原意\n" +"也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:766 +#: builtin/commit.c:755 #, c-format msgid "%sAuthor: %s" msgstr "%s作者： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:773 +#: builtin/commit.c:762 #, c-format msgid "%sCommitter: %s" msgstr "%s提交者： %s" -#: builtin/commit.c:793 +#: builtin/commit.c:782 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:830 +#: builtin/commit.c:819 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:845 builtin/tag.c:361 +#: builtin/commit.c:834 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" -msgstr "请使用 -m 或者 -F 选项提供提交说明。\n" +msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:942 +#: builtin/commit.c:931 #, c-format msgid "No existing author found with '%s'" msgstr "没有找到匹配 '%s' 的作者" -#: builtin/commit.c:957 builtin/commit.c:1157 +#: builtin/commit.c:946 builtin/commit.c:1140 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:997 +#: builtin/commit.c:976 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1008 +#: builtin/commit.c:987 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1011 +#: builtin/commit.c:990 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1013 +#: builtin/commit.c:992 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1016 +#: builtin/commit.c:995 msgid "Options --squash and --fixup cannot be used together" -msgstr "选项 --squash 和 --fixup 不能共用" +msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1026 +#: builtin/commit.c:1005 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1028 +#: builtin/commit.c:1007 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." -msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。" +msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" -#: builtin/commit.c:1036 +#: builtin/commit.c:1015 msgid "--reset-author can be used only with -C, -c or --amend." -msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。" +msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1053 +#: builtin/commit.c:1032 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1055 +#: builtin/commit.c:1034 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1057 +#: builtin/commit.c:1036 msgid "Clever... amending the last one with dirty index." msgstr "聪明... 在索引不干净下修补最后的提交。" -#: builtin/commit.c:1059 +#: builtin/commit.c:1038 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..." -#: builtin/commit.c:1069 builtin/tag.c:577 +#: builtin/commit.c:1048 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" -#: builtin/commit.c:1074 +#: builtin/commit.c:1053 msgid "Paths with -a does not make sense." -msgstr "路径和 -a 选项共用没有意义。" +msgstr "路径和 -a 选项同时使用没有意义。" + +#: builtin/commit.c:1059 builtin/commit.c:1194 +msgid "--long and -z are incompatible" +msgstr "--long 和 -z 选项不兼容" + +#: builtin/commit.c:1154 builtin/commit.c:1390 +msgid "show status concisely" +msgstr "以简洁的格式显示状态" + +#: builtin/commit.c:1156 builtin/commit.c:1392 +msgid "show branch information" +msgstr "显示分支信息" -#: builtin/commit.c:1257 +#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426 +msgid "machine-readable output" +msgstr "机器可读的输出" + +#: builtin/commit.c:1161 builtin/commit.c:1396 +msgid "show status in long format (default)" +msgstr "以长格式显示状态（默认）" + +#: builtin/commit.c:1164 builtin/commit.c:1399 +msgid "terminate entries with NUL" +msgstr "条目以NUL字符结尾" + +#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659 +#: builtin/fast-export.c:662 builtin/tag.c:459 +msgid "mode" +msgstr "模式" + +#: builtin/commit.c:1167 builtin/commit.c:1402 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" + +#: builtin/commit.c:1170 +msgid "show ignored files" +msgstr "显示忽略的文件" + +#: builtin/commit.c:1171 parse-options.h:151 +msgid "when" +msgstr "何时" + +#: builtin/commit.c:1172 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" +"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" + +#: builtin/commit.c:1174 +msgid "list untracked files in columns" +msgstr "以列的方式显示未跟踪的文件" + +#: builtin/commit.c:1248 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1259 +#: builtin/commit.c:1250 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1300 +#: builtin/commit.c:1291 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:1302 +#: builtin/commit.c:1293 msgid " (root-commit)" msgstr "（根提交）" -#: builtin/commit.c:1446 +#: builtin/commit.c:1360 +msgid "suppress summary after successful commit" +msgstr "提交成功后不显示概述信息" + +#: builtin/commit.c:1361 +msgid "show diff in commit message template" +msgstr "在提交说明模板里显示差异" + +#: builtin/commit.c:1363 +msgid "Commit message options" +msgstr "提交说明选项" + +#: builtin/commit.c:1364 builtin/tag.c:457 +msgid "read message from file" +msgstr "从文件中读取提交说明" + +#: builtin/commit.c:1365 +msgid "author" +msgstr "作者" + +#: builtin/commit.c:1365 +msgid "override author for commit" +msgstr "提交时覆盖作者" + +#: builtin/commit.c:1366 builtin/gc.c:178 +msgid "date" +msgstr "日期" + +#: builtin/commit.c:1366 +msgid "override date for commit" +msgstr "提交时覆盖日期" + +#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533 +#: builtin/notes.c:690 builtin/tag.c:455 +msgid "message" +msgstr "说明" + +#: builtin/commit.c:1367 +msgid "commit message" +msgstr "提交说明" + +#: builtin/commit.c:1368 +msgid "reuse and edit message from specified commit" +msgstr "重用并编辑指定提交的提交说明" + +#: builtin/commit.c:1369 +msgid "reuse message from specified commit" +msgstr "重用指定提交的提交说明" + +#: builtin/commit.c:1370 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" + +#: builtin/commit.c:1371 +msgid "use autosquash formatted message to squash specified commit" +msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" + +#: builtin/commit.c:1372 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" + +#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109 +msgid "add Signed-off-by:" +msgstr "添加 Signed-off-by: 签名" + +#: builtin/commit.c:1374 +msgid "use specified template file" +msgstr "使用指定的模板文件" + +#: builtin/commit.c:1375 +msgid "force edit of commit" +msgstr "强制编辑提交" + +# 译者：可选值，不能翻译（或是原文中笔误，应为 mode） +#: builtin/commit.c:1376 +msgid "default" +msgstr "default" + +#: builtin/commit.c:1376 builtin/tag.c:460 +msgid "how to strip spaces and #comments from message" +msgstr "设置如何删除提交说明里的空格和#注释" + +#: builtin/commit.c:1377 +msgid "include status in commit message template" +msgstr "在提交说明模板里包含状态信息" + +#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461 +msgid "key id" +msgstr "key id" + +#: builtin/commit.c:1379 builtin/merge.c:216 +msgid "GPG sign commit" +msgstr "GPG 提交签名" + +#. end commit message options +#: builtin/commit.c:1382 +msgid "Commit contents options" +msgstr "提交内容选项" + +#: builtin/commit.c:1383 +msgid "commit all changed files" +msgstr "提交所有改动的文件" + +#: builtin/commit.c:1384 +msgid "add specified files to index for commit" +msgstr "添加指定的文件到索引区等待提交" + +#: builtin/commit.c:1385 +msgid "interactively add files" +msgstr "交互式添加文件" + +#: builtin/commit.c:1386 +msgid "interactively add changes" +msgstr "交互式添加变更" + +#: builtin/commit.c:1387 +msgid "commit only specified files" +msgstr "只提交指定的文件" + +#: builtin/commit.c:1388 +msgid "bypass pre-commit hook" +msgstr "绕过 pre-commit 钩子" + +#: builtin/commit.c:1389 +msgid "show what would be committed" +msgstr "显示将要提交的内容" + +#: builtin/commit.c:1400 +msgid "amend previous commit" +msgstr "修改先前的提交" + +#: builtin/commit.c:1401 +msgid "bypass post-rewrite hook" +msgstr "绕过 post-rewrite 钩子" + +#: builtin/commit.c:1406 +msgid "ok to record an empty change" +msgstr "允许一个空提交" + +#: builtin/commit.c:1409 +msgid "ok to record a change with an empty message" +msgstr "允许空的提交说明" + +#: builtin/commit.c:1441 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1484 builtin/merge.c:509 +#: builtin/commit.c:1479 builtin/merge.c:510 #, c-format msgid "could not open '%s' for reading" msgstr "不能为读入打开 '%s'" -#: builtin/commit.c:1491 +#: builtin/commit.c:1486 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1498 +#: builtin/commit.c:1493 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1517 +#: builtin/commit.c:1512 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1531 +#: builtin/commit.c:1526 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1536 +#: builtin/commit.c:1531 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/commit.c:1572 +#: builtin/commit.c:1567 msgid "cannot lock HEAD ref" msgstr "无法锁定 HEAD 引用" -#: builtin/commit.c:1576 +#: builtin/commit.c:1571 msgid "cannot update HEAD ref" msgstr "无法更新 HEAD 引用" -#: builtin/commit.c:1587 +#: builtin/commit.c:1582 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -2460,47 +4199,179 @@ msgstr "" "版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n" "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。" -#: builtin/describe.c:234 +#: builtin/config.c:7 +msgid "git config [options]" +msgstr "git config [选项]" + +#: builtin/config.c:51 +msgid "Config file location" +msgstr "配置文件位置" + +#: builtin/config.c:52 +msgid "use global config file" +msgstr "使用全局配置文件" + +#: builtin/config.c:53 +msgid "use system config file" +msgstr "使用系统级配置文件" + +#: builtin/config.c:54 +msgid "use repository config file" +msgstr "使用版本库级配置文件" + +#: builtin/config.c:55 +msgid "use given config file" +msgstr "使用指定的配置文件" + +#: builtin/config.c:56 +msgid "Action" +msgstr "操作" + +#: builtin/config.c:57 +msgid "get value: name [value-regex]" +msgstr "获取值：name [value-regex]" + +#: builtin/config.c:58 +msgid "get all values: key [value-regex]" +msgstr "获得所有的值：key [value-regex]" + +#: builtin/config.c:59 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "根据正则表达式获得值：name-regex [value-regex]" + +#: builtin/config.c:60 +msgid "replace all matching variables: name value [value_regex]" +msgstr "替换所有匹配的变量：name value [value_regex]" + +#: builtin/config.c:61 +msgid "add a new variable: name value" +msgstr "添加一个新的变量：name value" + +#: builtin/config.c:62 +msgid "remove a variable: name [value-regex]" +msgstr "删除一个变量：name [value-regex]" + +#: builtin/config.c:63 +msgid "remove all matches: name [value-regex]" +msgstr "删除所有匹配项：name [value-regex]" + +#: builtin/config.c:64 +msgid "rename section: old-name new-name" +msgstr "重命名小节：old-name new-name" + +#: builtin/config.c:65 +msgid "remove a section: name" +msgstr "删除一个小节：name" + +#: builtin/config.c:66 +msgid "list all" +msgstr "列出所有" + +#: builtin/config.c:67 +msgid "open an editor" +msgstr "打开一个编辑器" + +#: builtin/config.c:68 builtin/config.c:69 +msgid "slot" +msgstr "slot" + +#: builtin/config.c:68 +msgid "find the color configured: [default]" +msgstr "找到配置的颜色：[默认]" + +#: builtin/config.c:69 +msgid "find the color setting: [stdout-is-tty]" +msgstr "找到颜色设置：[stdout-is-tty]" + +#: builtin/config.c:70 +msgid "Type" +msgstr "类型" + +#: builtin/config.c:71 +msgid "value is \"true\" or \"false\"" +msgstr "值是 \"true\" 或 \"false\"" + +#: builtin/config.c:72 +msgid "value is decimal number" +msgstr "值是十进制数" + +#: builtin/config.c:73 +msgid "value is --bool or --int" +msgstr "值是 --bool or --int" + +#: builtin/config.c:74 +msgid "value is a path (file or directory name)" +msgstr "值是一个路径（文件或目录名）" + +#: builtin/config.c:75 +msgid "Other" +msgstr "其它" + +#: builtin/config.c:76 +msgid "terminate values with NUL byte" +msgstr "终止值是NUL字节" + +#: builtin/config.c:77 +msgid "respect include directives on lookup" +msgstr "查询时参照 include 指令递归查找" + +#: builtin/count-objects.c:82 +msgid "git count-objects [-v] [-H | --human-readable]" +msgstr "git count-objects [-v] [-H | --human-readable]" + +#: builtin/count-objects.c:97 +msgid "print sizes in human readable format" +msgstr "以用户可读的格式显示大小" + +#: builtin/describe.c:15 +msgid "git describe [options] <committish>*" +msgstr "git describe [选项] <提交号>*" + +#: builtin/describe.c:16 +msgid "git describe [options] --dirty" +msgstr "git describe [选项] --dirty" + +#: builtin/describe.c:233 #, c-format msgid "annotated tag %s not available" msgstr "注释 tag %s 无效" -#: builtin/describe.c:238 +#: builtin/describe.c:237 #, c-format msgid "annotated tag %s has no embedded name" msgstr "注释 tag %s 没有嵌入名称" -#: builtin/describe.c:240 +#: builtin/describe.c:239 #, c-format msgid "tag '%s' is really '%s' here" msgstr "tag '%s' 的确是在 '%s'" -#: builtin/describe.c:267 +#: builtin/describe.c:266 #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" -#: builtin/describe.c:270 +#: builtin/describe.c:269 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: builtin/describe.c:287 +#: builtin/describe.c:286 #, c-format msgid "no tag exactly matches '%s'" msgstr "没有 tag 准确匹配 '%s'" -#: builtin/describe.c:289 +#: builtin/describe.c:288 #, c-format msgid "searching to describe %s\n" msgstr "搜索描述 %s\n" -#: builtin/describe.c:329 +#: builtin/describe.c:328 #, c-format msgid "finished search at %s\n" msgstr "完成搜索 %s\n" -#: builtin/describe.c:353 +#: builtin/describe.c:352 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -2509,7 +4380,7 @@ msgstr "" "没有注释 tag 能描述 '%s'。\n" "然而，有非注释 tag：尝试 --tags。" -#: builtin/describe.c:357 +#: builtin/describe.c:356 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -2518,12 +4389,12 @@ msgstr "" "没有注释 tag 能描述 '%s'。\n" "尝试 --always，或者创建一些 tag。" -#: builtin/describe.c:378 +#: builtin/describe.c:377 #, c-format msgid "traversed %lu commits\n" msgstr "已遍历 %lu 个提交\n" -#: builtin/describe.c:381 +#: builtin/describe.c:380 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -2532,123 +4403,292 @@ msgstr "" "发现多于 %i 个 tag，列出最近的 %i 个\n" "在 %s 放弃搜索\n" -#: builtin/describe.c:436 +#: builtin/describe.c:402 +msgid "find the tag that comes after the commit" +msgstr "寻找提交之后的 tag（用于描述提交）" + +#: builtin/describe.c:403 +msgid "debug search strategy on stderr" +msgstr "在标准错误上调试搜索策略" + +#: builtin/describe.c:404 +msgid "use any ref" +msgstr "使用任意引用" + +#: builtin/describe.c:405 +msgid "use any tag, even unannotated" +msgstr "使用任意 tag，即使未带注解" + +#: builtin/describe.c:406 +msgid "always use long format" +msgstr "始终使用长提交号格式" + +#: builtin/describe.c:409 +msgid "only output exact matches" +msgstr "只输出精确匹配" + +#: builtin/describe.c:411 +msgid "consider <n> most recent tags (default: 10)" +msgstr "考虑最近 <n> 个 tags（默认：10）" + +#: builtin/describe.c:413 +msgid "only consider tags matching <pattern>" +msgstr "只考虑匹配 <模式> 的 tags" + +#: builtin/describe.c:415 builtin/name-rev.c:238 +msgid "show abbreviated commit object as fallback" +msgstr "显示简写的提交号作为后备" + +#: builtin/describe.c:416 +msgid "mark" +msgstr "标记" + +#: builtin/describe.c:417 +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）" + +#: builtin/describe.c:435 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 不兼容" -#: builtin/describe.c:462 +#: builtin/describe.c:461 msgid "No names found, cannot describe anything." msgstr "没有发现名称，无法描述任何东西。" -#: builtin/describe.c:482 +#: builtin/describe.c:481 msgid "--dirty is incompatible with committishes" -msgstr "--dirty 不能与提交共用" +msgstr "--dirty 不能与提交同时使用" -#: builtin/diff.c:77 +#: builtin/diff.c:79 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个正规文件或符号链接" -#: builtin/diff.c:220 +#: builtin/diff.c:228 #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" -#: builtin/diff.c:297 +#: builtin/diff.c:305 msgid "Not a git repository" msgstr "不是一个 git 版本库" -#: builtin/diff.c:347 +#: builtin/diff.c:348 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:352 +#: builtin/diff.c:353 #, c-format msgid "more than %d trees given: '%s'" msgstr "提供了超过 %d 个树对象：'%s'" -#: builtin/diff.c:362 +#: builtin/diff.c:363 #, c-format msgid "more than two blobs given: '%s'" -msgstr "提供了超过两个 blob 对象：'%s'" +msgstr "提供了超过两个数据（blob）对象：'%s'" -#: builtin/diff.c:370 +#: builtin/diff.c:371 #, c-format msgid "unhandled object '%s' given." msgstr "提供了无法处理的对象 '%s'。" -#: builtin/fetch.c:200 +#: builtin/fast-export.c:22 +msgid "git fast-export [rev-list-opts]" +msgstr "git fast-export [rev-list-opts]" + +#: builtin/fast-export.c:658 +msgid "show progress after <n> objects" +msgstr "在 <n> 个对象之后显示进度" + +#: builtin/fast-export.c:660 +msgid "select handling of signed tags" +msgstr "选择如何处理签名 tags" + +#: builtin/fast-export.c:663 +msgid "select handling of tags that tag filtered objects" +msgstr "选择当 tag 指向被过滤时 tags 的处理方式" + +#: builtin/fast-export.c:666 +msgid "Dump marks to this file" +msgstr "把标记存储到这个文件" + +#: builtin/fast-export.c:668 +msgid "Import marks from this file" +msgstr "从这个文件导入标记" + +#: builtin/fast-export.c:670 +msgid "Fake a tagger when tags lack one" +msgstr "当 tags 缺少标记者字段时，假装提供一个" + +#: builtin/fast-export.c:672 +msgid "Output full tree for each commit" +msgstr "每次提交都输出整个树" + +#: builtin/fast-export.c:674 +msgid "Use the done feature to terminate the stream" +msgstr "使用 done 功能来终止流" + +#: builtin/fast-export.c:675 +msgid "Skip output of blob data" +msgstr "跳过数据对象的输出" + +#: builtin/fetch.c:20 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]" + +#: builtin/fetch.c:21 +msgid "git fetch [<options>] <group>" +msgstr "git fetch [<选项>] <组>" + +#: builtin/fetch.c:22 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]" + +#: builtin/fetch.c:23 +msgid "git fetch --all [<options>]" +msgstr "git fetch --all [<选项>]" + +#: builtin/fetch.c:60 +msgid "fetch from all remotes" +msgstr "从所有的远程抓取" + +#: builtin/fetch.c:62 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" + +#: builtin/fetch.c:64 +msgid "path to upload pack on remote end" +msgstr "上传包到远程的路径" + +#: builtin/fetch.c:65 +msgid "force overwrite of local branch" +msgstr "强制覆盖本地分支" + +#: builtin/fetch.c:67 +msgid "fetch from multiple remotes" +msgstr "从多个远程抓取" + +#: builtin/fetch.c:69 +msgid "fetch all tags and associated objects" +msgstr "抓取所有的 tags 和关联对象" + +#: builtin/fetch.c:71 +msgid "do not fetch all tags (--no-tags)" +msgstr "不抓取任何 tags (--no-tags)" + +#: builtin/fetch.c:73 +msgid "prune remote-tracking branches no longer on remote" +msgstr "清除远程已经不存在的分支的跟踪分支" + +# 译者：可选值，不能翻译 +#: builtin/fetch.c:74 +msgid "on-demand" +msgstr "on-demand" + +#: builtin/fetch.c:75 +msgid "control recursive fetching of submodules" +msgstr "控制子模组的递归抓取" + +#: builtin/fetch.c:79 +msgid "keep downloaded pack" +msgstr "保持下载包" + +#: builtin/fetch.c:81 +msgid "allow updating of HEAD ref" +msgstr "允许更新 HEAD 引用" + +#: builtin/fetch.c:84 +msgid "deepen history of shallow clone" +msgstr "深化浅克隆的历史" + +#: builtin/fetch.c:86 +msgid "convert to a complete repository" +msgstr "转换为一个完整的版本库" + +#: builtin/fetch.c:88 builtin/log.c:1130 +msgid "dir" +msgstr "目录" + +#: builtin/fetch.c:89 +msgid "prepend this to submodule path output" +msgstr "在子模组路径输出的前面加上此目录" + +#: builtin/fetch.c:92 +msgid "default mode for recursion" +msgstr "递归的默认模式" + +#: builtin/fetch.c:204 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:253 +#: builtin/fetch.c:257 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:259 +#: builtin/fetch.c:262 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:273 +#: builtin/fetch.c:276 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）" -#: builtin/fetch.c:274 builtin/fetch.c:360 +#: builtin/fetch.c:277 builtin/fetch.c:363 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:285 +#: builtin/fetch.c:288 msgid "[tag update]" msgstr "[tag更新]" # 译者：注意保持前导空格 -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 msgid " (unable to update local ref)" msgstr " （不能更新本地引用）" -#: builtin/fetch.c:305 +#: builtin/fetch.c:308 msgid "[new tag]" msgstr "[新tag]" -#: builtin/fetch.c:308 +#: builtin/fetch.c:311 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:311 +#: builtin/fetch.c:314 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:362 +#: builtin/fetch.c:365 msgid "(non-fast-forward)" msgstr "（非快进式）" -#: builtin/fetch.c:393 builtin/fetch.c:685 +#: builtin/fetch.c:396 builtin/fetch.c:688 #, c-format msgid "cannot open %s: %s\n" msgstr "无法打开 %s：%s\n" -#: builtin/fetch.c:402 +#: builtin/fetch.c:405 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必须的对象\n" -#: builtin/fetch.c:488 +#: builtin/fetch.c:491 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:499 +#: builtin/fetch.c:502 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -2658,82 +4698,209 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:549 +#: builtin/fetch.c:552 #, c-format msgid " (%s will become dangling)" -msgstr " （%s 将成为悬空状态）" +msgstr " （%s 将成为摇摆状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:550 +#: builtin/fetch.c:553 #, c-format msgid " (%s has become dangling)" -msgstr " （%s 已成为悬空状态）" +msgstr " （%s 已成为摇摆状态）" -#: builtin/fetch.c:557 +#: builtin/fetch.c:560 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:558 builtin/remote.c:1055 +#: builtin/fetch.c:561 builtin/remote.c:1055 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:675 +#: builtin/fetch.c:678 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非裸版本库的当前分支 %s" -#: builtin/fetch.c:709 +#: builtin/fetch.c:712 #, c-format msgid "Don't know how to fetch from %s" msgstr "不知道如何从 %s 获取" -#: builtin/fetch.c:786 +#: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:789 +#: builtin/fetch.c:792 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:894 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:890 builtin/remote.c:100 +#: builtin/fetch.c:896 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:907 +#: builtin/fetch.c:915 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。" -#: builtin/fetch.c:927 +#: builtin/fetch.c:935 msgid "You need to specify a tag name." msgstr "您需要指定一个 tag 名称。" -#: builtin/fetch.c:979 +#: builtin/fetch.c:981 +msgid "--depth and --unshallow cannot be used together" +msgstr "--depth 和 --unshallow 不能同时使用" + +#: builtin/fetch.c:983 +msgid "--unshallow on a complete repository does not make sense" +msgstr "对于一个完整的版本库，参数 --unshallow 没有意义" + +#: builtin/fetch.c:1002 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个版本库参数" -#: builtin/fetch.c:981 +#: builtin/fetch.c:1004 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用表达式没有任何意义" -#: builtin/fetch.c:992 +#: builtin/fetch.c:1015 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1023 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>]" + +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701 +#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 +msgid "n" +msgstr "n" + +#: builtin/fmt-merge-msg.c:664 +msgid "populate log with at most <n> entries from shortlog" +msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明" + +#: builtin/fmt-merge-msg.c:667 +msgid "alias for --log (deprecated)" +msgstr "参数 --log 的别名（已弃用）" + +#: builtin/fmt-merge-msg.c:670 +msgid "text" +msgstr "文本" + +#: builtin/fmt-merge-msg.c:671 +msgid "use <text> as start of message" +msgstr "使用 <文本> 作为提交说明的开始" + +#: builtin/fmt-merge-msg.c:672 +msgid "file to read from" +msgstr "从文件中读取" + +#: builtin/for-each-ref.c:979 +msgid "git for-each-ref [options] [<pattern>]" +msgstr "git for-each-ref [选项] [<模式>]" + +#: builtin/for-each-ref.c:994 +msgid "quote placeholders suitably for shells" +msgstr "引用占位符适用于 shells" + +#: builtin/for-each-ref.c:996 +msgid "quote placeholders suitably for perl" +msgstr "引用占位符适用于 perl" + +#: builtin/for-each-ref.c:998 +msgid "quote placeholders suitably for python" +msgstr "引用占位符适用于 python" + +#: builtin/for-each-ref.c:1000 +msgid "quote placeholders suitably for tcl" +msgstr "引用占位符适用于 tcl" + +#: builtin/for-each-ref.c:1003 +msgid "show only <n> matched refs" +msgstr "只显示 <n> 个匹配的引用" + +#: builtin/for-each-ref.c:1004 +msgid "format" +msgstr "格式" + +#: builtin/for-each-ref.c:1004 +msgid "format to use for the output" +msgstr "输出格式" + +#: builtin/for-each-ref.c:1005 +msgid "key" +msgstr "key" + +#: builtin/for-each-ref.c:1006 +msgid "field name to sort on" +msgstr "排序的字段名" + +#: builtin/fsck.c:608 +msgid "git fsck [options] [<object>...]" +msgstr "git fsck [选项] [<对象>...]" + +#: builtin/fsck.c:614 +msgid "show unreachable objects" +msgstr "显示不可达的对象" + +#: builtin/fsck.c:615 +msgid "show dangling objects" +msgstr "显示摇摆的对象" + +#: builtin/fsck.c:616 +msgid "report tags" +msgstr "报告 tags" + +#: builtin/fsck.c:617 +msgid "report root nodes" +msgstr "报告根节点" + +#: builtin/fsck.c:618 +msgid "make index objects head nodes" +msgstr "将索引亦作为检查的头节点" + +#: builtin/fsck.c:619 +msgid "make reflogs head nodes (default)" +msgstr "将引用日志作为检查的头节点（默认）" + +#: builtin/fsck.c:620 +msgid "also consider packs and alternate objects" +msgstr "也考虑包和备用对象" + +#: builtin/fsck.c:621 +msgid "enable more strict checking" +msgstr "启用更严格的检查" + +#: builtin/fsck.c:623 +msgid "write dangling objects in .git/lost-found" +msgstr "将摇摆对象写入 .git/lost-found 中" + +#: builtin/fsck.c:624 builtin/prune.c:134 +msgid "show progress" +msgstr "显示进度" + +#: builtin/gc.c:22 +msgid "git gc [options]" +msgstr "git gc [选项]" + #: builtin/gc.c:63 #, c-format msgid "Invalid %s: '%s'" @@ -2744,12 +4911,19 @@ msgstr "无效的 %s：'%s'" msgid "insanely long object directory %.*s" msgstr "不正常的长对象目录 %.*s" -#: builtin/gc.c:221 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" -msgstr "自动打包版本库以求最佳性能。\n" +#: builtin/gc.c:179 +msgid "prune unreferenced objects" +msgstr "清除未引用的对象" + +#: builtin/gc.c:181 +msgid "be more thorough (increased runtime)" +msgstr "更彻底（增加运行时间）" -#: builtin/gc.c:224 +#: builtin/gc.c:182 +msgid "enable auto-gc mode" +msgstr "启用自动垃圾回收模式" + +#: builtin/gc.c:222 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -2758,94 +4932,322 @@ msgstr "" "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n" "参见 \"git help gc\" 以获取更多信息。\n" -#: builtin/gc.c:251 +#: builtin/gc.c:249 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" -#: builtin/grep.c:216 +#: builtin/grep.c:22 +msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]" + +#: builtin/grep.c:217 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep：无法创建线程：%s" -#: builtin/grep.c:402 +#: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" msgstr "无法切换目录：%s" -#: builtin/grep.c:478 builtin/grep.c:512 +#: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" -#: builtin/grep.c:526 +#: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:584 +#: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:601 +#: builtin/grep.c:568 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: builtin/grep.c:885 +#: builtin/grep.c:643 +msgid "search in index instead of in the work tree" +msgstr "在索引区搜索而不是在工作区" + +#: builtin/grep.c:645 +msgid "find in contents not managed by git" +msgstr "在未被 git 管理的内容中查找" + +# 译者：中文字符串拼接，可删除前导空格 +#: builtin/grep.c:647 +msgid "search in both tracked and untracked files" +msgstr "在跟踪和未跟踪的文件中搜索" + +#: builtin/grep.c:649 +msgid "search also in ignored files" +msgstr "也在忽略的文件中搜索" + +#: builtin/grep.c:652 +msgid "show non-matching lines" +msgstr "显示未匹配的行" + +#: builtin/grep.c:654 +msgid "case insensitive matching" +msgstr "不区分大小写匹配" + +#: builtin/grep.c:656 +msgid "match patterns only at word boundaries" +msgstr "只在单词边界匹配模式" + +#: builtin/grep.c:658 +msgid "process binary files as text" +msgstr "把二进制文件当做文本处理" + +#: builtin/grep.c:660 +msgid "don't match patterns in binary files" +msgstr "不在二进制文件中匹配模式" + +#: builtin/grep.c:663 +msgid "descend at most <depth> levels" +msgstr "最多以指定的深度向下寻找" + +#: builtin/grep.c:667 +msgid "use extended POSIX regular expressions" +msgstr "使用扩展的 POSIX 正则表达式" + +#: builtin/grep.c:670 +msgid "use basic POSIX regular expressions (default)" +msgstr "使用基本的 POSIX 正则表达式（默认）" + +#: builtin/grep.c:673 +msgid "interpret patterns as fixed strings" +msgstr "把模式解析为固定的字符串" + +#: builtin/grep.c:676 +msgid "use Perl-compatible regular expressions" +msgstr "使用 Perl 兼容的正则表达式" + +#: builtin/grep.c:679 +msgid "show line numbers" +msgstr "显示行号" + +#: builtin/grep.c:680 +msgid "don't show filenames" +msgstr "不显示文件名" + +#: builtin/grep.c:681 +msgid "show filenames" +msgstr "显示文件名" + +#: builtin/grep.c:683 +msgid "show filenames relative to top directory" +msgstr "显示相对于顶级目录的文件名" + +#: builtin/grep.c:685 +msgid "show only filenames instead of matching lines" +msgstr "只显示文件名而不显示匹配的行" + +#: builtin/grep.c:687 +msgid "synonym for --files-with-matches" +msgstr "和 --files-with-matches 同义" + +#: builtin/grep.c:690 +msgid "show only the names of files without match" +msgstr "只显示未匹配的文件名" + +#: builtin/grep.c:692 +msgid "print NUL after filenames" +msgstr "在文件名后输出 NUL 字符" + +#: builtin/grep.c:694 +msgid "show the number of matches instead of matching lines" +msgstr "显示总匹配行数，而不显示匹配的行" + +#: builtin/grep.c:695 +msgid "highlight matches" +msgstr "高亮显示匹配项" + +#: builtin/grep.c:697 +msgid "print empty line between matches from different files" +msgstr "在不同文件的匹配项之间打印空行" + +#: builtin/grep.c:699 +msgid "show filename only once above matches from same file" +msgstr "只在同一文件的匹配项的上面显示一次文件名" + +#: builtin/grep.c:702 +msgid "show <n> context lines before and after matches" +msgstr "显示匹配项前后的 <n> 行上下文" + +#: builtin/grep.c:705 +msgid "show <n> context lines before matches" +msgstr "显示匹配项前 <n> 行上下文" + +#: builtin/grep.c:707 +msgid "show <n> context lines after matches" +msgstr "显示匹配项后 <n> 行上下文" + +#: builtin/grep.c:708 +msgid "shortcut for -C NUM" +msgstr "快捷键 -C 数字" + +#: builtin/grep.c:711 +msgid "show a line with the function name before matches" +msgstr "在匹配的前面显示一行函数名" + +#: builtin/grep.c:713 +msgid "show the surrounding function" +msgstr "显示所在函数的前后内容" + +#: builtin/grep.c:716 +msgid "read patterns from file" +msgstr "从文件读取模式" + +#: builtin/grep.c:718 +msgid "match <pattern>" +msgstr "匹配 <模式>" + +#: builtin/grep.c:720 +msgid "combine patterns specified with -e" +msgstr "组合用 -e 参数设定的模式" + +#: builtin/grep.c:732 +msgid "indicate hit with exit status without output" +msgstr "不输出，而用退出码标识命中状态" + +#: builtin/grep.c:734 +msgid "show only matches from files that match all patterns" +msgstr "只显示匹配所有模式的文件中的匹配" + +#: builtin/grep.c:736 +msgid "show parse tree for grep expression" +msgstr "显示 grep 表达式的解析树" + +#: builtin/grep.c:740 +msgid "pager" +msgstr "分页" + +#: builtin/grep.c:740 +msgid "show matching files in the pager" +msgstr "分页显示匹配的文件" + +#: builtin/grep.c:743 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "允许调用 grep(1)（本次构建忽略）" + +#: builtin/grep.c:744 builtin/show-ref.c:184 +msgid "show usage" +msgstr "显示用法" + +#: builtin/grep.c:811 msgid "no pattern given." msgstr "未提供模式匹配。" -#: builtin/grep.c:899 -#, c-format -msgid "bad object %s" -msgstr "坏对象 %s" - -#: builtin/grep.c:940 +#: builtin/grep.c:866 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:963 +#: builtin/grep.c:889 msgid "--cached or --untracked cannot be used with --no-index." -msgstr "--cached 或 --untracked 不能与 --no-index 共用。" +msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" -#: builtin/grep.c:968 +#: builtin/grep.c:894 msgid "--no-index or --untracked cannot be used with revs." -msgstr "--no-index 或 --untracked 不能和版本共用。" +msgstr "--no-index 或 --untracked 不能和版本同时使用。" -#: builtin/grep.c:971 +#: builtin/grep.c:897 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" -#: builtin/grep.c:979 +#: builtin/grep.c:905 msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" -#: builtin/help.c:59 +#: builtin/hash-object.c:60 +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " +"<file>..." +msgstr "" +"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:72 +msgid "type" +msgstr "类型" + +#: builtin/hash-object.c:72 +msgid "object type" +msgstr "对象类型" + +#: builtin/hash-object.c:73 +msgid "write the object into the object database" +msgstr "将对象写入对象数据库" + +#: builtin/hash-object.c:74 +msgid "read the object from stdin" +msgstr "从标准输入读取对象" + +#: builtin/hash-object.c:76 +msgid "store file as is without filters" +msgstr "原样存储文件不使用过滤器" + +#: builtin/hash-object.c:77 +msgid "process file as it were from this path" +msgstr "处理文件并假设其来自于此路径" + +#: builtin/help.c:43 +msgid "print all available commands" +msgstr "打印所有可用的命令" + +#: builtin/help.c:44 +msgid "print list of useful guides" +msgstr "显示有用的指南列表" + +#: builtin/help.c:45 +msgid "show man page" +msgstr "显示 man 手册" + +#: builtin/help.c:46 +msgid "show manual in web browser" +msgstr "在 web 浏览器中显示手册" + +#: builtin/help.c:48 +msgid "show info page" +msgstr "显示 info 手册" + +#: builtin/help.c:54 +msgid "git help [--all] [--guides] [--man|--web|--info] [command]" +msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]" + +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c:87 +#: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c:100 +#: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c:108 +#: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." -msgstr "emacsclient 版本 '%d' 太老 (< 22)。" +msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 +#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178 #, c-format msgid "failed to exec '%s': %s" msgstr "无法执行 '%s'：%s" -#: builtin/help.c:211 +#: builtin/help.c:218 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -2854,7 +5256,7 @@ msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<tool>.cmd'。" -#: builtin/help.c:223 +#: builtin/help.c:230 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -2863,266 +5265,335 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<tool>.path'。" -#: builtin/help.c:287 -msgid "The most commonly used git commands are:" -msgstr "最常用的 git 命令有：" - -#: builtin/help.c:355 +#: builtin/help.c:351 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:372 +#: builtin/help.c:368 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:380 +#: builtin/help.c:376 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:391 -#, c-format -msgid "'%s': not a documentation directory." -msgstr "'%s'：不是一个文档目录。" +#: builtin/help.c:422 +msgid "Defining attributes per path" +msgstr "定义路径的属性" + +#: builtin/help.c:423 +msgid "A Git glossary" +msgstr "Git 词汇表" + +#: builtin/help.c:424 +msgid "Specifies intentionally untracked files to ignore" +msgstr "忽略指定的未跟踪文件" + +#: builtin/help.c:425 +msgid "Defining submodule properties" +msgstr "定义子模组属性" + +#: builtin/help.c:426 +msgid "Specifying revisions and ranges for Git" +msgstr "指定 Git 的版本和版本范围" + +#: builtin/help.c:427 +msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" +msgstr "一个 Git 教程（针对 1.5.1 或更新版本）" -#: builtin/help.c:432 builtin/help.c:439 +#: builtin/help.c:428 +msgid "An overview of recommended workflows with Git" +msgstr "Git 推荐的工作流概览" + +#: builtin/help.c:440 +msgid "The common Git guides are:\n" +msgstr "最常用的 Git 向导有：\n" + +#: builtin/help.c:462 builtin/help.c:478 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:453 +#: builtin/help.c:494 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别名" -#: builtin/index-pack.c:169 +#: builtin/index-pack.c:182 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型不匹配" -#: builtin/index-pack.c:189 +#: builtin/index-pack.c:202 msgid "object of unexpected type" msgstr "意外的类型的对象" -#: builtin/index-pack.c:226 +#: builtin/index-pack.c:239 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "无法填充 %d 字节" msgstr[1] "无法填充 %d 字节" -#: builtin/index-pack.c:236 +#: builtin/index-pack.c:249 msgid "early EOF" msgstr "过早的文件结束符（EOF）" -#: builtin/index-pack.c:237 +#: builtin/index-pack.c:250 msgid "read error on input" msgstr "输入上的读错误" -#: builtin/index-pack.c:249 +#: builtin/index-pack.c:262 msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c:256 +#: builtin/index-pack.c:269 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" -#: builtin/index-pack.c:272 +#: builtin/index-pack.c:285 #, c-format msgid "unable to create '%s'" msgstr "不能创建 '%s'" -#: builtin/index-pack.c:277 +#: builtin/index-pack.c:290 #, c-format msgid "cannot open packfile '%s'" msgstr "无法打开包文件 '%s'" -#: builtin/index-pack.c:291 +#: builtin/index-pack.c:304 msgid "pack signature mismatch" msgstr "包签名不匹配" -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:306 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "不支持包版本 %<PRIu32>" + +#: builtin/index-pack.c:324 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "包中有错误的对象位于 %lu：%s" -#: builtin/index-pack.c:405 +#: builtin/index-pack.c:446 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" -#: builtin/index-pack.c:450 +#: builtin/index-pack.c:495 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" -#: builtin/index-pack.c:458 +#: builtin/index-pack.c:503 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:511 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" -#: builtin/index-pack.c:495 +#: builtin/index-pack.c:542 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: builtin/index-pack.c:497 +#: builtin/index-pack.c:544 #, 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 字节" -#: builtin/index-pack.c:510 +#: builtin/index-pack.c:570 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" -#: builtin/index-pack.c:583 -#, c-format -msgid "cannot read existing object %s" -msgstr "不能读取现存对象 %s" - -#: builtin/index-pack.c:586 +#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690 +#: builtin/index-pack.c:724 builtin/index-pack.c:733 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:598 +#: builtin/index-pack.c:664 builtin/pack-objects.c:170 +#: builtin/pack-objects.c:262 +#, c-format +msgid "unable to read %s" +msgstr "不能读 %s" + +#: builtin/index-pack.c:730 +#, c-format +msgid "cannot read existing object %s" +msgstr "不能读取现存对象 %s" + +#: builtin/index-pack.c:744 #, c-format msgid "invalid blob object %s" -msgstr "无效的 blob 对象 %s" +msgstr "无效的数据（blob）对象 %s" -#: builtin/index-pack.c:610 +#: builtin/index-pack.c:759 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/index-pack.c:612 +#: builtin/index-pack.c:761 msgid "Error in object" msgstr "对象中出错" -#: builtin/index-pack.c:614 +#: builtin/index-pack.c:763 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c:687 builtin/index-pack.c:713 +#: builtin/index-pack.c:833 builtin/index-pack.c:863 msgid "failed to apply delta" msgstr "无法应用 delta" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:1004 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:1004 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:872 +#: builtin/index-pack.c:1030 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c:877 +#: builtin/index-pack.c:1035 msgid "cannot fstat packfile" msgstr "不能枚举包文件状态" -#: builtin/index-pack.c:880 +#: builtin/index-pack.c:1038 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:903 +#: builtin/index-pack.c:1049 +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "parse_pack_objects() 中遇到不可理喻的问题" + +#: builtin/index-pack.c:1072 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:954 +#: builtin/index-pack.c:1082 +#, c-format +msgid "unable to create thread: %s" +msgstr "不能创建线程：%s" + +#: builtin/index-pack.c:1124 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:973 +#: builtin/index-pack.c:1132 +#, c-format +msgid "completed with %d local objects" +msgstr "完成 %d 个本地对象" + +#: builtin/index-pack.c:1142 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" + +#: builtin/index-pack.c:1146 #, 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:998 +#: builtin/index-pack.c:1171 #, c-format msgid "unable to deflate appended object (%d)" -msgstr "不能缩小附加对象（%d）" +msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1077 +#: builtin/index-pack.c:1250 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1101 +#: builtin/index-pack.c:1274 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1114 +#: builtin/index-pack.c:1287 #, c-format msgid "cannot write keep file '%s'" msgstr "无法写保留文件 '%s'" -#: builtin/index-pack.c:1122 +#: builtin/index-pack.c:1295 #, c-format msgid "cannot close written keep file '%s'" msgstr "无法关闭保留文件 '%s'" -#: builtin/index-pack.c:1135 +#: builtin/index-pack.c:1308 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1146 +#: builtin/index-pack.c:1319 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1247 +#: builtin/index-pack.c:1352 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "坏的 pack.indexversion=%<PRIu32>" + +#: builtin/index-pack.c:1358 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "指定的线程数无效（%d）" + +#: builtin/index-pack.c:1362 builtin/index-pack.c:1535 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "没有线程支持，忽略 %s" + +#: builtin/index-pack.c:1420 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1422 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1296 +#: builtin/index-pack.c:1469 #, 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:1303 +#: builtin/index-pack.c:1476 #, 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:1330 +#: builtin/index-pack.c:1503 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c:1374 builtin/index-pack.c:1377 -#: builtin/index-pack.c:1389 builtin/index-pack.c:1393 +#: builtin/index-pack.c:1547 builtin/index-pack.c:1550 +#: builtin/index-pack.c:1562 builtin/index-pack.c:1566 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1580 msgid "--fix-thin cannot be used without --stdin" -msgstr "--fix-thin 不能和 --stdin 共用" +msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1421 +#: builtin/index-pack.c:1584 builtin/index-pack.c:1594 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1603 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包名参数" @@ -3196,22 +5667,22 @@ msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" msgid "insane git directory %s" msgstr "不正常的 git 目录 %s" -#: builtin/init-db.c:322 builtin/init-db.c:325 +#: builtin/init-db.c:323 builtin/init-db.c:326 #, c-format msgid "%s already exists" msgstr "%s 已经存在" -#: builtin/init-db.c:354 +#: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" -#: builtin/init-db.c:357 +#: builtin/init-db.c:358 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" -#: builtin/init-db.c:362 +#: builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "不能创建 git link %s" @@ -3221,39 +5692,59 @@ msgstr "不能创建 git link %s" #. * existing" or "Initialized empty", the second " shared" or #. * "", and the last '%s%s' is the verbatim directory name. #. -#: builtin/init-db.c:419 +#: builtin/init-db.c:420 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git 版本库于 %s%s\n" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Reinitialized existing" msgstr "重新初始化现存的" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Initialized empty" msgstr "初始化空的" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/init-db.c:421 +#: builtin/init-db.c:422 msgid " shared" msgstr "共享" -#: builtin/init-db.c:440 +#: builtin/init-db.c:441 msgid "cannot tell cwd" msgstr "无法获知当前路径" -#: builtin/init-db.c:521 builtin/init-db.c:528 +#: builtin/init-db.c:467 +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" +"shared[=<permissions>]] [directory]" +msgstr "" +"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " +"[目录]" + +#: builtin/init-db.c:490 +msgid "permissions" +msgstr "权限" + +#: builtin/init-db.c:491 +msgid "specify that the git repository is to be shared amongst several users" +msgstr "指定 git 版本库是多个用户之间共享的" + +#: builtin/init-db.c:493 builtin/prune-packed.c:77 +msgid "be quiet" +msgstr "保持安静" + +#: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:532 +#: builtin/init-db.c:533 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -3262,113 +5753,400 @@ msgstr "" "不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-" "dir=<directory>）" -#: builtin/init-db.c:578 +#: builtin/init-db.c:579 msgid "Cannot access current working directory" msgstr "不能访问当前工作目录" -#: builtin/init-db.c:585 +#: builtin/init-db.c:586 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" -#: builtin/log.c:188 +#: builtin/log.c:40 +msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" +msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n" + +#: builtin/log.c:41 +msgid " or: git show [options] <object>..." +msgstr " 或者：git show [选项] <对象>..." + +#: builtin/log.c:103 +msgid "suppress diff output" +msgstr "不显示差异输出" + +#: builtin/log.c:104 +msgid "show source" +msgstr "显示源" + +#: builtin/log.c:105 +msgid "Use mail map file" +msgstr "使用邮件映射文件" + +#: builtin/log.c:106 +msgid "decorate options" +msgstr "修饰选项" + +#: builtin/log.c:199 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:401 builtin/log.c:489 +#: builtin/log.c:422 builtin/log.c:514 #, c-format msgid "Could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:513 +#: builtin/log.c:538 #, c-format msgid "Unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:602 +#: builtin/log.c:638 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:676 +#: builtin/log.c:720 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:687 +#: builtin/log.c:736 #, c-format msgid "Cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:701 +#: builtin/log.c:750 msgid "Need exactly one range." msgstr "只需要一个范围。" -#: builtin/log.c:709 +#: builtin/log.c:758 msgid "Not a range." msgstr "不是一个范围。" -#: builtin/log.c:786 +#: builtin/log.c:860 msgid "Cover letter needs email format" msgstr "信封需要邮件地址格式" -#: builtin/log.c:859 +#: builtin/log.c:936 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:932 +#: builtin/log.c:964 +msgid "git format-patch [options] [<since> | <revision range>]" +msgstr "git format-patch [选项] [<从> | <修订集范围>]" + +#: builtin/log.c:1009 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1153 -#, c-format -msgid "bogus committer info %s" -msgstr "虚假的提交者信息 %s" +#: builtin/log.c:1108 +msgid "use [PATCH n/m] even with a single patch" +msgstr "使用 [PATCH n/m]，即使只有一个补丁" + +#: builtin/log.c:1111 +msgid "use [PATCH] even with multiple patches" +msgstr "使用 [PATCH]，即使有多个补丁" + +#: builtin/log.c:1115 +msgid "print patches to standard out" +msgstr "打印补丁到标准输出" + +#: builtin/log.c:1117 +msgid "generate a cover letter" +msgstr "生成一封附信" + +#: builtin/log.c:1119 +msgid "use simple number sequence for output file names" +msgstr "使用简单的数字序列作为输出文件名" + +#: builtin/log.c:1120 +msgid "sfx" +msgstr "后缀" + +#: builtin/log.c:1121 +msgid "use <sfx> instead of '.patch'" +msgstr "使用 <后缀> 代替 '.patch'" + +#: builtin/log.c:1123 +msgid "start numbering patches at <n> instead of 1" +msgstr "补丁以 <n> 开始编号，而不是1" + +#: builtin/log.c:1125 +msgid "mark the series as Nth re-roll" +msgstr "标记补丁系列是第几次重制" + +#: builtin/log.c:1127 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "使用 [<前缀>] 代替 [PATCH]" + +#: builtin/log.c:1130 +msgid "store resulting files in <dir>" +msgstr "把结果文件存储在 <dir>" + +#: builtin/log.c:1133 +msgid "don't strip/add [PATCH]" +msgstr "不删除/添加 [PATCH]" + +#: builtin/log.c:1136 +msgid "don't output binary diffs" +msgstr "不输出二进制差异" + +#: builtin/log.c:1138 +msgid "don't include a patch matching a commit upstream" +msgstr "不包含已在上游提交中的补丁" + +#: builtin/log.c:1140 +msgid "show patch format instead of default (patch + stat)" +msgstr "显示纯补丁格式而非默认的（补丁+状态）" + +#: builtin/log.c:1142 +msgid "Messaging" +msgstr "邮件发送" + +#: builtin/log.c:1143 +msgid "header" +msgstr "header" + +#: builtin/log.c:1144 +msgid "add email header" +msgstr "添加邮件头" + +#: builtin/log.c:1145 builtin/log.c:1147 +msgid "email" +msgstr "邮件地址" -#: builtin/log.c:1198 +#: builtin/log.c:1145 +msgid "add To: header" +msgstr "添加收件人" + +#: builtin/log.c:1147 +msgid "add Cc: header" +msgstr "添加抄送" + +#: builtin/log.c:1149 +msgid "message-id" +msgstr "message-id" + +#: builtin/log.c:1150 +msgid "make first mail a reply to <message-id>" +msgstr "使第一封邮件作为对 <message-id> 的回复" + +#: builtin/log.c:1151 builtin/log.c:1154 +msgid "boundary" +msgstr "边界" + +#: builtin/log.c:1152 +msgid "attach the patch" +msgstr "附件方式添加补丁" + +#: builtin/log.c:1155 +msgid "inline the patch" +msgstr "内联显示补丁" + +#: builtin/log.c:1159 +msgid "enable message threading, styles: shallow, deep" +msgstr "启用邮件线索，风格：浅，深" + +#: builtin/log.c:1161 +msgid "signature" +msgstr "签名" + +#: builtin/log.c:1162 +msgid "add a signature" +msgstr "添加一个签名" + +#: builtin/log.c:1164 +msgid "don't print the patch filenames" +msgstr "不要打印补丁文件名" + +#: builtin/log.c:1248 msgid "-n and -k are mutually exclusive." msgstr "-n 和 -k 互斥。" -#: builtin/log.c:1200 +#: builtin/log.c:1250 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix 和 -k 互斥。" -#: builtin/log.c:1208 +#: builtin/log.c:1258 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1210 +#: builtin/log.c:1260 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1212 +#: builtin/log.c:1262 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1235 +#: builtin/log.c:1285 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1237 +#: builtin/log.c:1287 #, c-format msgid "Could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/log.c:1390 +#: builtin/log.c:1435 msgid "Failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:1494 +#: builtin/log.c:1484 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" + +#: builtin/log.c:1539 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n" -#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524 +#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566 #, c-format msgid "Unknown commit %s" msgstr "未知提交 %s" +#: builtin/ls-files.c:402 +msgid "git ls-files [options] [<file>...]" +msgstr "git ls-files [选项] [<文件>...]" + +#: builtin/ls-files.c:459 +msgid "identify the file status with tags" +msgstr "用标签标识文件的状态" + +#: builtin/ls-files.c:461 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "使用小写字母表示 '假设未改变的' 文件" + +#: builtin/ls-files.c:463 +msgid "show cached files in the output (default)" +msgstr "显示缓存的文件（默认）" + +#: builtin/ls-files.c:465 +msgid "show deleted files in the output" +msgstr "显示已删除的文件" + +#: builtin/ls-files.c:467 +msgid "show modified files in the output" +msgstr "显示已修改的文件" + +#: builtin/ls-files.c:469 +msgid "show other files in the output" +msgstr "显示其它文件" + +#: builtin/ls-files.c:471 +msgid "show ignored files in the output" +msgstr "显示忽略的文件" + +#: builtin/ls-files.c:474 +msgid "show staged contents' object name in the output" +msgstr "显示暂存区内容的对象名称" + +#: builtin/ls-files.c:476 +msgid "show files on the filesystem that need to be removed" +msgstr "显示文件系统需要删除的文件" + +#: builtin/ls-files.c:478 +msgid "show 'other' directories' name only" +msgstr "只显示“其他”目录的名称" + +#: builtin/ls-files.c:481 +msgid "don't show empty directories" +msgstr "不显示空目录" + +#: builtin/ls-files.c:484 +msgid "show unmerged files in the output" +msgstr "显示未合并的文件" + +#: builtin/ls-files.c:486 +msgid "show resolve-undo information" +msgstr "显示 resolve-undo 信息" + +#: builtin/ls-files.c:488 +msgid "skip files matching pattern" +msgstr "匹配排除文件的模式" + +#: builtin/ls-files.c:491 +msgid "exclude patterns are read from <file>" +msgstr "从 <文件> 中读取排除模式" + +#: builtin/ls-files.c:494 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "从 <文件> 读取额外的每个目录的排除模式" + +#: builtin/ls-files.c:496 +msgid "add the standard git exclusions" +msgstr "添加标准的 git 排除" + +#: builtin/ls-files.c:499 +msgid "make the output relative to the project top directory" +msgstr "显示相对于顶级目录的文件名" + +#: builtin/ls-files.c:502 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "如果任何 <文件> 都不在索引区，视为错误" + +#: builtin/ls-files.c:503 +msgid "tree-ish" +msgstr "树或提交" + +#: builtin/ls-files.c:504 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" + +#: builtin/ls-files.c:506 +msgid "show debugging data" +msgstr "显示调试数据" + +#: builtin/ls-tree.c:27 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" + +#: builtin/ls-tree.c:125 +msgid "only show trees" +msgstr "只显示树" + +#: builtin/ls-tree.c:127 +msgid "recurse into subtrees" +msgstr "递归到子树" + +#: builtin/ls-tree.c:129 +msgid "show trees when recursing" +msgstr "当递归时显示树" + +#: builtin/ls-tree.c:132 +msgid "terminate entries with NUL byte" +msgstr "条目以NUL字符终止" + +#: builtin/ls-tree.c:133 +msgid "include object size" +msgstr "包括对象大小" + +#: builtin/ls-tree.c:135 builtin/ls-tree.c:137 +msgid "list only filenames" +msgstr "只列出文件名" + +#: builtin/ls-tree.c:140 +msgid "use full path names" +msgstr "使用文件的全路径" + +#: builtin/ls-tree.c:142 +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:44 +msgid "git merge [options] <msg> HEAD <commit>" +msgstr "git merge [选项] <说明> HEAD <提交>" + +#: builtin/merge.c:45 +msgid "git merge --abort" +msgstr "git merge --abort" + #: builtin/merge.c:90 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" @@ -3388,151 +6166,208 @@ msgstr "可用的策略有：" msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" -#: builtin/merge.c:240 +#: builtin/merge.c:183 +msgid "do not show a diffstat at the end of the merge" +msgstr "在合并的最后不显示差异统计" + +#: builtin/merge.c:186 +msgid "show a diffstat at the end of the merge" +msgstr "在合并的最后显示差异统计" + +#: builtin/merge.c:187 +msgid "(synonym to --stat)" +msgstr "（和 --stat 同义）" + +#: builtin/merge.c:189 +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录" + +#: builtin/merge.c:192 +msgid "create a single commit instead of doing a merge" +msgstr "创建一个单独的提交而不是做一次合并" + +#: builtin/merge.c:194 +msgid "perform a commit if the merge succeeds (default)" +msgstr "如果合并成功，执行一次提交（默认）" + +#: builtin/merge.c:196 +msgid "edit message before committing" +msgstr "在提交前编辑提交说明" + +#: builtin/merge.c:198 +msgid "allow fast-forward (default)" +msgstr "允许快进（默认）" + +#: builtin/merge.c:200 +msgid "abort if fast-forward is not possible" +msgstr "如果不能快进就放弃合并" + +#: builtin/merge.c:203 +msgid "Verify that the named commit has a valid GPG signature" +msgstr "验证指定的提交是否包含一个有效的 GPG 签名" + +#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112 +msgid "strategy" +msgstr "策略" + +#: builtin/merge.c:205 +msgid "merge strategy to use" +msgstr "要使用的合并策略" + +#: builtin/merge.c:206 +msgid "option=value" +msgstr "option=value" + +#: builtin/merge.c:207 +msgid "option for selected merge strategy" +msgstr "所选的合并策略的选项" + +#: builtin/merge.c:209 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "合并的提交说明（针对非快进式合并）" + +#: builtin/merge.c:213 +msgid "abort the current in-progress merge" +msgstr "放弃当前正在进行的合并" + +#: builtin/merge.c:242 msgid "could not run stash." msgstr "不能进行进度保存。" -#: builtin/merge.c:245 +#: builtin/merge.c:247 msgid "stash failed" msgstr "进度保存失败" -#: builtin/merge.c:250 +#: builtin/merge.c:252 #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象：%s" -#: builtin/merge.c:269 builtin/merge.c:286 +#: builtin/merge.c:271 builtin/merge.c:288 msgid "read-tree failed" msgstr "读取树失败" # 译者：注意保持前导空格 -#: builtin/merge.c:316 +#: builtin/merge.c:318 msgid " (nothing to squash)" msgstr " （无可压缩）" -#: builtin/merge.c:329 +#: builtin/merge.c:331 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩提交 -- 未更新 HEAD\n" -#: builtin/merge.c:361 +#: builtin/merge.c:363 msgid "Writing SQUASH_MSG" msgstr "写入 SQUASH_MSG" -#: builtin/merge.c:363 +#: builtin/merge.c:365 msgid "Finishing SQUASH_MSG" msgstr "完成 SQUASH_MSG" -#: builtin/merge.c:386 +#: builtin/merge.c:388 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" -#: builtin/merge.c:437 +#: builtin/merge.c:438 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:536 +#: builtin/merge.c:550 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c:629 +#: builtin/merge.c:643 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入一树对象" -#: builtin/merge.c:679 -msgid "failed to read the cache" -msgstr "无法读取缓存" - -#: builtin/merge.c:697 -msgid "Unable to write index." -msgstr "不能写索引。" - -#: builtin/merge.c:710 +#: builtin/merge.c:671 msgid "Not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" -#: builtin/merge.c:724 +#: builtin/merge.c:685 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:738 +#: builtin/merge.c:699 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:877 +#: builtin/merge.c:788 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:886 +#: builtin/merge.c:797 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:892 +#: builtin/merge.c:803 +#, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '#' will be ignored, and an empty message aborts\n" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" "请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n" "合并到主题分支。\n" "\n" -"以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n" +"以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n" -#: builtin/merge.c:916 +#: builtin/merge.c:827 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:928 +#: builtin/merge.c:839 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:993 +#: builtin/merge.c:904 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:1009 +#: builtin/merge.c:920 #, c-format msgid "'%s' is not a commit" msgstr "'%s' 不是一个提交" -#: builtin/merge.c:1050 +#: builtin/merge.c:961 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:1052 +#: builtin/merge.c:963 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程版本库。" -#: builtin/merge.c:1054 +#: builtin/merge.c:965 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:1059 +#: builtin/merge.c:970 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "%s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1146 builtin/merge.c:1303 +#: builtin/merge.c:1057 builtin/merge.c:1214 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1214 +#: builtin/merge.c:1125 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1230 git-pull.sh:31 +#: builtin/merge.c:1141 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3540,11 +6375,11 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1233 git-pull.sh:34 +#: builtin/merge.c:1144 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: builtin/merge.c:1237 +#: builtin/merge.c:1148 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3552,83 +6387,203 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1240 +#: builtin/merge.c:1151 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1249 +#: builtin/merge.c:1160 msgid "You cannot combine --squash with --no-ff." -msgstr "您不能将 --squash 与 --no-ff 共用。" +msgstr "您不能将 --squash 与 --no-ff 同时使用。" -#: builtin/merge.c:1254 +#: builtin/merge.c:1165 msgid "You cannot combine --no-ff with --ff-only." -msgstr "您不能将 --no-ff 与 --ff-only 共用。" +msgstr "您不能将 --no-ff 与 --ff-only 同时使用。" -#: builtin/merge.c:1261 +#: builtin/merge.c:1172 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1293 +#: builtin/merge.c:1204 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1296 +#: builtin/merge.c:1207 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1298 +#: builtin/merge.c:1209 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1413 +#: builtin/merge.c:1265 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" + +#: builtin/merge.c:1268 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" + +#. 'N' +#: builtin/merge.c:1271 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "提交 %s 没有一个 GPG 签名。" + +#: builtin/merge.c:1274 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" + +#: builtin/merge.c:1358 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1451 +#: builtin/merge.c:1397 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1458 +#: builtin/merge.c:1404 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1490 +#: builtin/merge.c:1436 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1513 builtin/merge.c:1592 +#: builtin/merge.c:1459 builtin/merge.c:1538 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1517 +#: builtin/merge.c:1463 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1583 +#: builtin/merge.c:1529 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1531 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1540 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1606 +#: builtin/merge.c:1552 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" +#: builtin/merge-base.c:26 +msgid "git merge-base [-a|--all] <commit> <commit>..." +msgstr "git merge-base [-a|--all] <提交> <提交>..." + +#: builtin/merge-base.c:27 +msgid "git merge-base [-a|--all] --octopus <commit>..." +msgstr "git merge-base [-a|--all] --octopus <提交>..." + +#: builtin/merge-base.c:28 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <提交>..." + +#: builtin/merge-base.c:29 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <提交> <提交>" + +#: builtin/merge-base.c:98 +msgid "output all common ancestors" +msgstr "输出所有共同的祖先" + +#: builtin/merge-base.c:99 +msgid "find ancestors for a single n-way merge" +msgstr "查找一个多路合并的祖先提交" + +#: builtin/merge-base.c:100 +msgid "list revs not reachable from others" +msgstr "显示不能被其他访问到的版本" + +#: builtin/merge-base.c:102 +msgid "is the first one ancestor of the other?" +msgstr "第一个是其他的祖先提交么？" + +#: builtin/merge-file.c:8 +msgid "" +"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" + +#: builtin/merge-file.c:33 +msgid "send results to standard output" +msgstr "将结果发送到标准输出" + +#: builtin/merge-file.c:34 +msgid "use a diff3 based merge" +msgstr "使用基于 diff3 的合并" + +#: builtin/merge-file.c:35 +msgid "for conflicts, use our version" +msgstr "如果冲突，使用我们的版本" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use their version" +msgstr "如果冲突，使用他们的版本" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use a union version" +msgstr "如果冲突，使用联合版本" + +#: builtin/merge-file.c:42 +msgid "for conflicts, use this marker size" +msgstr "如果冲突，使用指定长度的标记" + +#: builtin/merge-file.c:43 +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 设置标签" + +#: builtin/mktree.c:67 +msgid "git mktree [-z] [--missing] [--batch]" +msgstr "git mktree [-z] [--missing] [--batch]" + +#: builtin/mktree.c:153 +msgid "input is NUL terminated" +msgstr "输入以 NUL 字符终止" + +#: builtin/mktree.c:154 builtin/write-tree.c:24 +msgid "allow missing objects" +msgstr "允许丢失的对象" + +#: builtin/mktree.c:155 +msgid "allow creation of more than one tree" +msgstr "允许创建一个以上的树" + +#: builtin/mv.c:14 +msgid "git mv [options] <source>... <destination>" +msgstr "git mv [选项] <源>... <目标>" + +#: builtin/mv.c:64 +msgid "force move/rename even if target exists" +msgstr "强制移动/重命令，即使目标存在" + +#: builtin/mv.c:65 +msgid "skip move/rename errors" +msgstr "跳过移动/重命名错误" + #: builtin/mv.c:108 #, c-format msgid "Checking rename of '%s' to '%s'\n" @@ -3691,142 +6646,315 @@ msgstr "重命名 %s 至 %s\n" msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" +#: builtin/name-rev.c:175 +msgid "git name-rev [options] <commit>..." +msgstr "git name-rev [选项] <提交>..." + +#: builtin/name-rev.c:176 +msgid "git name-rev [options] --all" +msgstr "git name-rev [选项] --all" + +#: builtin/name-rev.c:177 +msgid "git name-rev [options] --stdin" +msgstr "git name-rev [选项] --stdin" + +#: builtin/name-rev.c:229 +msgid "print only names (no SHA-1)" +msgstr "只打印名称（无 SHA-1）" + +#: builtin/name-rev.c:230 +msgid "only use tags to name the commits" +msgstr "只使用 tags 来命名提交" + +#: builtin/name-rev.c:232 +msgid "only use refs matching <pattern>" +msgstr "只使用和 <模式> 相匹配的引用" + +#: builtin/name-rev.c:234 +msgid "list all commits reachable from all refs" +msgstr "列出可以从所有引用访问的提交" + +#: builtin/name-rev.c:235 +msgid "read from stdin" +msgstr "从标准输入读取" + +#: builtin/name-rev.c:236 +msgid "allow to print `undefined` names" +msgstr "允许打印 `未定义` 的名称" + +#: builtin/notes.c:26 +msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgstr "git notes [--ref <注解引用>] [list [<对象>]]" + +#: builtin/notes.c:27 +msgid "" +"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对" +"象>] [<对象>]" + +#: builtin/notes.c:28 +msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" + +#: builtin/notes.c:29 +msgid "" +"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象" +">] [<对象>]" + +#: builtin/notes.c:30 +msgid "git notes [--ref <notes_ref>] edit [<object>]" +msgstr "git notes [--ref <注解引用>] edit [<对象>]" + +#: builtin/notes.c:31 +msgid "git notes [--ref <notes_ref>] show [<object>]" +msgstr "git notes [--ref <注解引用>] show [<对象>]" + +#: builtin/notes.c:32 +msgid "" +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" + +#: builtin/notes.c:33 +msgid "git notes merge --commit [-v | -q]" +msgstr "git notes merge --commit [-v | -q]" + +#: builtin/notes.c:34 +msgid "git notes merge --abort [-v | -q]" +msgstr "git notes merge --abort [-v | -q]" + +#: builtin/notes.c:35 +msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgstr "git notes [--ref <注解引用>] remove [<对象>...]" + +#: builtin/notes.c:36 +msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgstr "git notes [--ref <注解引用>] prune [-n | -v]" + +#: builtin/notes.c:37 +msgid "git notes [--ref <notes_ref>] get-ref" +msgstr "git notes [--ref <注解引用>] get-ref" + +#: builtin/notes.c:42 +msgid "git notes [list [<object>]]" +msgstr "git notes [list [<对象>]]" + +#: builtin/notes.c:47 +msgid "git notes add [<options>] [<object>]" +msgstr "git notes add [<选项>] [<对象>]" + +#: builtin/notes.c:52 +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "git notes copy [<选项>] <源对象> <目标对象>" + +#: builtin/notes.c:53 +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "git notes copy --stdin [<源对象> <目标对象>]..." + +#: builtin/notes.c:58 +msgid "git notes append [<options>] [<object>]" +msgstr "git notes append [<选项>] [<对象>]" + +#: builtin/notes.c:63 +msgid "git notes edit [<object>]" +msgstr "git notes edit [<对象>]" + +#: builtin/notes.c:68 +msgid "git notes show [<object>]" +msgstr "git notes show [<对象>]" + +#: builtin/notes.c:73 +msgid "git notes merge [<options>] <notes_ref>" +msgstr "git notes merge [<选项>] <注解引用>" + +#: builtin/notes.c:74 +msgid "git notes merge --commit [<options>]" +msgstr "git notes merge --commit [<选项>]" + +#: builtin/notes.c:75 +msgid "git notes merge --abort [<options>]" +msgstr "git notes merge --abort [<选项>]" + +#: builtin/notes.c:80 +msgid "git notes remove [<object>]" +msgstr "git notes remove [<对象>]" + +#: builtin/notes.c:85 +msgid "git notes prune [<options>]" +msgstr "git notes prune [<选项>]" + +#: builtin/notes.c:90 +msgid "git notes get-ref" +msgstr "git notes get-ref" + #: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "不能为对象 '%s' 开始 'show'" -#: builtin/notes.c:145 -msgid "can't fdopen 'show' output fd" -msgstr "不能打开 'show' 输出文件句柄" +#: builtin/notes.c:143 +msgid "could not read 'show' output" +msgstr "不能读取 'show' 的输出" -#: builtin/notes.c:155 -#, c-format -msgid "failed to close pipe to 'show' for object '%s'" -msgstr "无法为对象 '%s' 的 'show' 关闭管道" - -#: builtin/notes.c:158 +#: builtin/notes.c:151 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" -#: builtin/notes.c:175 builtin/tag.c:347 +#: builtin/notes.c:169 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: builtin/notes.c:189 +#: builtin/notes.c:188 msgid "Please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解提供内容" -#: builtin/notes.c:210 builtin/notes.c:973 +#: builtin/notes.c:209 builtin/notes.c:972 #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" -#: builtin/notes.c:215 +#: builtin/notes.c:214 msgid "unable to write note object" msgstr "不能写注解对象" -#: builtin/notes.c:217 +#: builtin/notes.c:216 #, c-format msgid "The note contents has been left in %s" msgstr "注解内容被留在文件 %s 中" -#: builtin/notes.c:251 builtin/tag.c:542 +#: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: builtin/notes.c:253 builtin/tag.c:545 +#: builtin/notes.c:252 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" -#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 -#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 -#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 +#: builtin/notes.c:967 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" -#: builtin/notes.c:275 +#: builtin/notes.c:274 #, c-format msgid "Failed to read object '%s'." msgstr "无法读取对象 '%s'。" -#: builtin/notes.c:299 +#: builtin/notes.c:298 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "不能提交未初始化/未引用的注解树" -#: builtin/notes.c:340 +#: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "坏的 notes.rewriteMode 值：'%s'" -#: builtin/notes.c:350 +#: builtin/notes.c:349 #, 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 -#: builtin/notes.c:377 +#: builtin/notes.c:376 #, c-format msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" -#: builtin/notes.c:441 +#: builtin/notes.c:440 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/notes.c:456 +#: builtin/notes.c:455 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "无法从 '%s' 到 '%s' 拷贝注解" -#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 -#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 -#: builtin/notes.c:1033 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 +#: builtin/notes.c:1032 msgid "too many parameters" msgstr "参数太多" -#: builtin/notes.c:513 builtin/notes.c:772 +#: builtin/notes.c:512 builtin/notes.c:771 #, c-format msgid "No note found for object %s." msgstr "未发现对象 %s 的注解。" -#: builtin/notes.c:580 +#: builtin/notes.c:534 builtin/notes.c:691 +msgid "note contents as a string" +msgstr "注解内容作为一个字符串" + +#: builtin/notes.c:537 builtin/notes.c:694 +msgid "note contents in a file" +msgstr "注解内容到一个文件中" + +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 +#: builtin/notes.c:699 builtin/tag.c:474 +msgid "object" +msgstr "对象" + +#: builtin/notes.c:540 builtin/notes.c:697 +msgid "reuse and edit specified note object" +msgstr "重用和编辑指定的注解对象" + +#: builtin/notes.c:543 builtin/notes.c:700 +msgid "reuse specified note object" +msgstr "重用指定的注解对象" + +#: builtin/notes.c:545 builtin/notes.c:613 +msgid "replace existing notes" +msgstr "替换已存在的注解" + +#: builtin/notes.c:579 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:585 builtin/notes.c:662 +#: builtin/notes.c:584 builtin/notes.c:661 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" -#: builtin/notes.c:635 +#: builtin/notes.c:614 +msgid "read objects from stdin" +msgstr "从标准输入读取对象" + +#: builtin/notes.c:616 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "重新加载 <命令> 的配置（隐含 --stdin）" + +#: builtin/notes.c:634 msgid "too few parameters" msgstr "参数太少" -#: builtin/notes.c:656 +#: builtin/notes.c:655 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:668 +#: builtin/notes.c:667 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "源对象 %s 缺少注解。不能拷贝。" -#: builtin/notes.c:717 +#: builtin/notes.c:716 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -3835,36 +6963,251 @@ msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" -#: builtin/notes.c:971 +#: builtin/notes.c:863 +msgid "General options" +msgstr "通用选项" + +#: builtin/notes.c:865 +msgid "Merge options" +msgstr "合并选项" + +#: builtin/notes.c:867 +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:869 +msgid "Committing unmerged notes" +msgstr "提交未合并的注解" + +#: builtin/notes.c:871 +msgid "finalize notes merge by committing unmerged notes" +msgstr "通过提交未合并的注解来完成注解合并" + +#: builtin/notes.c:873 +msgid "Aborting notes merge resolution" +msgstr "中止注解合并的方案" + +#: builtin/notes.c:875 +msgid "abort notes merge" +msgstr "中止注解合并" + +#: builtin/notes.c:970 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c:1103 builtin/remote.c:1598 +#: builtin/notes.c:982 +msgid "attempt to remove non-existent note is not an error" +msgstr "尝试删除不存在的注解不是一个错误" + +#: builtin/notes.c:985 +msgid "read object names from the standard input" +msgstr "从标准输入读取对象名称" + +#: builtin/notes.c:1066 +msgid "notes_ref" +msgstr "注解引用" + +#: builtin/notes.c:1067 +msgid "use notes from <notes_ref>" +msgstr "从 <注解引用> 使用注解" + +#: builtin/notes.c:1102 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/pack-objects.c:2337 +#: builtin/pack-objects.c:23 +msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" +msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]" + +#: builtin/pack-objects.c:24 +msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" +msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]" + +#: builtin/pack-objects.c:183 builtin/pack-objects.c:186 +#, c-format +msgid "deflate error (%d)" +msgstr "压缩错误 (%d)" + +#: builtin/pack-objects.c:2397 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:2341 +#: builtin/pack-objects.c:2401 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:2364 +#: builtin/pack-objects.c:2424 #, c-format msgid "option %s does not accept negative form" msgstr "选项 %s 不接受否定格式" -#: builtin/pack-objects.c:2368 +#: builtin/pack-objects.c:2428 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "不能解析选项 %1$s 的值 '%2$s'" +#: builtin/pack-objects.c:2447 +msgid "do not show progress meter" +msgstr "不显示进度表" + +#: builtin/pack-objects.c:2449 +msgid "show progress meter" +msgstr "显示进度表" + +#: builtin/pack-objects.c:2451 +msgid "show progress meter during object writing phase" +msgstr "在对象写入阶段显示进度表" + +#: builtin/pack-objects.c:2454 +msgid "similar to --all-progress when progress meter is shown" +msgstr "当进度表显示时类似于 --all-progress" + +#: builtin/pack-objects.c:2455 +msgid "version[,offset]" +msgstr "版本[,偏移]" + +#: builtin/pack-objects.c:2456 +msgid "write the pack index file in the specified idx format version" +msgstr "用指定的 idx 格式版本来写包索引文件" + +#: builtin/pack-objects.c:2459 +msgid "maximum size of each output pack file" +msgstr "每个输出包的最大尺寸" + +#: builtin/pack-objects.c:2461 +msgid "ignore borrowed objects from alternate object store" +msgstr "忽略从替代对象存储里借用对象" + +#: builtin/pack-objects.c:2463 +msgid "ignore packed objects" +msgstr "忽略包对象" + +#: builtin/pack-objects.c:2465 +msgid "limit pack window by objects" +msgstr "限制打包窗口的对象数" + +#: builtin/pack-objects.c:2467 +msgid "limit pack window by memory in addition to object limit" +msgstr "除对象数量限制外设置打包窗口的内存限制" + +#: builtin/pack-objects.c:2469 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "打包允许的 delta 链的最大长度" + +#: builtin/pack-objects.c:2471 +msgid "reuse existing deltas" +msgstr "重用已存在的 deltas" + +#: builtin/pack-objects.c:2473 +msgid "reuse existing objects" +msgstr "重用已存在的对象" + +#: builtin/pack-objects.c:2475 +msgid "use OFS_DELTA objects" +msgstr "使用 OFS_DELTA 对象" + +#: builtin/pack-objects.c:2477 +msgid "use threads when searching for best delta matches" +msgstr "使用线程查询最佳 delta 匹配" + +#: builtin/pack-objects.c:2479 +msgid "do not create an empty pack output" +msgstr "不创建空的包输出" + +#: builtin/pack-objects.c:2481 +msgid "read revision arguments from standard input" +msgstr "从标准输入读取修订号参数" + +#: builtin/pack-objects.c:2483 +msgid "limit the objects to those that are not yet packed" +msgstr "限制那些尚未打包的对象" + +#: builtin/pack-objects.c:2486 +msgid "include objects reachable from any reference" +msgstr "包括可以从任何引用访问到的对象" + +#: builtin/pack-objects.c:2489 +msgid "include objects referred by reflog entries" +msgstr "包括被引用日志引用到的对象" + +#: builtin/pack-objects.c:2492 +msgid "output pack to stdout" +msgstr "输出包到标准输出" + +#: builtin/pack-objects.c:2494 +msgid "include tag objects that refer to objects to be packed" +msgstr "包括引用了打包对象的 tag" + +#: builtin/pack-objects.c:2496 +msgid "keep unreachable objects" +msgstr "维持不可达的对象" + +#: builtin/pack-objects.c:2497 parse-options.h:141 +msgid "time" +msgstr "时间" + +#: builtin/pack-objects.c:2498 +msgid "unpack unreachable objects newer than <time>" +msgstr "将比给定 <时间> 新的无法访问的对象解包" + +#: builtin/pack-objects.c:2501 +msgid "create thin packs" +msgstr "创建精简包" + +#: builtin/pack-objects.c:2503 +msgid "ignore packs that have companion .keep file" +msgstr "忽略配有 .keep 文件的包" + +#: builtin/pack-objects.c:2505 +msgid "pack compression level" +msgstr "打包压缩级别" + +#: builtin/pack-objects.c:2507 +msgid "do not hide commits by grafts" +msgstr "不隐藏移植覆盖的提交" + +#: builtin/pack-refs.c:6 +msgid "git pack-refs [options]" +msgstr "git pack-refs [选项]" + +#: builtin/pack-refs.c:14 +msgid "pack everything" +msgstr "打包一切" + +#: builtin/pack-refs.c:15 +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]" + +#: builtin/prune.c:12 +msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" + +#: builtin/prune.c:132 +msgid "do not remove, show only" +msgstr "不删除，只显示" + +#: builtin/prune.c:133 +msgid "report pruned objects" +msgstr "报告清除的对象" + +#: builtin/prune.c:136 +msgid "expire objects older than <time>" +msgstr "使早于给定时间的对象过期" + +#: builtin/push.c:14 +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]" + #: builtin/push.c:45 msgid "tag shorthand without <tag>" msgstr "tag 简写没有跟 <tag> 参数" @@ -3947,12 +7290,44 @@ msgstr "" "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n" "而没有告诉我要推送什么、更新哪个远程分支。" -#: builtin/push.c:174 +# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短 +#: builtin/push.c:151 +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" +"\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' 模式）" + +#: builtin/push.c:199 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。" -#: builtin/push.c:181 +#: builtin/push.c:206 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" @@ -3963,18 +7338,19 @@ msgstr "" "再次推送前，先与远程变更合并（如 'git pull'）。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:187 +#: builtin/push.c:212 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\n" -"variable to 'current' or 'upstream' to push only the current branch." +"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' 设置为 'current' 或 'upstream' 以便只推送当前分支。" +"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n" +"以便只推送当前分支。" -#: builtin/push.c:193 +#: builtin/push.c:218 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and merge the remote changes\n" @@ -3985,22 +7361,48 @@ msgstr "" "检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:233 +#: builtin/push.c:224 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first merge the remote changes (e.g.,\n" +"'git pull') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"更新被拒绝，因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n" +"一个版本库已推送了相同的引用。再次推送前，您可能需要先合并远程变更\n" +"（如 'git pull'）。\n" +"详见 'git push --help' 中的 'Note about fast-forwards' 小节。" + +#: builtin/push.c:231 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "更新被拒绝因为 tag 在远程已经存在。" + +#: builtin/push.c:234 +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" +"without using the '--force' option.\n" +msgstr "" +"如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n" +"也不能更新远程引用让其指向一个非提交对象。\n" + +#: builtin/push.c:294 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:237 +#: builtin/push.c:298 #, c-format msgid "failed to push some refs to '%s'" msgstr "无法推送一些引用到 '%s'" -#: builtin/push.c:269 +#: builtin/push.c:331 #, c-format msgid "bad repository '%s'" msgstr "坏的版本库 '%s'" -#: builtin/push.c:270 +#: builtin/push.c:332 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -4013,7 +7415,7 @@ msgid "" " git push <name>\n" msgstr "" "没有配置推送目标。\n" -"或者通过命令行指定URL，或者用下面命令配置一个远程版本库\n" +"或通过命令行指定URL，或用下面命令配置一个远程版本库\n" "\n" " git remote add <name> <url>\n" "\n" @@ -4021,34 +7423,241 @@ msgstr "" "\n" " git push <name>\n" -#: builtin/push.c:285 +#: builtin/push.c:347 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" -#: builtin/push.c:286 +#: builtin/push.c:348 msgid "--all can't be combined with refspecs" -msgstr "--all 不能和引用表达式共用" +msgstr "--all 不能和引用表达式同时使用" -#: builtin/push.c:291 +#: builtin/push.c:353 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" -#: builtin/push.c:292 +#: builtin/push.c:354 msgid "--mirror can't be combined with refspecs" -msgstr "--mirror 不能和引用表达式共用" +msgstr "--mirror 不能和引用表达式同时使用" -#: builtin/push.c:297 +#: builtin/push.c:359 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:385 +#: builtin/push.c:419 +msgid "repository" +msgstr "版本库" + +#: builtin/push.c:420 +msgid "push all refs" +msgstr "推送所有引用" + +#: builtin/push.c:421 +msgid "mirror all refs" +msgstr "镜像所有引用" + +#: builtin/push.c:423 +msgid "delete refs" +msgstr "删除引用" + +#: builtin/push.c:424 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "推送 tags（不能使用 --all or --mirror）" + +#: builtin/push.c:427 +msgid "force updates" +msgstr "强制更新" + +#: builtin/push.c:428 +msgid "check" +msgstr "检查" + +#: builtin/push.c:429 +msgid "control recursive pushing of submodules" +msgstr "控制子模组的递归推送" + +#: builtin/push.c:431 +msgid "use thin pack" +msgstr "使用精简打包" + +#: builtin/push.c:432 builtin/push.c:433 +msgid "receive pack program" +msgstr "接收包程序" + +#: builtin/push.c:434 +msgid "set upstream for git pull/status" +msgstr "设置 git pull/status 的上游" + +#: builtin/push.c:437 +msgid "prune locally removed refs" +msgstr "清除本地删除的引用" + +#: builtin/push.c:439 +msgid "bypass pre-push hook" +msgstr "绕过 pre-push 钩子" + +#: builtin/push.c:440 +msgid "push missing but relevant tags" +msgstr "推送缺失的有关的 tags" + +#: builtin/push.c:450 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:387 +#: builtin/push.c:452 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" +#: builtin/read-tree.c:36 +msgid "" +"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=<前缀>] [-" +"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])" + +#: builtin/read-tree.c:108 +msgid "write resulting index to <file>" +msgstr "将索引结果写入 <file>" + +#: builtin/read-tree.c:111 +msgid "only empty the index" +msgstr "只是清空索引" + +#: builtin/read-tree.c:113 +msgid "Merging" +msgstr "合并" + +#: builtin/read-tree.c:115 +msgid "perform a merge in addition to a read" +msgstr "读取之余再执行一个合并" + +#: builtin/read-tree.c:117 +msgid "3-way merge if no file level merging required" +msgstr "如果没有文件级合并需要，执行三路合并" + +#: builtin/read-tree.c:119 +msgid "3-way merge in presence of adds and removes" +msgstr "存在添加和删除时，也执行三路合并" + +#: builtin/read-tree.c:121 +msgid "same as -m, but discard unmerged entries" +msgstr "类似于 -m，但丢弃未合并的条目" + +#: builtin/read-tree.c:122 +msgid "<subdirectory>/" +msgstr "<子目录>/" + +#: builtin/read-tree.c:123 +msgid "read the tree into the index under <subdirectory>/" +msgstr "读取树对象到索引的 <子目录>/ 下" + +#: builtin/read-tree.c:126 +msgid "update working tree with merge result" +msgstr "用合并的结果更新工作区" + +#: builtin/read-tree.c:128 +msgid "gitignore" +msgstr "gitignore" + +#: builtin/read-tree.c:129 +msgid "allow explicitly ignored files to be overwritten" +msgstr "允许忽略文件中设定的文件可以被覆盖" + +#: builtin/read-tree.c:132 +msgid "don't check the working tree after merging" +msgstr "合并后不检查工作区" + +#: builtin/read-tree.c:133 +msgid "don't update the index or the work tree" +msgstr "不更新索引区和工作区" + +#: builtin/read-tree.c:135 +msgid "skip applying sparse checkout filter" +msgstr "跳过应用稀疏检出过滤器" + +#: builtin/read-tree.c:137 +msgid "debug unpack-trees" +msgstr "调试 unpack-trees" + +#: builtin/remote.c:11 +msgid "git remote [-v | --verbose]" +msgstr "git remote [-v | --verbose]" + +#: builtin/remote.c:12 +msgid "" +"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>" + +#: builtin/remote.c:13 builtin/remote.c:32 +msgid "git remote rename <old> <new>" +msgstr "git remote rename <旧名称> <新名称>" + +#: builtin/remote.c:14 builtin/remote.c:37 +msgid "git remote remove <name>" +msgstr "git remote remove <名称>" + +#: builtin/remote.c:15 builtin/remote.c:42 +msgid "git remote set-head <name> (-a | -d | <branch>)" +msgstr "git remote set-head <名称> (-a | -d | <分支>)" + +#: builtin/remote.c:16 +msgid "git remote [-v | --verbose] show [-n] <name>" +msgstr "git remote [-v | --verbose] show [-n] <名称>" + +#: builtin/remote.c:17 +msgid "git remote prune [-n | --dry-run] <name>" +msgstr "git remote prune [-n | --dry-run] <名称>" + +#: builtin/remote.c:18 +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" +msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" + +#: builtin/remote.c:19 +msgid "git remote set-branches [--add] <name> <branch>..." +msgstr "git remote set-branches [--add] <名称> <分支>..." + +#: builtin/remote.c:20 builtin/remote.c:68 +msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" +msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" + +#: builtin/remote.c:21 builtin/remote.c:69 +msgid "git remote set-url --add <name> <newurl>" +msgstr "git remote set-url --add <名称> <新的地址>" + +#: builtin/remote.c:22 builtin/remote.c:70 +msgid "git remote set-url --delete <name> <url>" +msgstr "git remote set-url --delete <名称> <地址>" + +#: builtin/remote.c:27 +msgid "git remote add [<options>] <name> <url>" +msgstr "git remote add [<选项>] <名称> <地址>" + +#: builtin/remote.c:47 +msgid "git remote set-branches <name> <branch>..." +msgstr "git remote set-branches <名称> <分支>..." + +#: builtin/remote.c:48 +msgid "git remote set-branches --add <name> <branch>..." +msgstr "git remote set-branches --add <名称> <分支>..." + +#: builtin/remote.c:53 +msgid "git remote show [<options>] <name>" +msgstr "git remote show [<选项>] <名称>" + +#: builtin/remote.c:58 +msgid "git remote prune [<options>] <name>" +msgstr "git remote prune [<选项>] <名称>" + +#: builtin/remote.c:63 +msgid "git remote update [<options>] [<group> | <remote>]..." +msgstr "git remote update [<选项>] [<组> | <远程>]..." + #: builtin/remote.c:98 #, c-format msgid "Updating %s" @@ -4067,13 +7676,41 @@ msgstr "" msgid "unknown mirror argument: %s" msgstr "未知的镜像参数：%s" +#: builtin/remote.c:163 +msgid "fetch the remote branches" +msgstr "抓取远程的分支" + +#: builtin/remote.c:165 +msgid "import all tags and associated objects when fetching" +msgstr "抓取时导入所有的 tags 和关联对象" + +#: builtin/remote.c:168 +msgid "or do not fetch any tag at all (--no-tags)" +msgstr "或不抓取任何 tag（--no-tags）" + +#: builtin/remote.c:170 +msgid "branch(es) to track" +msgstr "跟踪的分支" + +#: builtin/remote.c:171 +msgid "master branch" +msgstr "主线分支" + +#: builtin/remote.c:172 +msgid "push|fetch" +msgstr "push|fetch" + +#: builtin/remote.c:173 +msgid "set up remote as a mirror to push to or fetch from" +msgstr "把远程设置为用以推送或抓取的镜像" + #: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" #: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" -msgstr "指定要跟踪的分支只在与获取镜像共用才有意义" +msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" #: builtin/remote.c:195 builtin/remote.c:646 #, c-format @@ -4259,6 +7896,10 @@ msgstr " %-*s 强制推送至 %s" msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" +#: builtin/remote.c:1091 +msgid "do not query remotes" +msgstr "不查询远程" + #: builtin/remote.c:1118 #, c-format msgid "* remote %s" @@ -4318,6 +7959,14 @@ msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 为 'git push' 配置的本地引用%s：" msgstr[1] " 为 'git push' 配置的本地引用%s：" +#: builtin/remote.c:1199 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "根据远程设置 refs/remotes/<名称>/HEAD" + +#: builtin/remote.c:1201 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "删除 refs/remotes/<名称>/HEAD" + #: builtin/remote.c:1216 msgid "Cannot determine remote HEAD" msgstr "无法确定远程 HEAD" @@ -4345,13 +7994,13 @@ msgstr "不能设置 %s" #: builtin/remote.c:1274 #, c-format msgid " %s will become dangling!" -msgstr " %s 将成为悬空状态！" +msgstr " %s 将成为摇摆状态！" # 译者：注意保持前导空格 #: builtin/remote.c:1275 #, c-format msgid " %s has become dangling!" -msgstr " %s 已成为悬空状态！" +msgstr " %s 已成为摇摆状态！" #: builtin/remote.c:1281 #, c-format @@ -4373,15 +8022,35 @@ msgstr " * [将删除] %s" msgid " * [pruned] %s" msgstr " * [已删除] %s" +#: builtin/remote.c:1321 +msgid "prune remotes after fetching" +msgstr "抓取后清除远程" + #: builtin/remote.c:1387 builtin/remote.c:1461 #, c-format msgid "No such remote '%s'" msgstr "没有此远程 '%s'" +#: builtin/remote.c:1407 +msgid "add branch" +msgstr "添加分支" + #: builtin/remote.c:1414 msgid "no remote specified" msgstr "未指定远程" +#: builtin/remote.c:1436 +msgid "manipulate push URLs" +msgstr "操作推送 URLS" + +#: builtin/remote.c:1438 +msgid "add URL" +msgstr "添加 URL" + +#: builtin/remote.c:1440 +msgid "delete URLs" +msgstr "删除 URLS" + #: builtin/remote.c:1447 msgid "--add --delete doesn't make sense" msgstr "--add --delete 无意义" @@ -4400,6 +8069,55 @@ msgstr "未找到此URL：%s" msgid "Will not delete all non-push URLs" msgstr "将不会删除所有非推送URL地址" +#: builtin/remote.c:1569 +msgid "be verbose; must be placed before a subcommand" +msgstr "冗长输出；必须置于子命令之前" + +#: builtin/replace.c:17 +msgid "git replace [-f] <object> <replacement>" +msgstr "git replace [-f] <对象> <替换物>" + +#: builtin/replace.c:18 +msgid "git replace -d <object>..." +msgstr "git replace -d <对象>..." + +#: builtin/replace.c:19 +msgid "git replace -l [<pattern>]" +msgstr "git replace -l [<模式>]" + +#: builtin/replace.c:121 +msgid "list replace refs" +msgstr "列出替换的引用" + +#: builtin/replace.c:122 +msgid "delete replace refs" +msgstr "删除替换的引用" + +#: builtin/replace.c:123 +msgid "replace the ref if it exists" +msgstr "如果存在则替换引用" + +#: builtin/rerere.c:11 +msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" + +#: builtin/rerere.c:56 +msgid "register clean resolutions in index" +msgstr "在索引中注册干净的解决方案" + +#: builtin/reset.c:25 +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" + +#: builtin/reset.c:26 +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "git reset [-q] <树或提交> [--] <路径>..." + +#: builtin/reset.c:27 +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" + #: builtin/reset.c:33 msgid "mixed" msgstr "混杂" @@ -4420,90 +8138,227 @@ msgstr "合并" msgid "keep" msgstr "保持" -#: builtin/reset.c:77 +#: builtin/reset.c:73 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" -#: builtin/reset.c:79 +#: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "无法找到 HEAD 指向的树。" -#: builtin/reset.c:85 +#: builtin/reset.c:81 #, c-format msgid "Failed to find tree of %s." msgstr "无法找到 %s 指向的树。" -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "不能写入新的索引文件。" - -#: builtin/reset.c:106 +#: builtin/reset.c:98 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在位于 %s" -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "不能读取索引" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "重置后撤出暂存区的变更：" - # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:223 +#: builtin/reset.c:169 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:297 +#: builtin/reset.c:248 +msgid "be quiet, only report errors" +msgstr "安静模式，只报告错误" + +#: builtin/reset.c:250 +msgid "reset HEAD and index" +msgstr "重置 HEAD 和索引" + +#: builtin/reset.c:251 +msgid "reset only HEAD" +msgstr "只重置 HEAD" + +#: builtin/reset.c:253 builtin/reset.c:255 +msgid "reset HEAD, index and working tree" +msgstr "重置 HEAD、索引和工作区" + +#: builtin/reset.c:257 +msgid "reset HEAD but keep local changes" +msgstr "重置 HEAD 但保存本地变更" + +#: builtin/reset.c:275 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "无法将 '%s' 解析为一个有效的版本。" + +#: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/reset.c:302 +#: builtin/reset.c:283 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "无法将 '%s' 解析为一个有效的树对象。" + +#: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" -msgstr "--patch 与 --{hard,mixed,soft} 不兼容" +msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" -#: builtin/reset.c:311 +#: builtin/reset.c:301 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." -msgstr "--mixed 带路径已弃用，代之以 'git reset -- <paths>'。" +msgstr "--mixed 带路径已弃用，而是用 'git reset -- <paths>'。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:313 +#: builtin/reset.c:303 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:325 +#: builtin/reset.c:313 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能对裸版本库进行%s重置" -#: builtin/reset.c:341 +#: builtin/reset.c:333 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" +#: builtin/reset.c:339 +msgid "Unstaged changes after reset:" +msgstr "重置后撤出暂存区的变更：" + +#: builtin/reset.c:344 +msgid "Could not write new index file." +msgstr "不能写入新的索引文件。" + +#: builtin/rev-parse.c:339 +msgid "git rev-parse --parseopt [options] -- [<args>...]" +msgstr "git rev-parse --parseopt [选项] -- [<参数>...]" + +#: builtin/rev-parse.c:344 +msgid "keep the `--` passed as an arg" +msgstr "保持 `--` 作为一个参数传递" + +#: builtin/rev-parse.c:346 +msgid "stop parsing after the first non-option argument" +msgstr "遇到第一个非选项参数后停止解析" + +#: builtin/rev-parse.c:464 +msgid "" +"git rev-parse --parseopt [options] -- [<args>...]\n" +" or: git rev-parse --sq-quote [<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 --sq-quote [<选项>...]\n" +" 或者：git rev-parse [options] [<选项>...]\n" +"\n" +"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" + +#: builtin/revert.c:22 +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 [选项] <提交号>..." + +#: builtin/revert.c:29 +msgid "git cherry-pick <subcommand>" +msgstr "git cherry-pick <子命令>" + #: builtin/revert.c:70 builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" -msgstr "%s：%s 不能和 %s 共用" +msgstr "%s：%s 不能和 %s 同时使用" + +#: builtin/revert.c:103 +msgid "end revert or cherry-pick sequence" +msgstr "终止反转或拣选操作" + +#: builtin/revert.c:104 +msgid "resume revert or cherry-pick sequence" +msgstr "继续反转或拣选操作" + +#: builtin/revert.c:105 +msgid "cancel revert or cherry-pick sequence" +msgstr "取消反转或拣选操作" + +#: builtin/revert.c:106 +msgid "don't automatically commit" +msgstr "不要自动提交" + +#: builtin/revert.c:107 +msgid "edit the commit message" +msgstr "编辑提交说明" + +#: builtin/revert.c:110 +msgid "parent number" +msgstr "父编号" + +#: builtin/revert.c:112 +msgid "merge strategy" +msgstr "合并策略" + +#: builtin/revert.c:113 +msgid "option" +msgstr "选项" + +#: builtin/revert.c:114 +msgid "option for merge strategy" +msgstr "合并策略的选项" + +#: builtin/revert.c:125 +msgid "append commit name" +msgstr "追加提交名称" -#: builtin/revert.c:131 +#: builtin/revert.c:126 +msgid "allow fast-forward" +msgstr "允许快进式" + +#: builtin/revert.c:127 +msgid "preserve initially empty commits" +msgstr "保留初始化的空提交" + +#: builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "允许提交说明为空" + +#: builtin/revert.c:129 +msgid "keep redundant, empty commits" +msgstr "保持多余的、空的提交" + +#: builtin/revert.c:133 msgid "program error" msgstr "程序错误" -#: builtin/revert.c:221 +#: builtin/revert.c:223 msgid "revert failed" msgstr "还原失败" -#: builtin/revert.c:236 +#: builtin/revert.c:238 msgid "cherry-pick failed" msgstr "拣选失败" -#: builtin/rm.c:109 +#: builtin/rm.c:15 +msgid "git rm [options] [--] <file>..." +msgstr "git rm [选项] [--] <文件>..." + +#: builtin/rm.c:64 builtin/rm.c:186 +#, c-format +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' 命令如果您真的想删除它及其全部历史）" + +#: builtin/rm.c:174 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" @@ -4512,7 +8367,7 @@ msgstr "" "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n" "（使用 -f 强制删除）" -#: builtin/rm.c:115 +#: builtin/rm.c:180 #, c-format msgid "" "'%s' has changes staged in the index\n" @@ -4521,7 +8376,7 @@ msgstr "" "'%s' 有变更已暂存至索引中\n" "（使用 --cached 保存文件，或用 -f 强制删除）" -#: builtin/rm.c:119 +#: builtin/rm.c:191 #, c-format msgid "" "'%s' has local modifications\n" @@ -4530,21 +8385,238 @@ msgstr "" "'%s' 有本地修改\n" "（使用 --cached 保存文件，或用 -f 强制删除）" -#: builtin/rm.c:194 +#: builtin/rm.c:207 +msgid "do not list removed files" +msgstr "不列出删除的文件" + +#: builtin/rm.c:208 +msgid "only remove from the index" +msgstr "只从索引区删除" + +#: builtin/rm.c:209 +msgid "override the up-to-date check" +msgstr "忽略文件更新状态检查" + +#: builtin/rm.c:210 +msgid "allow recursive removal" +msgstr "允许递归删除" + +#: builtin/rm.c:212 +msgid "exit with a zero status even if nothing matched" +msgstr "即使没有匹配，也以零状态退出" + +#: builtin/rm.c:283 #, c-format msgid "not removing '%s' recursively without -r" msgstr "未提供 -r 选项不会递归删除 '%s'" -#: builtin/rm.c:230 +#: builtin/rm.c:322 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm：不能删除 %s" -#: builtin/shortlog.c:157 +#: builtin/shortlog.c:13 +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:227 +msgid "sort output according to the number of commits per author" +msgstr "根据每个作者的提交数量排序" + +#: builtin/shortlog.c:229 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "隐藏提交说明，只提供提交数量" + +#: builtin/shortlog.c:231 +msgid "Show the email address of each author" +msgstr "显示每个作者的电子邮件地址" + +#: builtin/shortlog.c:232 +msgid "w[,i1[,i2]]" +msgstr "w[,i1[,i2]]" + +#: builtin/shortlog.c:233 +msgid "Linewrap output" +msgstr "折行输出" + +#: builtin/show-branch.c:9 +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>)...]" +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>)...]" + +#: 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:650 +msgid "show remote-tracking and local branches" +msgstr "显示远程跟踪的和本地的分支" + +#: builtin/show-branch.c:652 +msgid "show remote-tracking branches" +msgstr "显示远程跟踪的分支" + +#: builtin/show-branch.c:654 +msgid "color '*!+-' corresponding to the branch" +msgstr "着色 '*!+-' 到相应的分支" + +#: builtin/show-branch.c:656 +msgid "show <n> more commits after the common ancestor" +msgstr "显示共同祖先后的 <n> 个提交" + +#: builtin/show-branch.c:658 +msgid "synonym to more=-1" +msgstr "和 more=-1 同义" + +#: builtin/show-branch.c:659 +msgid "suppress naming strings" +msgstr "不显示字符串命名" + +#: builtin/show-branch.c:661 +msgid "include the current branch" +msgstr "包括当前分支" + +#: builtin/show-branch.c:663 +msgid "name commits with their object names" +msgstr "以对象名字命名提交" + +#: builtin/show-branch.c:665 +msgid "show possible merge bases" +msgstr "显示可能合并的基线" + +#: builtin/show-branch.c:667 +msgid "show refs unreachable from any other ref" +msgstr "显示没有任何引用的的引用" + +#: builtin/show-branch.c:669 +msgid "show commits in topological order" +msgstr "以拓扑顺序显示提交" + +#: builtin/show-branch.c:671 +msgid "show only commits not on the first branch" +msgstr "只显示不在第一个分支上的提交" + +#: builtin/show-branch.c:673 +msgid "show merges reachable from only one tip" +msgstr "显示仅一个分支可访问的合并提交" + +#: builtin/show-branch.c:675 +msgid "show commits where no parent comes before its children" +msgstr "显示提交时以时间为序且父提交不能领先子提交" + +#: builtin/show-branch.c:677 +msgid "<n>[,<base>]" +msgstr "<n>[,<base>]" + +#: builtin/show-branch.c:678 +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*] " +msgstr "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " + +#: builtin/show-ref.c:11 +msgid "git show-ref --exclude-existing[=pattern] < ref-list" +msgstr "git show-ref --exclude-existing[=模式] < 引用列表" + +#: builtin/show-ref.c:165 +msgid "only show tags (can be combined with heads)" +msgstr "只显示 tags（可以和头共用）" + +#: builtin/show-ref.c:166 +msgid "only show heads (can be combined with tags)" +msgstr "只显示头（可以和 tags 共用）" + +#: builtin/show-ref.c:167 +msgid "stricter reference checking, requires exact ref path" +msgstr "更严格的引用检测，需要精确的引用路径" + +#: builtin/show-ref.c:170 builtin/show-ref.c:172 +msgid "show the HEAD reference" +msgstr "显示 HEAD 引用" + +#: builtin/show-ref.c:174 +msgid "dereference tags into object IDs" +msgstr "转换 tags 到对象ID" + +#: builtin/show-ref.c:176 +msgid "only show SHA1 hash using <n> digits" +msgstr "只显示使用 <n> 个数字的 SHA1 哈希" + +#: builtin/show-ref.c:180 +msgid "do not print results to stdout (useful with --verify)" +msgstr "不打印结果到标准输出（例如与 --verify 参数共用）" + +#: builtin/show-ref.c:182 +msgid "show refs from stdin that aren't in local repository" +msgstr "显示从标准输入中读入的不在本地版本库中的引用" + +#: builtin/symbolic-ref.c:7 +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] 名称" + +#: builtin/symbolic-ref.c:40 +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "不显示非符号（分离的）引用的错误信息" + +#: builtin/symbolic-ref.c:41 +msgid "delete symbolic ref" +msgstr "删除符号引用" + +#: builtin/symbolic-ref.c:42 +msgid "shorten ref output" +msgstr "简短的引用输出" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +msgid "reason" +msgstr "原因" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +msgid "reason of the update" +msgstr "更新的原因" + +#: builtin/tag.c:22 +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 <文件>] <标签名> [<头>]" + +#: builtin/tag.c:23 +msgid "git tag -d <tagname>..." +msgstr "git tag -d <标签名>..." + +#: builtin/tag.c:24 +msgid "" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"\t\t[<pattern>...]" +msgstr "" +"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n" +"\t\t[<模式>...]" + +#: builtin/tag.c:26 +msgid "git tag -v <tagname>..." +msgstr "git tag -v <标签名>..." + #: builtin/tag.c:60 #, c-format msgid "malformed object at '%s'" @@ -4571,150 +8643,361 @@ msgid "could not verify the tag '%s'" msgstr "不能校验 tag '%s'" #: builtin/tag.c:249 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" +"Write a tag message\n" +"Lines starting with '%c' will be ignored.\n" msgstr "" "\n" -"#\n" -"# 输入一个 tag 说明\n" -"# 以 '#' 开头的行将被忽略。\n" -"#\n" +"输入一个 tag 说明\n" +"以 '%c' 开头的行将被忽略。\n" -#: builtin/tag.c:256 +#: builtin/tag.c:253 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " +"Write a tag message\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" -"#\n" msgstr "" "\n" -"#\n" -"# 输入一个 tag 说明\n" -"# 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。\n" -"#\n" +"输入一个 tag 说明\n" +"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n" -#: builtin/tag.c:298 +#: builtin/tag.c:292 msgid "unable to sign the tag" msgstr "无法签署 tag" -#: builtin/tag.c:300 +#: builtin/tag.c:294 msgid "unable to write tag file" msgstr "无法写 tag 文件" -#: builtin/tag.c:325 +#: builtin/tag.c:319 msgid "bad object type." msgstr "坏的对象类型。" -#: builtin/tag.c:338 +#: builtin/tag.c:332 msgid "tag header too big." msgstr "tag 头信息太大。" -#: builtin/tag.c:370 +#: builtin/tag.c:368 msgid "no tag message?" msgstr "无 tag 说明？" -#: builtin/tag.c:376 +#: builtin/tag.c:374 #, c-format msgid "The tag message has been left in %s\n" msgstr "tag 说明被保留在 %s\n" -#: builtin/tag.c:425 +#: builtin/tag.c:423 msgid "switch 'points-at' requires an object" msgstr "开关 'points-at' 需要一个对象" -#: builtin/tag.c:427 +#: builtin/tag.c:425 #, c-format msgid "malformed object name '%s'" msgstr "非法的对象名 '%s'" -#: builtin/tag.c:506 +#: builtin/tag.c:445 +msgid "list tag names" +msgstr "列出tag名称" + +#: builtin/tag.c:447 +msgid "print <n> lines of each tag message" +msgstr "每个 tag 信息打印 <n> 行" + +#: builtin/tag.c:449 +msgid "delete tags" +msgstr "删除 tags" + +#: builtin/tag.c:450 +msgid "verify tags" +msgstr "验证 tags" + +#: builtin/tag.c:452 +msgid "Tag creation options" +msgstr "Tag 创建选项" + +#: builtin/tag.c:454 +msgid "annotated tag, needs a message" +msgstr "注解 tag，需要一个说明" + +#: builtin/tag.c:456 +msgid "tag message" +msgstr "tag 说明" + +#: builtin/tag.c:458 +msgid "annotated and GPG-signed tag" +msgstr "注解并 GPG 签名的 tag" + +#: builtin/tag.c:462 +msgid "use another key to sign the tag" +msgstr "使用另外的私钥签名 tag" + +#: builtin/tag.c:463 +msgid "replace the tag if exists" +msgstr "如果存在，替换现有的 tag" + +#: builtin/tag.c:464 +msgid "show tag list in columns" +msgstr "以列的方式显示 tag" + +#: builtin/tag.c:466 +msgid "Tag listing options" +msgstr "Tag 列表选项" + +#: builtin/tag.c:469 +msgid "print only tags that contain the commit" +msgstr "只打印包含提交的tags" + +#: builtin/tag.c:475 +msgid "print only tags of the object" +msgstr "只打印tags对象" + +#: builtin/tag.c:504 msgid "--column and -n are incompatible" msgstr "--column 和 -n 不兼容" -#: builtin/tag.c:523 +#: builtin/tag.c:521 msgid "-n option is only allowed with -l." -msgstr "-n 选项只允许和 -l 共用。" +msgstr "-n 选项只允许和 -l 同时使用。" -#: builtin/tag.c:525 +#: builtin/tag.c:523 msgid "--contains option is only allowed with -l." -msgstr "--contains 选项只允许和 -l 共用。" +msgstr "--contains 选项只允许和 -l 同时使用。" -#: builtin/tag.c:527 +#: builtin/tag.c:525 msgid "--points-at option is only allowed with -l." -msgstr "--points-at 选项只允许和 -l 共用。" +msgstr "--points-at 选项只允许和 -l 同时使用。" -#: builtin/tag.c:535 +#: builtin/tag.c:533 msgid "only one -F or -m option is allowed." msgstr "只允许一个 -F 或 -m 选项。" -#: builtin/tag.c:555 +#: builtin/tag.c:553 msgid "too many params" msgstr "太多参数" -#: builtin/tag.c:561 +#: builtin/tag.c:559 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一个有效的tag名称。" -#: builtin/tag.c:566 +#: builtin/tag.c:564 #, c-format msgid "tag '%s' already exists" msgstr "tag '%s' 已存在" -#: builtin/tag.c:584 +#: builtin/tag.c:582 #, c-format msgid "%s: cannot lock the ref" msgstr "%s：不能锁定引用" -#: builtin/tag.c:586 +#: builtin/tag.c:584 #, c-format msgid "%s: cannot update the ref" msgstr "%s：不能更新引用" -#: builtin/tag.c:588 +#: builtin/tag.c:586 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新tag '%s'（曾为 %s）\n" -#: git.c:16 -msgid "See 'git help <command>' for more information on a specific command." -msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。" +#: builtin/update-index.c:401 +msgid "git update-index [options] [--] [<file>...]" +msgstr "git update-index [选项] [--] [<文件>...]" -#: parse-options.h:133 parse-options.h:235 -msgid "n" -msgstr "数字" +#: builtin/update-index.c:718 +msgid "continue refresh even when index needs update" +msgstr "当索引需要更新时继续刷新" -#: parse-options.h:141 -msgid "time" -msgstr "时间" +#: builtin/update-index.c:721 +msgid "refresh: ignore submodules" +msgstr "刷新：忽略子模组" -#: parse-options.h:149 -msgid "file" -msgstr "文件" +#: builtin/update-index.c:724 +msgid "do not ignore new files" +msgstr "不忽略新的文件" -#: parse-options.h:151 -msgid "when" -msgstr "何时" +#: builtin/update-index.c:726 +msgid "let files replace directories and vice-versa" +msgstr "让文件替换目录（反之亦然）" + +#: builtin/update-index.c:728 +msgid "notice files missing from worktree" +msgstr "通知文件从工作区丢失" + +#: builtin/update-index.c:730 +msgid "refresh even if index contains unmerged entries" +msgstr "即使索引区包含未合并的条目也执行刷新" + +#: builtin/update-index.c:733 +msgid "refresh stat information" +msgstr "刷新统计信息" + +#: builtin/update-index.c:737 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置" + +#: builtin/update-index.c:741 +msgid "<mode> <object> <path>" +msgstr "<mode> <object> <path>" + +#: builtin/update-index.c:742 +msgid "add the specified entry to the index" +msgstr "添加指定的条目到索引区" + +#: builtin/update-index.c:746 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/update-index.c:747 +msgid "override the executable bit of the listed files" +msgstr "覆盖列表里文件的可执行位" + +#: builtin/update-index.c:751 +msgid "mark files as \"not changing\"" +msgstr "把文件标记为 \"没有变更\"" + +#: builtin/update-index.c:754 +msgid "clear assumed-unchanged bit" +msgstr "清除 assumed-unchanged 位" + +#: builtin/update-index.c:757 +msgid "mark files as \"index-only\"" +msgstr "把文件标记为 \"仅索引\"" + +#: builtin/update-index.c:760 +msgid "clear skip-worktree bit" +msgstr "清除 skip-worktree 位" + +#: builtin/update-index.c:763 +msgid "add to index only; do not add content to object database" +msgstr "只添加到索引区；不添加对象到对象库" + +#: builtin/update-index.c:765 +msgid "remove named paths even if present in worktree" +msgstr "即使存在工作区里，也删除路径" + +#: builtin/update-index.c:767 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "携带 --stdin：输入的行以 null 字符终止" + +#: builtin/update-index.c:769 +msgid "read list of paths to be updated from standard input" +msgstr "从标准输入中读取需要更新的路径列表" + +#: builtin/update-index.c:773 +msgid "add entries from standard input to the index" +msgstr "从标准输入添加条目到索引区" + +#: builtin/update-index.c:777 +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "为指定文件重新生成第2和第3暂存区" + +#: builtin/update-index.c:781 +msgid "only update entries that differ from HEAD" +msgstr "只更新与 HEAD 不同的条目" + +#: builtin/update-index.c:785 +msgid "ignore files missing from worktree" +msgstr "忽略工作区丢失的文件" + +#: builtin/update-index.c:788 +msgid "report actions to standard output" +msgstr "在标准输出显示操作" + +#: builtin/update-index.c:790 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "(for porcelains) 忘记保存的未解决的冲突" + +#: builtin/update-index.c:794 +msgid "write index in this format" +msgstr "以这种格式写入索引区" + +#: builtin/update-ref.c:7 +msgid "git update-ref [options] -d <refname> [<oldval>]" +msgstr "git update-ref [options] -d <引用名> [<旧值>]" + +#: builtin/update-ref.c:8 +msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgstr "git update-ref [options] <引用名> <新值> [<旧值>]" + +#: builtin/update-ref.c:19 +msgid "delete the reference" +msgstr "删除引用" + +#: builtin/update-ref.c:21 +msgid "update <refname> not the one it points to" +msgstr "更新 <引用名> 本身而不是它指向的引用" + +#: builtin/update-server-info.c:6 +msgid "git update-server-info [--force]" +msgstr "git update-server-info [--force]" + +#: builtin/update-server-info.c:14 +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-pack.c:66 +msgid "verbose" +msgstr "冗长输出" + +#: builtin/verify-pack.c:68 +msgid "show statistics only" +msgstr "只显示统计" + +#: builtin/verify-tag.c:17 +msgid "git verify-tag [-v|--verbose] <tag>..." +msgstr "git verify-tag [-v|--verbose] <tag>..." + +#: builtin/verify-tag.c:73 +msgid "print tag contents" +msgstr "打印 tag 内容" + +#: builtin/write-tree.c:13 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" + +#: builtin/write-tree.c:26 +msgid "<prefix>/" +msgstr "<前缀>/" + +#: builtin/write-tree.c:27 +msgid "write tree object for a subdirectory <prefix>" +msgstr "将 <前缀> 子目录内容写到一个树对象" + +#: builtin/write-tree.c:30 +msgid "only useful for debugging" +msgstr "只对调试有用" + +#: git.c:16 +msgid "" +"'git help -a' and 'git help -g' lists 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 <指南>' 来查看给定的子命令帮助或指南。" #: parse-options.h:156 msgid "no-op (backward compatibility)" msgstr "空操作（向后兼容）" -#: parse-options.h:228 +#: parse-options.h:232 msgid "be more verbose" msgstr "更加详细" -#: parse-options.h:230 +#: parse-options.h:234 msgid "be more quiet" msgstr "更加安静" -#: parse-options.h:236 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> 位数字显示 SHA-1 哈希值" @@ -4755,8 +9038,8 @@ msgid "Print lines matching a pattern" msgstr "输出和模式匹配的行" #: common-cmds.h:17 -msgid "Create an empty git repository or reinitialize an existing one" -msgstr "创建一个空的 git 版本库或者重新初始化一个" +msgid "Create an empty Git repository or reinitialize an existing one" +msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库" #: common-cmds.h:18 msgid "Show commit logs" @@ -4810,15 +9093,14 @@ msgstr "您需要先设置你的提交者信息" msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" -msgstr "" -"您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" +msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" #: git-am.sh:105 #, sh-format msgid "" -"When you have resolved this problem run \"$cmdline --resolved\".\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\"." +"When you have resolved this problem, run \"$cmdline --resolved\".\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 --resolved\"。\n" "如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n" @@ -4830,7 +9112,11 @@ msgstr "无法求助于三路合并。" #: git-am.sh:137 msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "版本库缺乏必要的 blob 数据以进行三路合并。" +msgstr "版本库缺乏必要的数据（blob）对象以进行三路合并。" + +#: git-am.sh:139 +msgid "Using index info to reconstruct a base tree..." +msgstr "使用索引来重建一个（三路合并的）基础目录树..." #: git-am.sh:154 msgid "" @@ -4838,48 +9124,56 @@ msgid "" "It does not apply to blobs recorded in its index." msgstr "" "您是否曾手动编辑过您的补丁？\n" -"无法应用补丁到索引中的数据上。" +"无法应用补丁到索引中的数据（blob）对象上。" #: git-am.sh:163 msgid "Falling back to patching base and 3-way merge..." msgstr "转而在基础版本上打补丁及进行三路合并..." -#: git-am.sh:275 +#: git-am.sh:179 +msgid "Failed to merge in the changes." +msgstr "无法合并变更。" + +#: git-am.sh:274 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: git-am.sh:362 +#: git-am.sh:361 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "不支持 $patch_format 补丁格式。" -#: git-am.sh:364 +#: git-am.sh:363 msgid "Patch format detection failed." msgstr "补丁格式检测失败。" -#: git-am.sh:418 -msgid "-d option is no longer supported. Do not use." -msgstr "不再支持 -d 选项。不要使用。" +#: git-am.sh:389 +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:481 +#: git-am.sh:477 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。" -#: git-am.sh:486 +#: git-am.sh:482 msgid "Please make up your mind. --skip or --abort?" msgstr "请下决心。--skip 或是 --abort ？" -#: git-am.sh:513 +#: git-am.sh:509 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" -#: git-am.sh:579 +#: git-am.sh:575 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "脏的索引：不能应用补丁（脏文件：$files）" -#: git-am.sh:671 +#: git-am.sh:679 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -4890,15 +9184,15 @@ msgstr "" "如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n" "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" -#: git-am.sh:708 +#: git-am.sh:706 msgid "Patch does not have a valid e-mail address." msgstr "补丁中没有一个有效的邮件地址。" -#: git-am.sh:755 +#: git-am.sh:753 msgid "cannot be interactive without stdin connected to a terminal." msgstr "标准输入没有和终端关联，不能进行交互式操作。" -#: git-am.sh:759 +#: git-am.sh:757 msgid "Commit Body is:" msgstr "提交内容为：" @@ -4906,16 +9200,16 @@ 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:766 +#: git-am.sh:764 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:802 +#: git-am.sh:800 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "正应用：$FIRSTLINE" -#: git-am.sh:823 +#: git-am.sh:821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4925,23 +9219,31 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: git-am.sh:831 +#: git-am.sh:829 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" -msgstr "" -"您的索引中仍有未合并的路径。您是否忘了执行 'git add'？" +msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？" -#: git-am.sh:847 +#: git-am.sh:845 msgid "No changes -- Patch already applied." -msgstr "没有变更 -- 补丁已经应用过。" +msgstr "没有变更 —— 补丁已经应用过。" -#: git-am.sh:857 +#: git-am.sh:855 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "补丁失败于 $msgnum $FIRSTLINE" -#: git-am.sh:873 +#: git-am.sh:858 +#, sh-format +msgid "" +"The copy of the patch that failed is found in:\n" +" $dotest/patch" +msgstr "" +"失败的补丁文件副本位于：\n" +" $dotest/patch" + +#: git-am.sh:876 msgid "applying to an empty history" msgstr "正应用到一个空历史上" @@ -5040,56 +9342,56 @@ msgstr "" "然后需要提供我至少一个好版本和一个坏版本。\n" "（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）" -#: git-bisect.sh:347 git-bisect.sh:474 +#: git-bisect.sh:363 git-bisect.sh:490 msgid "We are not bisecting." msgstr "我们没有在二分查找。" -#: git-bisect.sh:354 +#: git-bisect.sh:370 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "'$invalid' 不是一个有效的提交" -#: git-bisect.sh:363 +#: git-bisect.sh:379 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" "Try 'git bisect reset <commit>'." msgstr "" "不能检出原始 HEAD '$branch'。\n" -"尝试 'git bisect reset <commit>'。" +"尝试 'git bisect reset <提交>'。" -#: git-bisect.sh:390 +#: git-bisect.sh:406 msgid "No logfile given" msgstr "未提供日志文件" -#: git-bisect.sh:391 +#: git-bisect.sh:407 #, sh-format msgid "cannot read $file for replaying" msgstr "不能读取 $file 来重放" -#: git-bisect.sh:408 +#: git-bisect.sh:424 msgid "?? what are you talking about?" msgstr "?? 您在说什么?" -#: git-bisect.sh:420 +#: git-bisect.sh:436 #, sh-format msgid "running $command" msgstr "运行 $command" -#: git-bisect.sh:427 +#: git-bisect.sh:443 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" "二分查找运行失败：\n" -"命令 '$command' 的退出码 $res 或者小于 0 或者大于等于 128" +"命令 '$command' 的退出码 $res 小于 0 或大于等于 128" -#: git-bisect.sh:453 +#: git-bisect.sh:469 msgid "bisect run cannot continue any more" msgstr "二分查找不能继续运行" -#: git-bisect.sh:459 +#: git-bisect.sh:475 #, sh-format msgid "" "bisect run failed:\n" @@ -5098,7 +9400,7 @@ msgstr "" "二分查找运行失败：\n" "'bisect_state $state' 退出码为 $res" -#: git-bisect.sh:466 +#: git-bisect.sh:482 msgid "bisect run success" msgstr "二分查找运行成功" @@ -5116,7 +9418,7 @@ msgstr "" msgid "Pull is not possible because you have unmerged files." msgstr "Pull 不可用，因为您尚有未合并的文件。" -#: git-pull.sh:197 +#: git-pull.sh:203 msgid "updating an unborn branch with changes added to the index" msgstr "更新尚未诞生的分支，变更添加至索引" @@ -5124,7 +9426,7 @@ msgstr "更新尚未诞生的分支，变更添加至索引" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:228 +#: git-pull.sh:235 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -5134,14 +9436,135 @@ msgstr "" "警告：fetch 更新了当前的分支。您的工作区\n" "警告：从原提交 $orig_head 快进。" -#: git-pull.sh:253 +#: git-pull.sh:260 msgid "Cannot merge multiple branches into empty head" msgstr "无法将多个分支合并到空分支" -#: git-pull.sh:257 +#: git-pull.sh:264 msgid "Cannot rebase onto multiple branches" msgstr "无法变基到多个分支" +#: git-rebase.sh:53 +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" +"To check out the original branch and stop rebasing, run \"git rebase --abort" +"\"." +msgstr "" +"当您解决了此问题后，执行 \"git rebase --continue\"。\n" +"如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n" +"要恢复原分支并停止变基，执行 \"git rebase --abort\"。" + +#: git-rebase.sh:160 +msgid "The pre-rebase hook refused to rebase." +msgstr "钩子 pre-rebase 拒绝变基。" + +#: git-rebase.sh:165 +msgid "It looks like git-am is in progress. Cannot rebase." +msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" + +#: git-rebase.sh:296 +msgid "The --exec option must be used with the --interactive option" +msgstr "选项 --exec 必须和选项 --interactive 同时使用" + +#: git-rebase.sh:301 +msgid "No rebase in progress?" +msgstr "没有正在进行的变基？" + +#: git-rebase.sh:312 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "动作 --edit-todo 只能用在交互式变基过程中。" + +#: git-rebase.sh:319 +msgid "Cannot read HEAD" +msgstr "不能读取 HEAD" + +#: git-rebase.sh:322 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" +"您必须编辑所有的合并冲突，然后通过 git add\n" +"命令将它们标记为已解决" + +#: git-rebase.sh:340 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "无法移回 $head_name" + +#: git-rebase.sh:359 +#, sh-format +msgid "" +"It seems that there is already a $state_dir_base directory, and\n" +"I wonder if you are in the middle of another rebase. If that is the\n" +"case, please try\n" +"\t$cmd_live_rebase\n" +"If that is not the case, please\n" +"\t$cmd_clear_stale_rebase\n" +"and run me again. I am stopping in case you still have something\n" +"valuable there." +msgstr "" +"好像已有一个 $state_dir_base 目录，我怀疑您正处于另外一个变基过程中。\n" +"如果是这样，请尝试执行\n" +"\t$cmd_live_rebase\n" +"如果不是这样，请执行\n" +"\t$cmd_clear_stale_rebase\n" +"然后再重新执行变基。为避免您丢失重要数据，我已经停止当前操作。" + +#: git-rebase.sh:404 +#, sh-format +msgid "invalid upstream $upstream_name" +msgstr "无效的上游 $upstream_name" + +#: git-rebase.sh:428 +#, sh-format +msgid "$onto_name: there are more than one merge bases" +msgstr "$onto_name: 有一个以上的合并基准" + +#: git-rebase.sh:431 git-rebase.sh:435 +#, sh-format +msgid "$onto_name: there is no merge base" +msgstr "$onto_name: 没有合并基准" + +#: git-rebase.sh:440 +#, sh-format +msgid "Does not point to a valid commit: $onto_name" +msgstr "没有指向一个有效的提交：$onto_name" + +#: git-rebase.sh:463 +#, sh-format +msgid "fatal: no such branch: $branch_name" +msgstr "严重错误：无此分支：$branch_name" + +#: git-rebase.sh:483 +msgid "Please commit or stash them." +msgstr "请提交或为它们保存进度。" + +#: git-rebase.sh:501 +#, sh-format +msgid "Current branch $branch_name is up to date." +msgstr "当前分支 $branch_name 是最新的。" + +#: git-rebase.sh:504 +#, sh-format +msgid "Current branch $branch_name is up to date, rebase forced." +msgstr "当前分支 $branch_name 是最新的，强制变基。" + +#: git-rebase.sh:515 +#, sh-format +msgid "Changes from $mb to $onto:" +msgstr "变更从 $mb 到 $onto：" + +#. Detach HEAD and reset the tree +#: git-rebase.sh:524 +msgid "First, rewinding head to replay your work on top of it..." +msgstr "首先，重置头指针以便在上面重放您的工作..." + +#: git-rebase.sh:532 +#, sh-format +msgid "Fast-forwarded $branch_name to $onto_name." +msgstr "快进 $branch_name 至 $onto_name。" + #: git-stash.sh:51 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear 不支持参数" @@ -5249,59 +9672,59 @@ msgstr "不能保存索引树" msgid "Cannot unstage modified files" msgstr "无法还原修改的文件" -#: git-stash.sh:474 +#: git-stash.sh:475 msgid "Index was not unstashed." msgstr "索引的进度没有被恢复。" -#: git-stash.sh:491 +#: git-stash.sh:492 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" -#: git-stash.sh:492 +#: git-stash.sh:493 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}：不能丢弃进度条目" -#: git-stash.sh:499 +#: git-stash.sh:500 msgid "No branch name specified" msgstr "未指定分支名" -#: git-stash.sh:570 +#: git-stash.sh:571 msgid "(To restore them type \"git stash apply\")" msgstr "（为恢复数据输入 \"git stash apply\"）" -#: git-submodule.sh:56 +#: git-submodule.sh:91 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "无法从 url '$remoteurl' 剥离一个组件" -#: git-submodule.sh:109 +#: git-submodule.sh:196 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射" -#: git-submodule.sh:150 +#: git-submodule.sh:239 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" -#: git-submodule.sh:160 +#: git-submodule.sh:251 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" -msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反" +msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反" -#: git-submodule.sh:249 +#: git-submodule.sh:349 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:266 +#: git-submodule.sh:366 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:270 +#: git-submodule.sh:370 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5312,160 +9735,357 @@ msgstr "" "$sm_path\n" "如果您确实想添加它，使用 -f 参数。" -#: git-submodule.sh:281 +#: git-submodule.sh:388 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存版本库到索引" -#: git-submodule.sh:283 +#: git-submodule.sh:390 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库" -#: git-submodule.sh:297 +#: git-submodule.sh:398 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程版本库：" + +#: git-submodule.sh:400 +#, sh-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from" +msgstr "如果您想重用此本地 git 目录而不是重新克隆自" + +#: git-submodule.sh:402 +#, sh-format +msgid "" +"use the '--force' option. If the local git directory is not the correct repo" +msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库" + +#: git-submodule.sh:403 +#, sh-format +msgid "" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。" + +#: git-submodule.sh:405 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "激活本地 git 目录到子模组 '$sm_name'。" + +#: git-submodule.sh:417 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:302 +#: git-submodule.sh:422 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:307 +#: git-submodule.sh:431 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:349 +#: git-submodule.sh:474 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "正在进入 '$prefix$sm_path'" -#: git-submodule.sh:363 +#: git-submodule.sh:488 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "停止于 '$sm_path'，脚本返回非零值。" -#: git-submodule.sh:406 +#: git-submodule.sh:532 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url" -#: git-submodule.sh:415 +#: git-submodule.sh:541 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "无法为子模组路径 '$sm_path' 注册 url" -#: git-submodule.sh:417 +#: git-submodule.sh:543 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册" -#: git-submodule.sh:425 +#: git-submodule.sh:551 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "无法为子模组路径 '$sm_path' 注册更新模式" -#: git-submodule.sh:524 +#: git-submodule.sh:588 +#, sh-format +msgid "Use '.' if you really want to deinitialize all submodules" +msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化" + +#: git-submodule.sh:603 +#, sh-format +msgid "Submodule work tree '$sm_path' contains a .git directory" +msgstr "子模组工作区 '$sm_path' 包含一个 .git 目录" + +#: git-submodule.sh:604 +#, sh-format +msgid "" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" + +#: git-submodule.sh:610 +#, sh-format +msgid "" +"Submodule work tree '$sm_path' contains local modifications; use '-f' to " +"discard them" +msgstr "子模组工作区 '$sm_path' 包含本地修改；使用 '-f' 丢弃它们" + +#: git-submodule.sh:613 +#, sh-format +msgid "Cleared directory '$sm_path'" +msgstr "已清除目录 '$sm_path'" + +#: git-submodule.sh:614 +#, sh-format +msgid "Could not remove submodule work tree '$sm_path'" +msgstr "无法移除子模组工作区 '$sm_path'" + +#: git-submodule.sh:617 +#, sh-format +msgid "Could not create empty submodule directory '$sm_path'" +msgstr "不能创建空的子模组目录 '$sm_path'" + +#: git-submodule.sh:626 +#, sh-format +msgid "Submodule '$name' ($url) unregistered for path '$sm_path'" +msgstr "子模组 '$name' ($url) 未对路径 '$sm_path' 注册" + +#: git-submodule.sh:731 #, sh-format msgid "" -"Submodule path '$sm_path' not initialized\n" +"Submodule path '$prefix$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -"子模组路径 '$sm_path' 没有初始化\n" +"子模组路径 '$prefix$sm_path' 没有初始化\n" "也许您想用 'update --init'？" -#: git-submodule.sh:537 +#: git-submodule.sh:744 #, sh-format -msgid "Unable to find current revision in submodule path '$sm_path'" -msgstr "无法在子模组路径 '$sm_path' 中找到当前版本" +msgid "Unable to find current revision in submodule path '$prefix$sm_path'" +msgstr "无法在子模组路径 '$prefix$sm_path' 中找到当前版本" -#: git-submodule.sh:556 +#: git-submodule.sh:753 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:570 +#: git-submodule.sh:777 #, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" -msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'" +msgid "Unable to fetch in submodule path '$prefix$sm_path'" +msgstr "无法在子模组路径 '$prefix$sm_path' 中获取" -#: git-submodule.sh:571 +#: git-submodule.sh:791 #, sh-format -msgid "Submodule path '$sm_path': rebased into '$sha1'" -msgstr "子模组路径 '$sm_path'：变基至 '$sha1'" +msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'" +msgstr "无法在子模组路径 '$prefix$sm_path' 中变基 '$sha1'" -#: git-submodule.sh:576 +#: git-submodule.sh:792 #, sh-format -msgid "Unable to merge '$sha1' in submodule path '$sm_path'" -msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中" +msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'" +msgstr "子模组路径 '$prefix$sm_path'：变基至 '$sha1'" -#: git-submodule.sh:577 +#: git-submodule.sh:797 #, sh-format -msgid "Submodule path '$sm_path': merged in '$sha1'" -msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'" +msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'" +msgstr "无法合并 '$sha1' 到子模组路径 '$prefix$sm_path' 中" -#: git-submodule.sh:582 +#: git-submodule.sh:798 #, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" -msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'" +msgid "Submodule path '$prefix$sm_path': merged in '$sha1'" +msgstr "子模组路径 '$prefix$sm_path'：已合并入 '$sha1'" -#: git-submodule.sh:583 +#: git-submodule.sh:803 #, sh-format -msgid "Submodule path '$sm_path': checked out '$sha1'" -msgstr "子模组路径 '$sm_path'：检出 '$sha1'" +msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'" +msgstr "无法在子模组路径 '$prefix$sm_path' 中检出 '$sha1'" -#: git-submodule.sh:605 git-submodule.sh:928 +#: git-submodule.sh:804 #, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "无法递归进子模组路径 '$sm_path'" +msgid "Submodule path '$prefix$sm_path': checked out '$sha1'" +msgstr "子模组路径 '$prefix$sm_path'：检出 '$sha1'" + +#: git-submodule.sh:831 +#, sh-format +msgid "Failed to recurse into submodule path '$prefix$sm_path'" +msgstr "无法递归进子模组路径 '$prefix$sm_path'" -#: git-submodule.sh:713 -msgid "--cached cannot be used with --files" -msgstr "--cached 不能和 --files 共用" +#: git-submodule.sh:939 +msgid "The --cached option cannot be used with the --files option" +msgstr "选项 --cached 不能和选项 --files 同时使用" #. unexpected type -#: git-submodule.sh:753 +#: git-submodule.sh:979 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:771 +#: git-submodule.sh:997 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " 警告：$name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:774 +#: git-submodule.sh:1000 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " 警告：$name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:777 +#: git-submodule.sh:1003 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst" -#: git-submodule.sh:802 +#: git-submodule.sh:1028 msgid "blob" -msgstr "blob" +msgstr "数据对象" -#: git-submodule.sh:803 -msgid "submodule" -msgstr "子模组" - -#: git-submodule.sh:840 -msgid "# Submodules changed but not updated:" -msgstr "# 子模组已修改但尚未更新：" +#: git-submodule.sh:1066 +msgid "Submodules changed but not updated:" +msgstr "子模组已修改但尚未更新：" -#: git-submodule.sh:842 -msgid "# Submodule changes to be committed:" +#: git-submodule.sh:1068 +msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: git-submodule.sh:974 +#: git-submodule.sh:1153 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "无法递归进子模组路径 '$sm_path'" + +#: git-submodule.sh:1216 #, sh-format -msgid "Synchronizing submodule url for '$name'" -msgstr "为 '$name' 同步子模组 url" +msgid "Synchronizing submodule url for '$prefix$sm_path'" +msgstr "为 '$prefix$sm_path' 同步子模组 url" + +#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" +#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]" + +#~ msgid "See 'git help <command>' for more information on a specific command." +#~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。" + +#~ msgid "BUG: impossible combination of %d and %p" +#~ msgstr "BUG: 无法组合 %d 和 %p" + +# 译者：以下三条实际为一个段落 +#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'" +#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'" + +# 译者：为对齐，下面两句内容有调整 +#~ msgid "may speed it up, but you have to be careful not to forget to add" +#~ msgstr "也许能提高速度，但您需要小心不要忘了添加新文件" + +#~ msgid "new files yourself (see 'git help status')." +#~ msgstr "（参见 'git help status'）。" + +#, fuzzy +#~ msgid "aaaSynchronizing submodule url for '$prefix$sm_path'" +#~ msgstr "为 '$prefix$sm_path' 同步子模组 url" + +#~ msgid "use any ref in .git/refs" +#~ msgstr "使用 .git/refs 里的任意引用" + +#~ msgid "use any tag in .git/refs/tags" +#~ msgstr "使用 .git/refs/tags 里的任意 tag" + +#~ msgid "bad object %s" +#~ msgstr "坏对象 %s" + +#~ msgid "bogus committer info %s" +#~ msgstr "虚假的提交者信息 %s" + +#~ msgid "can't fdopen 'show' output fd" +#~ msgstr "不能打开 'show' 输出文件句柄" + +#~ msgid "failed to close pipe to 'show' for object '%s'" +#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道" + +#~ msgid " 0 files changed" +#~ msgstr " 0 个文件被修改" + +#~ msgid " %d file changed" +#~ msgid_plural " %d files changed" +#~ msgstr[0] " %d 个文件被修改" +#~ msgstr[1] " %d 个文件被修改" + +#~ msgid ", %d insertion(+)" +#~ msgid_plural ", %d insertions(+)" +#~ msgstr[0] "，插入 %d 行(+)" +#~ msgstr[1] "，插入 %d 行(+)" + +#~ msgid ", %d deletion(-)" +#~ msgid_plural ", %d deletions(-)" +#~ msgstr[0] "，删除 %d 行(-)" +#~ msgstr[1] "，删除 %d 行(-)" + +#~ msgid "You do not have a valid HEAD" +#~ msgstr "您没有一个有效的 HEAD" + +#~ msgid "oops" +#~ msgstr "哎哟" + +#~ msgid "Would not remove %s\n" +#~ msgstr "不会删除 %s\n" + +#~ msgid "Not removing %s\n" +#~ msgstr "未删除 %s\n" + +#~ msgid "Auto packing the repository for optimum performance.\n" +#~ msgstr "自动打包版本库以求最佳性能。\n" + +#~ msgid "git remote set-head <name> (-a | -d | <branch>])" +#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])" + +#~ msgid "Could not read index" +#~ msgstr "不能读取索引" + +# 译者：中文字符串拼接，可删除前导空格 +#~ msgid " (use \"git add\" to track)" +#~ msgstr "（使用 \"git add\" 建立跟踪）" + +#~ msgid "-B cannot be used with -b" +#~ msgstr "-B 不能和 -b 同时使用" + +#~ msgid "--patch is incompatible with all other options" +#~ msgstr "--patch 选项和其他选项不兼容" + +#~ msgid "--detach cannot be used with -b/-B/--orphan" +#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用" + +#~ msgid "--detach cannot be used with -t" +#~ msgstr "--detach 不能和 -t 同时使用" + +#~ msgid "--orphan and -b|-B are mutually exclusive" +#~ msgstr "--orphan 和 -b|-B 互斥" + +#~ msgid "--orphan cannot be used with -t" +#~ msgstr "--orphan 不能和 -t 同时使用" + +#~ msgid "git checkout: -f and -m are incompatible" +#~ msgstr "git checkout：-f 和 -m 不兼容" + +#~ msgid "" +#~ "git checkout: updating paths is incompatible with switching branches." +#~ msgstr "git checkout：更新路径和切换分支不兼容。" + +#~ msgid "diff setup failed" +#~ msgstr "diff 设置失败" + +#~ msgid "merge-recursive: disk full?" +#~ msgstr "merge-recursive：磁盘已满？" + +#~ msgid "diff_setup_done failed" +#~ msgstr "diff_setup_done 失败" |