diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2014-03-13 12:41:34 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2014-04-23 13:00:08 +0800 |
| commit | 6c94aba5fa77ec8dcc607fd760e69d8f03b38b44 (patch) | |
| tree | 772d4f490c7ce444165a40b231aa7a3054750ed4 /po | |
| parent | 937ca166454306e4a6de24d137101ebf62fff8bb (diff) | |
| download | git-6c94aba5fa77ec8dcc607fd760e69d8f03b38b44.tar.gz | |
l10n: zh_CN.po: translate 46 new messages (2229t0f0u)
Translations for git v2.0.0-rc0. Also correct translatioins on relative
date in date.c with help from Brian Gesiak ($gmane/246390).
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Diffstat (limited to 'po')
| -rw-r--r-- | po/zh_CN.po | 2705 |
1 files changed, 1392 insertions, 1313 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 0942835711..06cc173aca 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -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: 2014-02-01 08:06+0800\n" -"PO-Revision-Date: 2014-02-03 10:53+0800\n" +"POT-Creation-Date: 2014-04-23 12:50+0800\n" +"PO-Revision-Date: 2014-04-23 12:53+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,16 +22,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:57 +#: advice.c:55 #, c-format msgid "hint: %.*s\n" msgstr "提示：%.*s\n" -#. -#. * Message used both when 'git commit' fails and when -#. * other commands doing a merge do. -#. -#: advice.c:87 +#: advice.c:85 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -60,76 +56,76 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <版本库> [--exec <命令>] --list" -#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328 +#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规则 '%s' 未匹配任何文件" -#: archive.c:327 +#: archive.c:328 msgid "fmt" msgstr "格式" -#: archive.c:327 +#: archive.c:328 msgid "archive format" msgstr "归档格式" -#: archive.c:328 builtin/log.c:1193 +#: archive.c:329 builtin/log.c:1193 msgid "prefix" msgstr "前缀" -#: archive.c:329 +#: archive.c:330 msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265 -#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680 -#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 -#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 -#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 +#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2265 +#: builtin/blame.c:2266 builtin/config.c:57 builtin/fast-export.c:680 +#: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412 +#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151 msgid "file" msgstr "文件" -#: archive.c:331 builtin/archive.c:89 +#: archive.c:332 builtin/archive.c:89 msgid "write the archive to this file" msgstr "归档写入此文件" -#: archive.c:333 +#: archive.c:334 msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" -#: archive.c:334 +#: archive.c:335 msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" -#: archive.c:335 +#: archive.c:336 msgid "store only" msgstr "只存储" -#: archive.c:336 +#: archive.c:337 msgid "compress faster" msgstr "压缩速度更快" -#: archive.c:344 +#: archive.c:345 msgid "compress better" msgstr "压缩效果更好" -#: archive.c:347 +#: archive.c:348 msgid "list supported archive formats" msgstr "列出支持的归档格式" -#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84 +#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 msgid "repo" msgstr "版本库" -#: archive.c:350 builtin/archive.c:91 +#: archive.c:351 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "从远程版本库（<版本库>）提取归档文件" -#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487 +#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 msgid "command" msgstr "命令" -#: archive.c:352 builtin/archive.c:93 +#: archive.c:353 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" @@ -146,81 +142,76 @@ msgstr "" msgid "Not setting branch %s as its own upstream." msgstr "未设置分支 %s 作为它自己的上游。" -#: branch.c:82 +#: branch.c:83 #, 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 +#: branch.c:84 #, c-format msgid "Branch %s set up to track remote branch %s from %s." msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。" -#: branch.c:87 +#: branch.c:88 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。" -#: branch.c:88 +#: branch.c:89 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "分支 %s 设置为跟踪本地分支 %s。" -#: branch.c:92 +#: branch.c:94 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。" -#: branch.c:93 +#: branch.c:95 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "分支 %s 设置为跟踪远程引用 %s。" -#: branch.c:97 +#: branch.c:99 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。" -#: branch.c:98 +#: branch.c:100 #, 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 +#: branch.c:133 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "未跟踪：引用 %s 有歧义" -#: branch.c:182 +#: branch.c:178 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' 不是一个有效的分支名称。" -#: branch.c:187 +#: branch.c:183 #, c-format msgid "A branch named '%s' already exists." msgstr "一个分支名 '%s' 已经存在。" -#: branch.c:195 +#: branch.c:191 msgid "Cannot force update the current branch." msgstr "无法强制更新当前分支。" -#: branch.c:215 +#: branch.c:211 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。" -#: branch.c:217 +#: branch.c:213 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' 不存在" -#: branch.c:219 +#: branch.c:215 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -238,113 +229,113 @@ msgstr "" "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n" "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" -#: branch.c:264 +#: branch.c:260 #, c-format msgid "Not a valid object name: '%s'." msgstr "不是一个有效的对象名：'%s'。" -#: branch.c:284 +#: branch.c:280 #, c-format msgid "Ambiguous object name: '%s'." msgstr "歧义的对象名：'%s'。" -#: branch.c:289 +#: branch.c:285 #, c-format msgid "Not a valid branch point: '%s'." msgstr "无效的分支点：'%s'。" -#: branch.c:295 +#: branch.c:291 msgid "Failed to lock ref for update" msgstr "无法为更新锁定引用" -#: branch.c:313 +#: branch.c:309 msgid "Failed to write ref" msgstr "不能写引用" -#: bundle.c:37 +#: bundle.c:33 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' 不像是一个 v2 版本的包文件" -#: bundle.c:64 +#: bundle.c:60 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:90 builtin/commit.c:706 +#: bundle.c:86 builtin/commit.c:706 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" -#: bundle.c:141 +#: bundle.c:138 msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的提交：" -#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 +#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332 #: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "版本遍历设置失败" -#: bundle.c:187 +#: bundle.c:184 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个包中含有这个引用：" msgstr[1] "这个包中含有 %d 个引用：" -#: bundle.c:194 +#: bundle.c:191 msgid "The bundle records a complete history." msgstr "这个包记录一个完整历史。" -#: bundle.c:196 +#: bundle.c:193 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个包需要这个引用：" msgstr[1] "这个包需要 %d 个引用：" -#: bundle.c:296 +#: bundle.c:293 msgid "rev-list died" msgstr "rev-list 终止" -#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261 +#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" -#: bundle.c:337 +#: bundle.c:334 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:382 +#: bundle.c:379 msgid "Refusing to create empty bundle." msgstr "不能创建空包。" -#: bundle.c:398 +#: bundle.c:395 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 进程" -#: bundle.c:416 +#: bundle.c:413 msgid "pack-objects died" msgstr "pack-objects 终止" -#: bundle.c:419 +#: bundle.c:416 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" -#: bundle.c:441 +#: bundle.c:438 msgid "index-pack died" msgstr "index-pack 终止" -#: commit.c:53 +#: commit.c:54 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" -#: commit.c:55 +#: commit.c:56 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s 不是一个提交!" @@ -375,43 +366,43 @@ msgstr "在将来" #, c-format msgid "%lu second ago" msgid_plural "%lu seconds ago" -msgstr[0] "%lu 秒钟之前" -msgstr[1] "%lu 秒钟之前" +msgstr[0] "%lu 秒钟前" +msgstr[1] "%lu 秒钟前" #: date.c:108 #, c-format msgid "%lu minute ago" msgid_plural "%lu minutes ago" -msgstr[0] "%lu 分钟之前" -msgstr[1] "%lu 分钟之前" +msgstr[0] "%lu 分钟前" +msgstr[1] "%lu 分钟前" #: date.c:115 #, c-format msgid "%lu hour ago" msgid_plural "%lu hours ago" -msgstr[0] "%lu 小时之前" -msgstr[1] "%lu 小时之前" +msgstr[0] "%lu 小时前" +msgstr[1] "%lu 小时前" #: date.c:122 #, c-format msgid "%lu day ago" msgid_plural "%lu days ago" -msgstr[0] "%lu 天之前" -msgstr[1] "%lu 天之前" +msgstr[0] "%lu 天前" +msgstr[1] "%lu 天前" #: date.c:128 #, c-format msgid "%lu week ago" msgid_plural "%lu weeks ago" -msgstr[0] "%lu 周之前" -msgstr[1] "%lu 周之前" +msgstr[0] "%lu 周前" +msgstr[1] "%lu 周前" #: date.c:135 #, c-format msgid "%lu month ago" msgid_plural "%lu months ago" -msgstr[0] "%lu 个月之前" -msgstr[1] "%lu 个月之前" +msgstr[0] "%lu 个月前" +msgstr[1] "%lu 个月前" #: date.c:146 #, c-format @@ -420,12 +411,13 @@ msgid_plural "%lu years" msgstr[0] "%lu 年" msgstr[1] "%lu 年" +#. TRANSLATORS: "%s" is "<n> years" #: date.c:149 #, c-format msgid "%s, %lu month ago" msgid_plural "%s, %lu months ago" -msgstr[0] "%s，%lu 个月之前" -msgstr[1] "%s，%lu 个月之前" +msgstr[0] "%s %lu 个月前" +msgstr[1] "%s %lu 个月前" #: date.c:154 date.c:159 #, c-format @@ -439,6 +431,10 @@ msgstr[1] "%lu 年前" msgid "failed to read orderfile '%s'" msgstr "无法读取排序文件 '%s'" +#: diffcore-rename.c:517 +msgid "Performing inexact rename detection" +msgstr "正在进行非精确的重命名检测" + # 译者：注意保持前导空格 #: diff.c:113 #, c-format @@ -465,7 +461,7 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:3509 +#: diff.c:3495 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -474,7 +470,7 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:3523 +#: diff.c:3509 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" @@ -501,35 +497,35 @@ msgstr "不能创建临时文件 '%s'：%s" msgid "failed writing detached signature to '%s': %s" msgstr "无法将分离式签名写入 '%s'：%s" -#: grep.c:1695 +#: grep.c:1698 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1712 +#: grep.c:1715 #, c-format msgid "'%s': %s" msgstr "'%s'：%s" -#: grep.c:1723 +#: grep.c:1726 #, c-format msgid "'%s': short read %s" msgstr "'%s'：读取不完整 %s" -#: help.c:210 +#: help.c:209 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" -#: help.c:217 +#: help.c:216 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" -#: help.c:233 +#: help.c:232 msgid "The most commonly used git commands are:" msgstr "最常用的 git 命令有：" -#: help.c:290 +#: help.c:289 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -538,11 +534,11 @@ msgstr "" "'%s' 像是一个 git 命令，但却无法运行。\n" "可能是 git-%s 受损？" -#: help.c:347 +#: help.c:346 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" -#: help.c:369 +#: help.c:368 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -551,17 +547,17 @@ msgstr "" "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" "是 '%s'" -#: help.c:374 +#: help.c:373 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟后自动运行..." -#: help.c:381 +#: help.c:380 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:385 help.c:444 +#: help.c:384 help.c:443 msgid "" "\n" "Did you mean this?" @@ -575,7 +571,7 @@ msgstr[1] "" "\n" "您指的是这其中的某一个么？" -#: help.c:440 +#: help.c:439 #, c-format msgid "%s: %s - %s" msgstr "%s：%s - %s" @@ -584,7 +580,7 @@ msgstr "%s：%s - %s" msgid "failed to read the cache" msgstr "无法读取缓存" -#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 +#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558 #: builtin/clone.c:661 msgid "unable to write new index file" msgstr "无法写新的索引文件" @@ -594,75 +590,73 @@ msgstr "无法写新的索引文件" msgid "(bad commit)\n" msgstr "（坏提交）\n" -#: merge-recursive.c:206 +#: merge-recursive.c:208 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "为路径 '%s' addinfo_cache 失败" -#: merge-recursive.c:269 +#: merge-recursive.c:271 msgid "error building trees" msgstr "无法创建树" -#: merge-recursive.c:673 +#: merge-recursive.c:675 #, c-format msgid "failed to create path '%s'%s" msgstr "无法创建路径 '%s'%s" -#: merge-recursive.c:684 +#: merge-recursive.c:686 #, 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:698 merge-recursive.c:719 +#: merge-recursive.c:700 merge-recursive.c:721 msgid ": perhaps a D/F conflict?" msgstr "：可能是一个目录/文件冲突？" -#: merge-recursive.c:709 +#: merge-recursive.c:711 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" -#: merge-recursive.c:749 +#: merge-recursive.c:751 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" -#: merge-recursive.c:751 +#: merge-recursive.c:753 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据（blob）对象" -#: merge-recursive.c:774 builtin/clone.c:317 +#: merge-recursive.c:776 builtin/clone.c:317 #, c-format msgid "failed to open '%s'" msgstr "无法打开 '%s'" -#: merge-recursive.c:782 +#: merge-recursive.c:784 #, c-format msgid "failed to symlink '%s'" msgstr "无法创建符号链接 '%s'" -#: merge-recursive.c:785 +#: merge-recursive.c:787 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:923 +#: merge-recursive.c:925 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" -#: merge-recursive.c:927 +#: merge-recursive.c:929 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" -#: merge-recursive.c:943 +#: merge-recursive.c:945 msgid "unsupported object type in the tree" msgstr "在树中有不支持的对象类型" -#: merge-recursive.c:1022 merge-recursive.c:1036 +#: merge-recursive.c:1024 merge-recursive.c:1038 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -671,7 +665,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本被保留。" -#: merge-recursive.c:1028 merge-recursive.c:1041 +#: merge-recursive.c:1030 merge-recursive.c:1043 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -680,20 +674,20 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本保留于 %8$s 中。" -#: merge-recursive.c:1082 +#: merge-recursive.c:1084 msgid "rename" msgstr "重命名" -#: merge-recursive.c:1082 wt-status.c:283 +#: merge-recursive.c:1084 msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1138 +#: merge-recursive.c:1140 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" -#: merge-recursive.c:1160 +#: merge-recursive.c:1162 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -702,144 +696,144 @@ msgstr "" "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1165 +#: merge-recursive.c:1167 msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1219 +#: merge-recursive.c:1221 #, 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:1249 +#: merge-recursive.c:1251 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是重命名 %s 至 %s，以及 %s 至 %s" -#: merge-recursive.c:1448 +#: merge-recursive.c:1450 #, 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:1458 +#: merge-recursive.c:1460 #, c-format msgid "Adding merged %s" msgstr "添加合并后的 %s" -#: merge-recursive.c:1463 merge-recursive.c:1661 +#: merge-recursive.c:1465 merge-recursive.c:1663 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" -#: merge-recursive.c:1514 +#: merge-recursive.c:1516 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" -#: merge-recursive.c:1517 +#: merge-recursive.c:1519 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个数据（blob）对象" -#: merge-recursive.c:1565 +#: merge-recursive.c:1567 msgid "modify" msgstr "修改" -#: merge-recursive.c:1565 wt-status.c:281 +#: merge-recursive.c:1567 msgid "modified" msgstr "修改" -#: merge-recursive.c:1575 +#: merge-recursive.c:1577 msgid "content" msgstr "内容" -#: merge-recursive.c:1582 +#: merge-recursive.c:1584 msgid "add/add" msgstr "添加/添加" -#: merge-recursive.c:1616 +#: merge-recursive.c:1618 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:1630 +#: merge-recursive.c:1632 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-recursive.c:1634 git-submodule.sh:1148 +#: merge-recursive.c:1636 git-submodule.sh:1149 msgid "submodule" msgstr "子模组" -#: merge-recursive.c:1635 +#: merge-recursive.c:1637 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" -#: merge-recursive.c:1725 +#: merge-recursive.c:1727 #, c-format msgid "Removing %s" msgstr "删除 %s" -#: merge-recursive.c:1750 +#: merge-recursive.c:1752 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:1756 +#: merge-recursive.c:1758 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:1761 +#: merge-recursive.c:1763 #, 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:1771 +#: merge-recursive.c:1773 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:1788 +#: merge-recursive.c:1790 msgid "Fatal merge failure, shouldn't happen." msgstr "严重的合并错误，不应发生。" -#: merge-recursive.c:1807 +#: merge-recursive.c:1809 msgid "Already up-to-date!" msgstr "已经是最新的！" -#: merge-recursive.c:1816 +#: merge-recursive.c:1818 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:1846 +#: merge-recursive.c:1848 #, c-format msgid "Unprocessed path??? %s" msgstr "未处理的路径??? %s" -#: merge-recursive.c:1891 +#: merge-recursive.c:1893 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:1904 +#: merge-recursive.c:1906 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:1941 +#: merge-recursive.c:1943 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:1998 +#: merge-recursive.c:2000 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:2010 builtin/merge.c:665 +#: merge-recursive.c:2012 builtin/merge.c:668 msgid "Unable to write index." msgstr "不能写入索引。" @@ -864,34 +858,34 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" -#: object.c:202 +#: object.c:229 #, c-format msgid "unable to parse object: %s" msgstr "不能解析对象：%s" -#: parse-options.c:537 +#: parse-options.c:532 msgid "..." msgstr "..." -#: parse-options.c:555 +#: parse-options.c:550 #, c-format msgid "usage: %s" msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:559 +#: parse-options.c:554 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:562 +#: parse-options.c:557 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:596 +#: parse-options.c:591 msgid "-NUM" msgstr "-数字" @@ -939,11 +933,6 @@ msgstr "%s：'%s' 在版本库之外" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "路径规则 '%s' 在子模组 '%.*s' 中" -#. -#. * We may want to substitute "this command" with a command -#. * name. E.g. when add--interactive dies when running -#. * "checkout -p" -#. #: pathspec.c:353 #, c-format msgid "%s: pathspec magic not supported by this command: %s" @@ -962,56 +951,73 @@ msgstr "" "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" "添加 ':/' 或 '.' ？" -#: remote.c:753 +#: progress.c:224 +msgid "done" +msgstr "完成" + +#: read-cache.c:1238 +#, c-format +msgid "" +"index.version set, but the value is invalid.\n" +"Using version %i" +msgstr "" +"设置了 index.version，但是取值无效。\n" +"使用版本 %i" + +#: read-cache.c:1248 +#, c-format +msgid "" +"GIT_INDEX_VERSION set, but the value is invalid.\n" +"Using version %i" +msgstr "" +"设置了 GIT_INDEX_VERSION，但是取值无效。\n" +"使用版本 %i" + +#: remote.c:758 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同时获取 %s 和 %s 至 %s" -#: remote.c:757 +#: remote.c:762 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %s，而非 %s" -#: remote.c:761 +#: remote.c:766 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同时跟踪 %s 和 %s" -#. -#. * This last possibility doesn't occur because -#. * FETCH_HEAD_IGNORE entries always appear at -#. * the end of the list. -#. -#: remote.c:769 +#: remote.c:774 msgid "Internal error" msgstr "内部错误" -#: remote.c:1871 +#: remote.c:1948 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n" -#: remote.c:1875 +#: remote.c:1952 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n" -#: remote.c:1878 +#: remote.c:1955 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" -#: remote.c:1882 +#: remote.c:1959 #, 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:1888 +#: remote.c:1965 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 来发布您的本地提交）\n" -#: remote.c:1891 +#: remote.c:1968 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1020,11 +1026,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" # 译者：注意保持前导空格 -#: remote.c:1899 +#: remote.c:1976 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" -#: remote.c:1902 +#: remote.c:1979 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1040,7 +1046,7 @@ msgstr[1] "" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者：注意保持前导空格 -#: remote.c:1912 +#: remote.c:1989 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" @@ -1053,14 +1059,14 @@ msgstr "不能打开 /dev/null" msgid "dup2(%d,%d) failed" msgstr "不能调用 dup2(%d,%d)" -#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896 -#: builtin/merge.c:1006 builtin/merge.c:1016 +#: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899 +#: builtin/merge.c:1009 builtin/merge.c:1019 #, c-format msgid "Could not open '%s' for writing" msgstr "不能为写入打开 '%s'" -#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786 -#: builtin/merge.c:1008 builtin/merge.c:1021 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789 +#: builtin/merge.c:1011 builtin/merge.c:1024 #, c-format msgid "Could not write to '%s'" msgstr "不能写入 '%s'" @@ -1082,7 +1088,7 @@ msgstr "" "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:245 sequencer.c:870 sequencer.c:953 +#: sequencer.c:245 sequencer.c:879 sequencer.c:962 #, c-format msgid "Could not write to %s" msgstr "不能写入 %s" @@ -1118,184 +1124,184 @@ msgstr "不能解析 HEAD 提交\n" msgid "Unable to update cache tree\n" msgstr "不能更新缓存\n" -#: sequencer.c:423 +#: sequencer.c:430 #, c-format msgid "Could not parse commit %s\n" msgstr "不能解析提交 %s\n" -#: sequencer.c:428 +#: sequencer.c:435 #, c-format msgid "Could not parse parent commit %s\n" msgstr "不能解析父提交 %s\n" -#: sequencer.c:494 +#: sequencer.c:501 msgid "Your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:513 +#: sequencer.c:520 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:521 +#: sequencer.c:528 #, c-format msgid "Commit %s does not have parent %d" msgstr "提交 %s 没有父提交 %d" -#: sequencer.c:525 +#: sequencer.c:532 #, 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:538 +#: sequencer.c:545 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:542 +#: sequencer.c:549 #, c-format msgid "Cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" -#: sequencer.c:628 +#: sequencer.c:635 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:629 +#: sequencer.c:636 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:665 +#: sequencer.c:672 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:673 +#: sequencer.c:680 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:678 +#: sequencer.c:685 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:736 +#: sequencer.c:743 #, c-format msgid "Cannot %s during a %s" msgstr "无法 %s 在一个 %s 过程中" -#: sequencer.c:758 +#: sequencer.c:765 #, c-format msgid "Could not parse line %d." msgstr "不能解析第 %d 行。" -#: sequencer.c:763 +#: sequencer.c:770 msgid "No commits parsed." msgstr "没有提交被解析。" -#: sequencer.c:776 +#: sequencer.c:783 #, c-format msgid "Could not open %s" msgstr "不能打开 %s" -#: sequencer.c:780 +#: sequencer.c:787 #, c-format msgid "Could not read %s." msgstr "不能读取 %s。" -#: sequencer.c:787 +#: sequencer.c:794 #, c-format msgid "Unusable instruction sheet: %s" msgstr "无用的指令表单：%s" -#: sequencer.c:815 +#: sequencer.c:824 #, c-format msgid "Invalid key: %s" msgstr "无效键名：%s" -#: sequencer.c:818 +#: sequencer.c:827 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:830 +#: sequencer.c:839 #, c-format msgid "Malformed options sheet: %s" msgstr "非法的选项表单：%s" -#: sequencer.c:851 +#: sequencer.c:860 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" -#: sequencer.c:852 +#: sequencer.c:861 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:856 +#: sequencer.c:865 #, c-format msgid "Could not create sequencer directory %s" msgstr "不能创建序列目录 %s" -#: sequencer.c:872 sequencer.c:957 +#: sequencer.c:881 sequencer.c:966 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" -#: sequencer.c:891 sequencer.c:1025 +#: sequencer.c:900 sequencer.c:1036 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:893 +#: sequencer.c:902 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:895 +#: sequencer.c:904 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:917 builtin/apply.c:4061 +#: sequencer.c:926 builtin/apply.c:4061 #, c-format msgid "cannot open %s: %s" msgstr "不能打开 %s：%s" -#: sequencer.c:920 +#: sequencer.c:929 #, c-format msgid "cannot read %s: %s" msgstr "不能读取 %s：%s" -#: sequencer.c:921 +#: sequencer.c:930 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:927 +#: sequencer.c:936 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:950 +#: sequencer.c:959 #, c-format msgid "Could not format %s." msgstr "不能格式化 %s。" -#: sequencer.c:1093 +#: sequencer.c:1104 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:1096 +#: sequencer.c:1107 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:1130 +#: sequencer.c:1141 msgid "Can't revert as initial commit" msgstr "不能作为初始提交还原" -#: sequencer.c:1131 +#: sequencer.c:1142 msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" @@ -1320,21 +1326,21 @@ msgstr "" "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" "命令关闭本消息通知。" -#: sha1_name.c:1070 +#: sha1_name.c:1072 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" -#: sha1_name.c:1073 +#: sha1_name.c:1075 #, c-format msgid "No such branch: '%s'" msgstr "没有此分支：'%s'" -#: sha1_name.c:1075 +#: sha1_name.c:1077 #, c-format msgid "No upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: sha1_name.c:1079 +#: sha1_name.c:1081 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" @@ -1348,52 +1354,34 @@ msgstr "无法修改未合并的 .gitmodules，先解决合并冲突" msgid "Could not find section in .gitmodules where path=%s" msgstr "无法在 .gitmodules 中找到 path=%s 的小节" -#. Maybe the user already did that, don't error out here #: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "不能更新 .gitmodules 条目 %s" -#. Maybe the user already did that, don't error out here #: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "无法移除 %s 的 .gitmodules 条目" -#: submodule.c:127 -msgid "could not find .gitmodules in index" -msgstr "无法在索引中找到 .gitmodules" - -#: submodule.c:133 -msgid "reading updated .gitmodules failed" -msgstr "读取更新后的 .gitmodules 失败" - -#: submodule.c:135 -msgid "unable to stat updated .gitmodules" -msgstr "不能枚举更新后的 .gitmodules" - -#: submodule.c:139 -msgid "unable to remove .gitmodules from index" -msgstr "不能从索引中移除 .gitmodules" - -#: submodule.c:141 -msgid "adding updated .gitmodules failed" -msgstr "添加更新后的 .gitmodules 失败" - -#: submodule.c:143 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "将更新后 .gitmodules 添加暂存区失败" -#: submodule.c:1144 builtin/init-db.c:363 +#: submodule.c:1121 builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "不能创建 git link %s" -#: submodule.c:1155 +#: submodule.c:1132 #, c-format msgid "Could not set core.worktree in %s" msgstr "不能在 %s 中设置 core.worktree" +#: unpack-trees.c:206 +msgid "Checking out files" +msgstr "正在检出文件" + #: urlmatch.c:120 msgid "invalid URL scheme name or missing '://' suffix" msgstr "无效的 URL 方案名称或丢失 '://' 后缀" @@ -1507,94 +1495,100 @@ msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）" -#: wt-status.c:254 -msgid "bug" -msgstr "bug" - -#: wt-status.c:259 +#: wt-status.c:252 msgid "both deleted:" msgstr "双方删除：" -#: wt-status.c:260 +#: wt-status.c:254 msgid "added by us:" msgstr "由我们添加：" -#: wt-status.c:261 +#: wt-status.c:256 msgid "deleted by them:" msgstr "由他们删除：" -#: wt-status.c:262 +#: wt-status.c:258 msgid "added by them:" msgstr "由他们添加：" -#: wt-status.c:263 +#: wt-status.c:260 msgid "deleted by us:" msgstr "由我们删除：" -#: wt-status.c:264 +#: wt-status.c:262 msgid "both added:" msgstr "双方添加：" -#: wt-status.c:265 +#: wt-status.c:264 msgid "both modified:" msgstr "双方修改：" -# 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:275 -msgid "new file" -msgstr "新文件" +#: wt-status.c:266 +#, c-format +msgid "bug: unhandled unmerged status %x" +msgstr "bug：无法处理的未合并状态 %x" -#: wt-status.c:277 -msgid "copied" -msgstr "拷贝" +#: wt-status.c:274 +msgid "new file:" +msgstr "新文件：" -#: wt-status.c:279 -msgid "deleted" -msgstr "删除" +#: wt-status.c:276 +msgid "copied:" +msgstr "拷贝：" -# 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:285 -msgid "typechange" -msgstr "类型变更" +#: wt-status.c:278 +msgid "deleted:" +msgstr "删除：" -# 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:287 -msgid "unknown" -msgstr "未知" +#: wt-status.c:280 +msgid "modified:" +msgstr "修改：" + +#: wt-status.c:282 +msgid "renamed:" +msgstr "重命名：" + +#: wt-status.c:284 +msgid "typechange:" +msgstr "类型变更：" + +#: wt-status.c:286 +msgid "unknown:" +msgstr "未知：" -#: wt-status.c:289 -msgid "unmerged" -msgstr "未合并" +#: wt-status.c:288 +msgid "unmerged:" +msgstr "未合并：" # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:336 +#: wt-status.c:370 msgid "new commits, " msgstr "新提交, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:338 +#: wt-status.c:372 msgid "modified content, " msgstr "修改的内容, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:340 +#: wt-status.c:374 msgid "untracked content, " msgstr "未跟踪的内容, " -#: wt-status.c:357 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" -msgstr "bug：未处理的差异状态 %c" +msgstr "bug：无法处理的差异状态 %c" -#: wt-status.c:732 +#: wt-status.c:765 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:734 +#: wt-status.c:767 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:836 +#: wt-status.c:846 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1602,198 +1596,198 @@ msgstr "" "不要改动上面的一行。\n" "下面的所有内容均将被删除。" -#: wt-status.c:899 +#: wt-status.c:937 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:902 +#: wt-status.c:940 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" -#: wt-status.c:905 +#: wt-status.c:943 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:908 +#: wt-status.c:946 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:918 +#: wt-status.c:956 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:921 +#: wt-status.c:959 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:925 +#: wt-status.c:963 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:927 +#: wt-status.c:965 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:929 +#: wt-status.c:967 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:989 wt-status.c:1006 +#: wt-status.c:1027 wt-status.c:1044 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:994 wt-status.c:1011 +#: wt-status.c:1032 wt-status.c:1049 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者：注意保持前导空格 -#: wt-status.c:997 +#: wt-status.c:1035 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:999 +#: wt-status.c:1037 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1001 +#: wt-status.c:1039 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:1014 +#: wt-status.c:1052 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:1018 +#: wt-status.c:1056 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:1023 +#: wt-status.c:1061 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 -#: wt-status.c:1026 +#: wt-status.c:1064 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:1030 +#: wt-status.c:1068 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:1035 +#: wt-status.c:1073 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 -#: wt-status.c:1038 +#: wt-status.c:1076 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:1040 +#: wt-status.c:1078 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:1050 +#: wt-status.c:1088 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1055 +#: wt-status.c:1093 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1058 +#: wt-status.c:1096 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1060 +#: wt-status.c:1098 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1069 +#: wt-status.c:1107 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1074 +#: wt-status.c:1112 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1077 +#: wt-status.c:1115 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1079 +#: wt-status.c:1117 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1090 +#: wt-status.c:1128 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1094 +#: wt-status.c:1132 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1097 +#: wt-status.c:1135 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1272 +#: wt-status.c:1310 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1279 +#: wt-status.c:1317 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1286 +#: wt-status.c:1324 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1288 +#: wt-status.c:1326 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1291 +#: wt-status.c:1329 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1308 +#: wt-status.c:1346 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1322 +#: wt-status.c:1360 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1324 +#: wt-status.c:1362 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1328 +#: wt-status.c:1366 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1803,316 +1797,234 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1334 +#: wt-status.c:1372 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1336 +#: wt-status.c:1374 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1342 +#: wt-status.c:1380 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1347 +#: wt-status.c:1385 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" -#: wt-status.c:1350 +#: wt-status.c:1388 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1353 +#: wt-status.c:1391 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1356 +#: wt-status.c:1394 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1359 +#: wt-status.c:1397 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1362 wt-status.c:1367 +#: wt-status.c:1400 wt-status.c:1405 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1365 +#: wt-status.c:1403 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1369 +#: wt-status.c:1407 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1478 +#: wt-status.c:1516 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" # 译者：注意保持句尾空格 -#: wt-status.c:1484 +#: wt-status.c:1522 msgid "Initial commit on " msgstr "初始提交于 " -#: wt-status.c:1514 +#: wt-status.c:1554 msgid "gone" msgstr "丢失" # 译者：注意保持句尾空格 -#: wt-status.c:1516 +#: wt-status.c:1556 wt-status.c:1564 msgid "behind " msgstr "落后 " -# 译者：注意保持句尾空格 -#: wt-status.c:1519 wt-status.c:1522 -msgid "ahead " -msgstr "领先 " - -# 译者：注意保持句尾空格 -#: wt-status.c:1524 -msgid ", behind " -msgstr "，落后 " - #: compat/precompose_utf8.c:55 builtin/clone.c:356 #, c-format msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" -#: builtin/add.c:20 +#: builtin/add.c:21 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 <路径规则>'，是当前版本的默认操作，\n" -" 忽略您本地工作区中移除的文件。\n" -"\n" -"* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n" -"\n" -"运行 'git status' 来检查您本地工作区中移除的路径。\n" - -#: builtin/add.c:144 +#: builtin/add.c:64 #, c-format msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:149 builtin/commit.c:260 +#: builtin/add.c:69 builtin/commit.c:261 msgid "updating files failed" msgstr "更新文件失败" -#: builtin/add.c:163 +#: builtin/add.c:79 #, c-format msgid "remove '%s'\n" msgstr "删除 '%s'\n" -#: builtin/add.c:237 +#: builtin/add.c:133 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:299 +#: builtin/add.c:193 msgid "Could not read the index" msgstr "不能读取索引" -#: builtin/add.c:310 +#: builtin/add.c:204 #, c-format msgid "Could not open '%s' for writing." msgstr "不能打开 '%s' 以写入。" -#: builtin/add.c:314 +#: builtin/add.c:208 msgid "Could not write patch" msgstr "不能生成补丁" -#: builtin/add.c:319 +#: builtin/add.c:213 #, c-format msgid "Could not stat '%s'" msgstr "不能查看文件状态 '%s'" -#: builtin/add.c:321 +#: builtin/add.c:215 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" -#: builtin/add.c:327 +#: builtin/add.c:221 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" -#: builtin/add.c:337 +#: builtin/add.c:231 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70 -#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70 +#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344 #: builtin/rm.c:269 msgid "dry run" msgstr "演习" -#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 -#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 +#: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19 +#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612 #: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113 msgid "be verbose" msgstr "冗长输出" -#: builtin/add.c:357 +#: builtin/add.c:251 msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283 msgid "select hunks interactively" msgstr "交互式挑选数据块" -#: builtin/add.c:359 +#: builtin/add.c:253 msgid "edit current diff and apply" msgstr "编辑当前差异并应用" -#: builtin/add.c:360 +#: builtin/add.c:254 msgid "allow adding otherwise ignored files" msgstr "允许添加忽略的文件" -#: builtin/add.c:361 +#: builtin/add.c:255 msgid "update tracked files" msgstr "更新已跟踪的文件" -#: builtin/add.c:362 +#: builtin/add.c:256 msgid "record only the fact that the path will be added later" msgstr "只记录，该路径稍后再添加" -#: builtin/add.c:363 +#: builtin/add.c:257 msgid "add changes from all tracked and untracked files" msgstr "添加所有改变的已跟踪文件和未跟踪文件" -#. takes no arguments -#: builtin/add.c:366 +#: builtin/add.c:260 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区中移除的路径（和 --no-all 相同）" -#: builtin/add.c:368 +#: builtin/add.c:262 msgid "don't add, only refresh the index" msgstr "不添加，只刷新索引" -#: builtin/add.c:369 +#: builtin/add.c:263 msgid "just skip files which cannot be added because of errors" msgstr "跳过因出错不能添加的文件" -#: builtin/add.c:370 +#: builtin/add.c:264 msgid "check if - even missing - files are ignored in dry run" msgstr "检查在演习模式下文件（即使不存在）是否被忽略" -#: builtin/add.c:392 +#: builtin/add.c:286 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 参数如果您确实要添加它们。\n" -#: builtin/add.c:393 +#: builtin/add.c:287 msgid "no files added" msgstr "没有文件被添加" -#: builtin/add.c:399 +#: builtin/add.c:293 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:438 +#: builtin/add.c:330 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" -#: builtin/add.c:456 +#: builtin/add.c:337 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" -#: builtin/add.c:486 +#: builtin/add.c:358 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" -#: builtin/add.c:487 +#: builtin/add.c:359 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" -#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432 +#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "无法写入新索引文件" @@ -2219,7 +2131,6 @@ msgstr "** 警告：文件 %s 成为空文件但并未删除" msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" -#. there has to be one hunk (forward hunk) #: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" @@ -2360,7 +2271,7 @@ msgstr "%s：补丁未应用" msgid "Checking patch %s..." msgstr "检查补丁 %s..." -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127 +#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" @@ -2409,7 +2320,6 @@ msgstr "成功应用补丁 %s。" msgid "internal error" msgstr "内部错误" -#. Say this even without --verbose #: builtin/apply.c:4043 #, c-format msgid "Applying patch %%s with %d reject..." @@ -2501,7 +2411,7 @@ msgstr "如果一个补丁不能应用则尝试三路合并" msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" @@ -2731,6 +2641,16 @@ msgstr "n,m" msgid "Process only line range n,m, counting from 1" msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" +#. TRANSLATORS: This string is used to tell us the maximum +#. display width for a relative timestamp in "git blame" +#. output. For C locale, "4 years, 11 months ago", which +#. takes 22 places, is the longest among various forms of +#. relative timestamps, but your language may need more or +#. fewer display columns. +#: builtin/blame.c:2347 +msgid "4 years, 11 months ago" +msgstr "4 年 11 个月前" + #: builtin/branch.c:24 msgid "git branch [options] [-r | -a] [--merged | --no-merged]" msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]" @@ -2971,8 +2891,9 @@ msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 -#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461 -#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468 +#: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495 +#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527 +#: builtin/tag.c:533 msgid "commit" msgstr "提交" @@ -3153,43 +3074,43 @@ msgstr "需要一个版本库来创建包。" msgid "Need a repository to unbundle." msgstr "需要一个版本库来解包。" -#: builtin/cat-file.c:328 +#: builtin/cat-file.c:331 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>" -#: builtin/cat-file.c:329 +#: builtin/cat-file.c:332 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <对象列表>" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:369 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:370 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:371 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:373 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:374 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:376 msgid "for blob objects, run textconv on object's content" msgstr "对于数据（blob）对象，对其内容执行 textconv" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:378 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:381 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" @@ -3217,7 +3138,7 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271 msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -3368,61 +3289,60 @@ msgstr "'%s' 不能和 %s 同时使用" msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" -#: builtin/checkout.c:261 builtin/checkout.c:451 +#: builtin/checkout.c:261 builtin/checkout.c:450 msgid "corrupt index file" msgstr "损坏的索引文件" -#: builtin/checkout.c:322 builtin/checkout.c:329 +#: builtin/checkout.c:321 builtin/checkout.c:328 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:473 +#: builtin/checkout.c:472 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:594 +#: builtin/checkout.c:593 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "不能对 '%s' 执行 reflog 操作\n" -#: builtin/checkout.c:632 +#: builtin/checkout.c:631 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:639 +#: builtin/checkout.c:638 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:642 +#: builtin/checkout.c:641 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:646 +#: builtin/checkout.c:645 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:648 builtin/checkout.c:1033 +#: builtin/checkout.c:647 builtin/checkout.c:1032 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:650 +#: builtin/checkout.c:649 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:706 +#: builtin/checkout.c:705 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#. The singular version -#: builtin/checkout.c:712 +#: builtin/checkout.c:711 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3443,7 +3363,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:730 +#: builtin/checkout.c:729 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3458,140 +3378,139 @@ msgstr "" " git branch new_branch_name %s\n" "\n" -#: builtin/checkout.c:760 +#: builtin/checkout.c:759 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:764 +#: builtin/checkout.c:763 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:791 builtin/checkout.c:1028 +#: builtin/checkout.c:790 builtin/checkout.c:1027 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:935 +#: builtin/checkout.c:934 #, c-format msgid "only one reference expected, %d given." msgstr "只要一个引用，却给出了 %d 个" -#: builtin/checkout.c:974 +#: builtin/checkout.c:973 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#. case (1): want a tree -#: builtin/checkout.c:1003 +#: builtin/checkout.c:1002 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:1042 +#: builtin/checkout.c:1041 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1045 builtin/checkout.c:1049 +#: builtin/checkout.c:1044 builtin/checkout.c:1048 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061 -#: builtin/checkout.c:1064 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 +#: builtin/checkout.c:1063 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1069 +#: builtin/checkout.c:1068 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1091 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1094 +#: builtin/checkout.c:1093 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1094 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1096 +#: builtin/checkout.c:1095 msgid "detach the HEAD at named commit" msgstr "成为指向该提交的分离头指针" -#: builtin/checkout.c:1097 +#: builtin/checkout.c:1096 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1099 -msgid "new branch" +#: builtin/checkout.c:1098 +msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1098 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1100 +#: builtin/checkout.c:1099 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1102 +#: builtin/checkout.c:1101 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1105 +#: builtin/checkout.c:1104 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三路合并" -#: builtin/checkout.c:1106 builtin/merge.c:225 +#: builtin/checkout.c:1105 builtin/merge.c:225 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248 +#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245 msgid "style" msgstr "风格" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1107 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1110 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1112 msgid "second guess 'git checkout no-such-branch'" msgstr "再者猜测'git checkout no-such-branch'" -#: builtin/checkout.c:1136 +#: builtin/checkout.c:1135 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b、-B 和 --orphan 是互斥的" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1152 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1159 msgid "Missing branch name; try -b" msgstr "缺少分支名；尝试 -b" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1196 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1204 +#: builtin/checkout.c:1203 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3600,12 +3519,12 @@ msgstr "" "不能同时更新路径并切换到分支'%s'。\n" "您是想要检出 '%s' 但其未能解析为提交么？" -#: builtin/checkout.c:1209 +#: builtin/checkout.c:1208 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1213 +#: builtin/checkout.c:1212 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3643,7 +3562,7 @@ msgstr "将忽略版本库 %s\n" msgid "failed to remove %s" msgstr "无法删除 %s" -#: builtin/clean.c:294 +#: builtin/clean.c:295 msgid "" "Prompt help:\n" "1 - select a numbered item\n" @@ -3655,7 +3574,7 @@ msgstr "" "foo - 通过标题选择一个选项\n" " - （空）什么也不选择" -#: builtin/clean.c:298 +#: builtin/clean.c:299 msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -3675,35 +3594,35 @@ msgstr "" "* - 选择所有选项\n" " - （空）结束选择" -#: builtin/clean.c:516 +#: builtin/clean.c:517 #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: builtin/clean.c:659 +#: builtin/clean.c:660 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除条目>> " -#: builtin/clean.c:696 +#: builtin/clean.c:697 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：无法找到和 %s 匹配的条目" -#: builtin/clean.c:717 +#: builtin/clean.c:718 msgid "Select items to delete" msgstr "选择要删除的条目" -#: builtin/clean.c:757 +#: builtin/clean.c:758 #, c-format msgid "remove %s? " msgstr "删除 %s？" -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "再见。" -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3721,71 +3640,71 @@ msgstr "" "help - 显示本帮助\n" "? - 显示如何在提示符下选择的帮助" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "请选择" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "将删除如下条目：" msgstr[1] "将删除如下条目：" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "没有要清理的文件，退出。" -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "不打印删除文件的名称" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "强制" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "交互式清除" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "删除整个目录" -#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718 -#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185 +#: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716 +#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185 msgid "pattern" msgstr "模式" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "添加<模式>到忽略规则" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "也删除忽略的文件" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "只删除忽略的文件" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" -"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" @@ -3795,7 +3714,7 @@ msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [选项] [--] <版本库> [<路径>]" #: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 -#: builtin/push.c:521 +#: builtin/push.c:504 msgid "force progress reporting" msgstr "强制显示进度报告" @@ -3803,7 +3722,7 @@ msgstr "强制显示进度报告" msgid "don't create a checkout" msgstr "不创建一个检出" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486 msgid "create a bare repository" msgstr "创建一个裸版本库" @@ -3827,11 +3746,11 @@ msgstr "设置为共享版本库" msgid "initialize submodules in the clone" msgstr "在克隆时初始化子模组" -#: builtin/clone.c:82 builtin/init-db.c:485 +#: builtin/clone.c:82 builtin/init-db.c:483 msgid "template-directory" msgstr "模板目录" -#: builtin/clone.c:83 builtin/init-db.c:486 +#: builtin/clone.c:83 builtin/init-db.c:484 msgid "directory from which templates will be used" msgstr "模板目录将被使用" @@ -3855,7 +3774,7 @@ msgstr "检出<分支>而不是远程HEAD" msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661 msgid "depth" msgstr "深度" @@ -3867,11 +3786,11 @@ msgstr "创建一个指定深度的浅克隆" msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" -#: builtin/clone.c:96 builtin/init-db.c:494 +#: builtin/clone.c:96 builtin/init-db.c:492 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:97 builtin/init-db.c:495 +#: builtin/clone.c:97 builtin/init-db.c:493 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" @@ -4154,67 +4073,67 @@ msgstr "" "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" "操作。\n" -#: builtin/commit.c:287 +#: builtin/commit.c:288 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" -#: builtin/commit.c:329 +#: builtin/commit.c:330 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:335 +#: builtin/commit.c:336 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439 +#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:420 +#: builtin/commit.c:421 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:422 +#: builtin/commit.c:423 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:432 +#: builtin/commit.c:433 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:452 +#: builtin/commit.c:453 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:543 builtin/commit.c:549 +#: builtin/commit.c:544 builtin/commit.c:550 #, c-format msgid "invalid commit: %s" msgstr "无效的提交：%s" -#: builtin/commit.c:571 +#: builtin/commit.c:572 msgid "malformed --author parameter" msgstr "非法的 --author 参数" -#: builtin/commit.c:591 +#: builtin/commit.c:592 #, c-format msgid "Malformed ident string: '%s'" msgstr "非法的身份字符串：'%s'" -#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007 +#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:642 builtin/shortlog.c:273 +#: builtin/commit.c:641 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:644 +#: builtin/commit.c:643 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:648 +#: builtin/commit.c:647 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" @@ -4240,7 +4159,7 @@ msgstr "不能读取 '%s'" msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:760 +#: builtin/commit.c:764 #, c-format msgid "" "\n" @@ -4254,7 +4173,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:765 +#: builtin/commit.c:769 #, c-format msgid "" "\n" @@ -4268,7 +4187,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:777 +#: builtin/commit.c:782 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4277,7 +4196,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:782 +#: builtin/commit.c:789 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4288,355 +4207,355 @@ msgstr "" "也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:795 +#: builtin/commit.c:802 #, c-format msgid "%sAuthor: %s" msgstr "%s作者： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:802 +#: builtin/commit.c:809 #, c-format msgid "%sCommitter: %s" msgstr "%s提交者： %s" -#: builtin/commit.c:822 +#: builtin/commit.c:829 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:865 +#: builtin/commit.c:872 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:880 builtin/tag.c:359 +#: builtin/commit.c:887 builtin/tag.c:391 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:982 +#: builtin/commit.c:989 #, c-format msgid "No existing author found with '%s'" msgstr "没有找到匹配 '%s' 的作者" -#: builtin/commit.c:997 builtin/commit.c:1237 +#: builtin/commit.c:1004 builtin/commit.c:1244 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1034 +#: builtin/commit.c:1041 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" -#: builtin/commit.c:1064 +#: builtin/commit.c:1071 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1075 +#: builtin/commit.c:1080 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1078 +#: builtin/commit.c:1083 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1080 +#: builtin/commit.c:1085 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1083 +#: builtin/commit.c:1088 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1093 +#: builtin/commit.c:1098 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1095 +#: builtin/commit.c:1100 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" -#: builtin/commit.c:1103 +#: builtin/commit.c:1108 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1120 +#: builtin/commit.c:1125 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1122 +#: builtin/commit.c:1127 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1124 +#: builtin/commit.c:1129 msgid "Clever... amending the last one with dirty index." msgstr "聪明... 在索引不干净下修补最后的提交。" -#: builtin/commit.c:1126 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." -msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..." +#: builtin/commit.c:1131 +msgid "Explicit paths specified without -i or -o; assuming --only paths..." +msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..." -#: builtin/commit.c:1136 builtin/tag.c:572 +#: builtin/commit.c:1143 builtin/tag.c:639 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" -#: builtin/commit.c:1141 +#: builtin/commit.c:1148 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项同时使用没有意义。" -#: builtin/commit.c:1251 builtin/commit.c:1482 +#: builtin/commit.c:1258 builtin/commit.c:1516 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1253 builtin/commit.c:1484 +#: builtin/commit.c:1260 builtin/commit.c:1518 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507 +#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1258 builtin/commit.c:1488 +#: builtin/commit.c:1265 builtin/commit.c:1522 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1261 builtin/commit.c:1491 +#: builtin/commit.c:1268 builtin/commit.c:1525 msgid "terminate entries with NUL" msgstr "条目以NUL字符结尾" -#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674 -#: builtin/fast-export.c:677 builtin/tag.c:459 +#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674 +#: builtin/fast-export.c:677 builtin/tag.c:514 msgid "mode" msgstr "模式" -#: builtin/commit.c:1264 builtin/commit.c:1494 +#: builtin/commit.c:1271 builtin/commit.c:1528 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1267 +#: builtin/commit.c:1274 msgid "show ignored files" msgstr "显示忽略的文件" -#: builtin/commit.c:1268 parse-options.h:156 +#: builtin/commit.c:1275 parse-options.h:153 msgid "when" msgstr "何时" -#: builtin/commit.c:1269 +#: builtin/commit.c:1276 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1271 +#: builtin/commit.c:1278 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1340 +#: builtin/commit.c:1347 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1342 +#: builtin/commit.c:1349 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1383 +#: builtin/commit.c:1390 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:1385 +#: builtin/commit.c:1392 msgid " (root-commit)" msgstr "（根提交）" -#: builtin/commit.c:1452 +#: builtin/commit.c:1486 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1453 +#: builtin/commit.c:1487 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1455 +#: builtin/commit.c:1489 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1456 builtin/tag.c:457 +#: builtin/commit.c:1490 builtin/tag.c:512 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1457 +#: builtin/commit.c:1491 msgid "author" msgstr "作者" -#: builtin/commit.c:1457 +#: builtin/commit.c:1491 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1458 builtin/gc.c:261 +#: builtin/commit.c:1492 builtin/gc.c:272 msgid "date" msgstr "日期" -#: builtin/commit.c:1458 +#: builtin/commit.c:1492 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405 -#: builtin/notes.c:562 builtin/tag.c:455 +#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409 +#: builtin/notes.c:566 builtin/tag.c:510 msgid "message" msgstr "说明" -#: builtin/commit.c:1459 +#: builtin/commit.c:1493 msgid "commit message" msgstr "提交说明" -#: builtin/commit.c:1460 +#: builtin/commit.c:1494 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1461 +#: builtin/commit.c:1495 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" -#: builtin/commit.c:1462 +#: builtin/commit.c:1496 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1463 +#: builtin/commit.c:1497 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1464 +#: builtin/commit.c:1498 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86 +#: builtin/commit.c:1499 builtin/log.c:1180 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "添加 Signed-off-by: 签名" -#: builtin/commit.c:1466 +#: builtin/commit.c:1500 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1467 +#: builtin/commit.c:1501 msgid "force edit of commit" msgstr "强制编辑提交" # 译者：可选值，不能翻译（或是原文中笔误，应为 mode） -#: builtin/commit.c:1468 +#: builtin/commit.c:1502 msgid "default" msgstr "default" -#: builtin/commit.c:1468 builtin/tag.c:460 +#: builtin/commit.c:1502 builtin/tag.c:515 msgid "how to strip spaces and #comments from message" msgstr "设置如何删除提交说明里的空格和#注释" -#: builtin/commit.c:1469 +#: builtin/commit.c:1503 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461 -msgid "key id" -msgstr "key id" +#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92 +#: builtin/tag.c:516 +msgid "key-id" +msgstr "key-id" -#: builtin/commit.c:1471 builtin/merge.c:224 +#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG 提交签名" -#. end commit message options -#: builtin/commit.c:1474 +#: builtin/commit.c:1508 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1475 +#: builtin/commit.c:1509 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1476 +#: builtin/commit.c:1510 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1477 +#: builtin/commit.c:1511 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1478 +#: builtin/commit.c:1512 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1479 +#: builtin/commit.c:1513 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1480 +#: builtin/commit.c:1514 msgid "bypass pre-commit hook" msgstr "绕过 pre-commit 钩子" -#: builtin/commit.c:1481 +#: builtin/commit.c:1515 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1492 +#: builtin/commit.c:1526 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1493 +#: builtin/commit.c:1527 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1498 +#: builtin/commit.c:1532 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1500 +#: builtin/commit.c:1534 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1529 +#: builtin/commit.c:1562 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1567 builtin/merge.c:518 +#: builtin/commit.c:1601 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "不能为读入打开 '%s'" -#: builtin/commit.c:1574 +#: builtin/commit.c:1608 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1581 +#: builtin/commit.c:1615 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1600 +#: builtin/commit.c:1634 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1611 +#: builtin/commit.c:1645 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1616 +#: builtin/commit.c:1650 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879 +#: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/commit.c:1652 +#: builtin/commit.c:1686 msgid "cannot lock HEAD ref" msgstr "无法锁定 HEAD 引用" -#: builtin/commit.c:1656 +#: builtin/commit.c:1690 msgid "cannot update HEAD ref" msgstr "无法更新 HEAD 引用" -#: builtin/commit.c:1667 +#: builtin/commit.c:1701 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -4649,127 +4568,127 @@ msgstr "" msgid "git config [options]" msgstr "git config [选项]" -#: builtin/config.c:54 +#: builtin/config.c:53 msgid "Config file location" msgstr "配置文件位置" -#: builtin/config.c:55 +#: builtin/config.c:54 msgid "use global config file" msgstr "使用全局配置文件" -#: builtin/config.c:56 +#: builtin/config.c:55 msgid "use system config file" msgstr "使用系统级配置文件" -#: builtin/config.c:57 +#: builtin/config.c:56 msgid "use repository config file" msgstr "使用版本库级配置文件" -#: builtin/config.c:58 +#: builtin/config.c:57 msgid "use given config file" msgstr "使用指定的配置文件" -#: builtin/config.c:59 +#: builtin/config.c:58 msgid "blob-id" msgstr "数据对象ID" -#: builtin/config.c:59 +#: builtin/config.c:58 msgid "read config from given blob object" msgstr "从给定的数据对象读取配置" -#: builtin/config.c:60 +#: builtin/config.c:59 msgid "Action" msgstr "操作" -#: builtin/config.c:61 +#: builtin/config.c:60 msgid "get value: name [value-regex]" msgstr "获取值：name [value-regex]" -#: builtin/config.c:62 +#: builtin/config.c:61 msgid "get all values: key [value-regex]" msgstr "获得所有的值：key [value-regex]" -#: builtin/config.c:63 +#: builtin/config.c:62 msgid "get values for regexp: name-regex [value-regex]" msgstr "根据正则表达式获得值：name-regex [value-regex]" -#: builtin/config.c:64 +#: builtin/config.c:63 msgid "get value specific for the URL: section[.var] URL" msgstr "获得 URL 取值：section[.var] URL" -#: builtin/config.c:65 +#: builtin/config.c:64 msgid "replace all matching variables: name value [value_regex]" msgstr "替换所有匹配的变量：name value [value_regex]" -#: builtin/config.c:66 +#: builtin/config.c:65 msgid "add a new variable: name value" msgstr "添加一个新的变量：name value" -#: builtin/config.c:67 +#: builtin/config.c:66 msgid "remove a variable: name [value-regex]" msgstr "删除一个变量：name [value-regex]" -#: builtin/config.c:68 +#: builtin/config.c:67 msgid "remove all matches: name [value-regex]" msgstr "删除所有匹配项：name [value-regex]" -#: builtin/config.c:69 +#: builtin/config.c:68 msgid "rename section: old-name new-name" msgstr "重命名小节：old-name new-name" -#: builtin/config.c:70 +#: builtin/config.c:69 msgid "remove a section: name" msgstr "删除一个小节：name" -#: builtin/config.c:71 +#: builtin/config.c:70 msgid "list all" msgstr "列出所有" -#: builtin/config.c:72 +#: builtin/config.c:71 msgid "open an editor" msgstr "打开一个编辑器" -#: builtin/config.c:73 builtin/config.c:74 +#: builtin/config.c:72 builtin/config.c:73 msgid "slot" msgstr "slot" -#: builtin/config.c:73 +#: builtin/config.c:72 msgid "find the color configured: [default]" msgstr "找到配置的颜色：[默认]" -#: builtin/config.c:74 +#: builtin/config.c:73 msgid "find the color setting: [stdout-is-tty]" msgstr "找到颜色设置：[stdout-is-tty]" -#: builtin/config.c:75 +#: builtin/config.c:74 msgid "Type" msgstr "类型" -#: builtin/config.c:76 +#: builtin/config.c:75 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" -#: builtin/config.c:77 +#: builtin/config.c:76 msgid "value is decimal number" msgstr "值是十进制数" -#: builtin/config.c:78 +#: builtin/config.c:77 msgid "value is --bool or --int" msgstr "值是 --bool or --int" -#: builtin/config.c:79 +#: builtin/config.c:78 msgid "value is a path (file or directory name)" msgstr "值是一个路径（文件或目录名）" -#: builtin/config.c:80 +#: builtin/config.c:79 msgid "Other" msgstr "其它" -#: builtin/config.c:81 +#: builtin/config.c:80 msgid "terminate values with NUL byte" msgstr "终止值是NUL字节" -#: builtin/config.c:82 +#: builtin/config.c:81 msgid "respect include directives on lookup" msgstr "查询时参照 include 指令递归查找" @@ -4789,47 +4708,47 @@ msgstr "git describe [选项] <提交号>*" msgid "git describe [options] --dirty" msgstr "git describe [选项] --dirty" -#: builtin/describe.c:237 +#: builtin/describe.c:225 #, c-format msgid "annotated tag %s not available" msgstr "注释 tag %s 无效" -#: builtin/describe.c:241 +#: builtin/describe.c:229 #, c-format msgid "annotated tag %s has no embedded name" msgstr "注释 tag %s 没有嵌入名称" -#: builtin/describe.c:243 +#: builtin/describe.c:231 #, c-format msgid "tag '%s' is really '%s' here" msgstr "tag '%s' 的确是在 '%s'" -#: builtin/describe.c:270 +#: builtin/describe.c:258 #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" -#: builtin/describe.c:273 +#: builtin/describe.c:261 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: builtin/describe.c:290 +#: builtin/describe.c:278 #, c-format msgid "no tag exactly matches '%s'" msgstr "没有 tag 准确匹配 '%s'" -#: builtin/describe.c:292 +#: builtin/describe.c:280 #, c-format msgid "searching to describe %s\n" msgstr "搜索描述 %s\n" -#: builtin/describe.c:332 +#: builtin/describe.c:327 #, c-format msgid "finished search at %s\n" msgstr "完成搜索 %s\n" -#: builtin/describe.c:359 +#: builtin/describe.c:354 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -4838,7 +4757,7 @@ msgstr "" "没有注释 tag 能描述 '%s'。\n" "然而，有非注释 tag：尝试 --tags。" -#: builtin/describe.c:363 +#: builtin/describe.c:358 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -4847,12 +4766,12 @@ msgstr "" "没有注释 tag 能描述 '%s'。\n" "尝试 --always，或者创建一些 tag。" -#: builtin/describe.c:384 +#: builtin/describe.c:379 #, c-format msgid "traversed %lu commits\n" msgstr "已遍历 %lu 个提交\n" -#: builtin/describe.c:387 +#: builtin/describe.c:382 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -4861,63 +4780,63 @@ msgstr "" "发现多于 %i 个 tag，列出最近的 %i 个\n" "在 %s 放弃搜索\n" -#: builtin/describe.c:409 +#: builtin/describe.c:404 msgid "find the tag that comes after the commit" msgstr "寻找提交之后的 tag（用于描述提交）" -#: builtin/describe.c:410 +#: builtin/describe.c:405 msgid "debug search strategy on stderr" msgstr "在标准错误上调试搜索策略" -#: builtin/describe.c:411 +#: builtin/describe.c:406 msgid "use any ref" msgstr "使用任意引用" -#: builtin/describe.c:412 +#: builtin/describe.c:407 msgid "use any tag, even unannotated" msgstr "使用任意 tag，即使未带注解" -#: builtin/describe.c:413 +#: builtin/describe.c:408 msgid "always use long format" msgstr "始终使用长提交号格式" -#: builtin/describe.c:414 +#: builtin/describe.c:409 msgid "only follow first parent" msgstr "只跟随第一个父提交" -#: builtin/describe.c:417 +#: builtin/describe.c:412 msgid "only output exact matches" msgstr "只输出精确匹配" -#: builtin/describe.c:419 +#: builtin/describe.c:414 msgid "consider <n> most recent tags (default: 10)" msgstr "考虑最近 <n> 个 tags（默认：10）" -#: builtin/describe.c:421 +#: builtin/describe.c:416 msgid "only consider tags matching <pattern>" msgstr "只考虑匹配 <模式> 的 tags" -#: builtin/describe.c:423 builtin/name-rev.c:321 +#: builtin/describe.c:418 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" -#: builtin/describe.c:424 +#: builtin/describe.c:419 msgid "mark" msgstr "标记" -#: builtin/describe.c:425 +#: builtin/describe.c:420 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）" -#: builtin/describe.c:443 +#: builtin/describe.c:438 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 不兼容" -#: builtin/describe.c:469 +#: builtin/describe.c:464 msgid "No names found, cannot describe anything." msgstr "没有发现名称，无法描述任何东西。" -#: builtin/describe.c:489 +#: builtin/describe.c:484 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty 不能与提交同时使用" @@ -4948,7 +4867,7 @@ msgstr "提供了超过两个数据（blob）对象：'%s'" #: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." -msgstr "提供了无法处理的对象 '%s'。" +msgstr "无法处理的对象 '%s'。" #: builtin/fast-export.c:22 msgid "git fast-export [rev-list-opts]" @@ -5213,7 +5132,7 @@ msgstr "正在获取 %s\n" msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:1036 +#: builtin/fetch.c:1035 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5253,10 +5172,10 @@ 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:702 -#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446 -#: parse-options.h:135 parse-options.h:242 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700 +#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501 +#: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "n" @@ -5320,6 +5239,14 @@ msgstr "key" msgid "field name to sort on" msgstr "排序的字段名" +#: builtin/fsck.c:147 builtin/prune.c:172 +msgid "Checking connectivity" +msgstr "检查连接中" + +#: builtin/fsck.c:544 +msgid "Checking object directories" +msgstr "检查对象目录中" + #: builtin/fsck.c:607 msgid "git fsck [options] [<object>...]" msgstr "git fsck [选项] [<对象>...]" @@ -5364,54 +5291,63 @@ msgstr "将摇摆对象写入 .git/lost-found 中" msgid "show progress" msgstr "显示进度" +#: builtin/fsck.c:673 +msgid "Checking objects" +msgstr "检查对象中" + #: builtin/gc.c:24 msgid "git gc [options]" msgstr "git gc [选项]" -#: builtin/gc.c:80 +#: builtin/gc.c:90 #, c-format msgid "Invalid %s: '%s'" msgstr "无效的 %s：'%s'" -#: builtin/gc.c:107 +#: builtin/gc.c:117 #, c-format msgid "insanely long object directory %.*s" msgstr "不正常的长对象目录 %.*s" -#: builtin/gc.c:262 +#: builtin/gc.c:273 msgid "prune unreferenced objects" msgstr "清除未引用的对象" -#: builtin/gc.c:264 +#: builtin/gc.c:275 msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" -#: builtin/gc.c:265 +#: builtin/gc.c:276 msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" -#: builtin/gc.c:266 +#: builtin/gc.c:277 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" -#: builtin/gc.c:306 +#: builtin/gc.c:318 #, c-format -msgid "" -"Auto packing the repository for optimum performance. You may also\n" -"run \"git gc\" manually. See \"git help gc\" for more information.\n" -msgstr "" -"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n" -"参见 \"git help gc\" 以获取更多信息。\n" +msgid "Auto packing the repository in background for optimum performance.\n" +msgstr "自动在后台执行版本库打包以求最佳性能。\n" + +#: builtin/gc.c:320 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "自动打包版本库以求最佳性能。\n" + +#: builtin/gc.c:321 +#, c-format +msgid "See \"git help gc\" for manual housekeeping.\n" +msgstr "手工维护参见 \"git help gc\"。\n" -#. be quiet on --auto -#: builtin/gc.c:316 +#: builtin/gc.c:336 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）" -#: builtin/gc.c:341 +#: builtin/gc.c:361 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" @@ -5440,210 +5376,210 @@ msgstr "无法读取树（%s）" msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:551 +#: builtin/grep.c:549 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:568 +#: builtin/grep.c:566 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: builtin/grep.c:642 +#: builtin/grep.c:640 msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" -#: builtin/grep.c:644 +#: builtin/grep.c:642 msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/grep.c:646 +#: builtin/grep.c:644 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" -#: builtin/grep.c:648 +#: builtin/grep.c:646 msgid "search also in ignored files" msgstr "也在忽略的文件中搜索" -#: builtin/grep.c:651 +#: builtin/grep.c:649 msgid "show non-matching lines" msgstr "显示未匹配的行" -#: builtin/grep.c:653 +#: builtin/grep.c:651 msgid "case insensitive matching" msgstr "不区分大小写匹配" -#: builtin/grep.c:655 +#: builtin/grep.c:653 msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" -#: builtin/grep.c:657 +#: builtin/grep.c:655 msgid "process binary files as text" msgstr "把二进制文件当做文本处理" -#: builtin/grep.c:659 +#: builtin/grep.c:657 msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" -#: builtin/grep.c:662 +#: builtin/grep.c:660 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处理二进制文件" -#: builtin/grep.c:664 +#: builtin/grep.c:662 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下寻找" -#: builtin/grep.c:668 +#: builtin/grep.c:666 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" -#: builtin/grep.c:671 +#: builtin/grep.c:669 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" -#: builtin/grep.c:674 +#: builtin/grep.c:672 msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" -#: builtin/grep.c:677 +#: builtin/grep.c:675 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" -#: builtin/grep.c:680 +#: builtin/grep.c:678 msgid "show line numbers" msgstr "显示行号" -#: builtin/grep.c:681 +#: builtin/grep.c:679 msgid "don't show filenames" msgstr "不显示文件名" -#: builtin/grep.c:682 +#: builtin/grep.c:680 msgid "show filenames" msgstr "显示文件名" -#: builtin/grep.c:684 +#: builtin/grep.c:682 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/grep.c:686 +#: builtin/grep.c:684 msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" -#: builtin/grep.c:688 +#: builtin/grep.c:686 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" -#: builtin/grep.c:691 +#: builtin/grep.c:689 msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" -#: builtin/grep.c:693 +#: builtin/grep.c:691 msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" -#: builtin/grep.c:695 +#: builtin/grep.c:693 msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" -#: builtin/grep.c:696 +#: builtin/grep.c:694 msgid "highlight matches" msgstr "高亮显示匹配项" -#: builtin/grep.c:698 +#: builtin/grep.c:696 msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" -#: builtin/grep.c:700 +#: builtin/grep.c:698 msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" -#: builtin/grep.c:703 +#: builtin/grep.c:701 msgid "show <n> context lines before and after matches" msgstr "显示匹配项前后的 <n> 行上下文" -#: builtin/grep.c:706 +#: builtin/grep.c:704 msgid "show <n> context lines before matches" msgstr "显示匹配项前 <n> 行上下文" -#: builtin/grep.c:708 +#: builtin/grep.c:706 msgid "show <n> context lines after matches" msgstr "显示匹配项后 <n> 行上下文" -#: builtin/grep.c:709 +#: builtin/grep.c:707 msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" -#: builtin/grep.c:712 +#: builtin/grep.c:710 msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" -#: builtin/grep.c:714 +#: builtin/grep.c:712 msgid "show the surrounding function" msgstr "显示所在函数的前后内容" -#: builtin/grep.c:717 +#: builtin/grep.c:715 msgid "read patterns from file" msgstr "从文件读取模式" -#: builtin/grep.c:719 +#: builtin/grep.c:717 msgid "match <pattern>" msgstr "匹配 <模式>" -#: builtin/grep.c:721 +#: builtin/grep.c:719 msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" -#: builtin/grep.c:733 +#: builtin/grep.c:731 msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" -#: builtin/grep.c:735 +#: builtin/grep.c:733 msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" -#: builtin/grep.c:737 +#: builtin/grep.c:735 msgid "show parse tree for grep expression" msgstr "显示 grep 表达式的解析树" -#: builtin/grep.c:741 +#: builtin/grep.c:739 msgid "pager" msgstr "分页" -#: builtin/grep.c:741 +#: builtin/grep.c:739 msgid "show matching files in the pager" msgstr "分页显示匹配的文件" -#: builtin/grep.c:744 +#: builtin/grep.c:742 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:745 builtin/show-ref.c:187 +#: builtin/grep.c:743 builtin/show-ref.c:187 msgid "show usage" msgstr "显示用法" -#: builtin/grep.c:812 +#: builtin/grep.c:810 msgid "no pattern given." msgstr "未提供模式匹配。" -#: builtin/grep.c:870 +#: builtin/grep.c:868 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:893 +#: builtin/grep.c:891 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" -#: builtin/grep.c:898 +#: builtin/grep.c:896 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 或 --untracked 不能和版本同时使用。" -#: builtin/grep.c:901 +#: builtin/grep.c:899 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" -#: builtin/grep.c:909 +#: builtin/grep.c:907 msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" @@ -5659,7 +5595,7 @@ msgstr "" msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <路径列表>" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:72 builtin/tag.c:521 msgid "type" msgstr "类型" @@ -5898,8 +5834,8 @@ msgstr "解压缩严重的不一致" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:669 builtin/pack-objects.c:171 -#: builtin/pack-objects.c:263 +#: builtin/index-pack.c:669 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "不能读 %s" @@ -6165,34 +6101,32 @@ msgstr "不能处理 %d 类型的文件" msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" -#. -#. * TRANSLATORS: The first '%s' is either "Reinitialized -#. * existing" or "Initialized empty", the second " shared" or -#. * "", and the last '%s%s' is the verbatim directory name. -#. -#: builtin/init-db.c:420 +#. TRANSLATORS: The first '%s' is either "Reinitialized +#. existing" or "Initialized empty", the second " shared" or +#. "", and the last '%s%s' is the verbatim directory name. +#: builtin/init-db.c:418 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git 版本库于 %s%s\n" -#: builtin/init-db.c:421 +#: builtin/init-db.c:419 msgid "Reinitialized existing" msgstr "重新初始化现存的" -#: builtin/init-db.c:421 +#: builtin/init-db.c:419 msgid "Initialized empty" msgstr "初始化空的" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/init-db.c:422 +#: builtin/init-db.c:420 msgid " shared" msgstr "共享" -#: builtin/init-db.c:441 +#: builtin/init-db.c:439 msgid "cannot tell cwd" msgstr "无法获知当前路径" -#: builtin/init-db.c:467 +#: builtin/init-db.c:465 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [directory]" @@ -6200,29 +6134,29 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " "[目录]" -#: builtin/init-db.c:490 +#: builtin/init-db.c:488 msgid "permissions" msgstr "权限" -#: builtin/init-db.c:491 +#: builtin/init-db.c:489 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 版本库是多个用户之间共享的" -#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155 +#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168 msgid "be quiet" msgstr "保持安静" -#: builtin/init-db.c:525 builtin/init-db.c:530 +#: builtin/init-db.c:523 builtin/init-db.c:528 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:534 +#: builtin/init-db.c:532 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:556 +#: builtin/init-db.c:554 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6231,11 +6165,11 @@ msgstr "" "不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-" "dir=<directory>）" -#: builtin/init-db.c:580 +#: builtin/init-db.c:578 msgid "Cannot access current working directory" msgstr "不能访问当前工作目录" -#: builtin/init-db.c:587 +#: builtin/init-db.c:585 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" @@ -6498,95 +6432,95 @@ msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n" msgid "Unknown commit %s" msgstr "未知提交 %s" -#: builtin/ls-files.c:398 +#: builtin/ls-files.c:401 msgid "git ls-files [options] [<file>...]" msgstr "git ls-files [选项] [<文件>...]" -#: builtin/ls-files.c:455 +#: builtin/ls-files.c:458 msgid "identify the file status with tags" msgstr "用标签标识文件的状态" -#: builtin/ls-files.c:457 +#: builtin/ls-files.c:460 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小写字母表示 '假设未改变的' 文件" -#: builtin/ls-files.c:459 +#: builtin/ls-files.c:462 msgid "show cached files in the output (default)" msgstr "显示缓存的文件（默认）" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:464 msgid "show deleted files in the output" msgstr "显示已删除的文件" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:466 msgid "show modified files in the output" msgstr "显示已修改的文件" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:468 msgid "show other files in the output" msgstr "显示其它文件" -#: builtin/ls-files.c:467 +#: builtin/ls-files.c:470 msgid "show ignored files in the output" msgstr "显示忽略的文件" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:473 msgid "show staged contents' object name in the output" msgstr "显示暂存区内容的对象名称" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:475 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需要删除的文件" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:477 msgid "show 'other' directories' name only" msgstr "只显示“其他”目录的名称" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:480 msgid "don't show empty directories" msgstr "不显示空目录" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:483 msgid "show unmerged files in the output" msgstr "显示未合并的文件" -#: builtin/ls-files.c:482 +#: builtin/ls-files.c:485 msgid "show resolve-undo information" msgstr "显示 resolve-undo 信息" -#: builtin/ls-files.c:484 +#: builtin/ls-files.c:487 msgid "skip files matching pattern" msgstr "匹配排除文件的模式" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:490 msgid "exclude patterns are read from <file>" msgstr "从 <文件> 中读取排除模式" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:493 msgid "read additional per-directory exclude patterns in <file>" msgstr "从 <文件> 读取额外的每个目录的排除模式" -#: builtin/ls-files.c:492 +#: builtin/ls-files.c:495 msgid "add the standard git exclusions" msgstr "添加标准的 git 排除" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:498 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:501 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" -#: builtin/ls-files.c:499 +#: builtin/ls-files.c:502 msgid "tree-ish" msgstr "树或提交" -#: builtin/ls-files.c:500 +#: builtin/ls-files.c:503 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:505 msgid "show debugging data" msgstr "显示调试数据" @@ -6697,7 +6631,7 @@ msgstr "如果不能快进就放弃合并" msgid "Verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89 +#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89 msgid "strategy" msgstr "策略" @@ -6771,35 +6705,35 @@ msgstr "'%s' 没有指向一个提交" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c:650 +#: builtin/merge.c:653 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入一树对象" -#: builtin/merge.c:678 +#: builtin/merge.c:681 msgid "Not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" -#: builtin/merge.c:692 +#: builtin/merge.c:695 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:706 +#: builtin/merge.c:709 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:795 +#: builtin/merge.c:798 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:804 +#: builtin/merge.c:807 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:810 +#: builtin/merge.c:813 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6813,47 +6747,47 @@ msgstr "" "\n" "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n" -#: builtin/merge.c:834 +#: builtin/merge.c:837 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:846 +#: builtin/merge.c:849 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:911 +#: builtin/merge.c:914 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:927 +#: builtin/merge.c:930 #, c-format msgid "'%s' is not a commit" msgstr "'%s' 不是一个提交" -#: builtin/merge.c:968 +#: builtin/merge.c:971 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:970 +#: builtin/merge.c:973 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程版本库。" -#: builtin/merge.c:972 +#: builtin/merge.c:975 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:977 +#: builtin/merge.c:980 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1133 +#: builtin/merge.c:1136 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1149 git-pull.sh:31 +#: builtin/merge.c:1152 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6861,11 +6795,11 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1152 git-pull.sh:34 +#: builtin/merge.c:1155 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: builtin/merge.c:1156 +#: builtin/merge.c:1159 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6873,101 +6807,100 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1159 +#: builtin/merge.c:1162 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1168 +#: builtin/merge.c:1171 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 与 --no-ff 同时使用。" -#: builtin/merge.c:1177 +#: builtin/merge.c:1180 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1209 +#: builtin/merge.c:1212 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1212 +#: builtin/merge.c:1215 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1214 +#: builtin/merge.c:1217 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1219 +#: builtin/merge.c:1222 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1270 +#: builtin/merge.c:1273 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: builtin/merge.c:1273 +#: builtin/merge.c:1276 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" -#. 'N' -#: builtin/merge.c:1276 +#: builtin/merge.c:1279 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有一个 GPG 签名。" -#: builtin/merge.c:1279 +#: builtin/merge.c:1282 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: builtin/merge.c:1363 +#: builtin/merge.c:1366 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1402 +#: builtin/merge.c:1405 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1409 +#: builtin/merge.c:1412 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1441 +#: builtin/merge.c:1444 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1464 builtin/merge.c:1543 +#: builtin/merge.c:1467 builtin/merge.c:1546 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1471 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1534 +#: builtin/merge.c:1537 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1536 +#: builtin/merge.c:1539 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1545 +#: builtin/merge.c:1548 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1557 +#: builtin/merge.c:1560 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" @@ -7051,19 +6984,19 @@ msgstr "不要警告冲突" msgid "set labels for file1/orig_file/file2" msgstr "为 file1/orig_file/file2 设置标签" -#: builtin/mktree.c:67 +#: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:153 +#: builtin/mktree.c:150 msgid "input is NUL terminated" msgstr "输入以 NUL 字符终止" -#: builtin/mktree.c:154 builtin/write-tree.c:24 +#: builtin/mktree.c:151 builtin/write-tree.c:24 msgid "allow missing objects" msgstr "允许丢失的对象" -#: builtin/mktree.c:155 +#: builtin/mktree.c:152 msgid "allow creation of more than one tree" msgstr "允许创建一个以上的树" @@ -7110,46 +7043,46 @@ msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" msgid "Huh? %.*s is in index?" msgstr "嗯？%.*s 在索引中？" -#: builtin/mv.c:168 +#: builtin/mv.c:169 msgid "source directory is empty" msgstr "源目录为空" -#: builtin/mv.c:200 +#: builtin/mv.c:205 msgid "not under version control" msgstr "不在版本控制之下" -#: builtin/mv.c:202 +#: builtin/mv.c:207 msgid "destination exists" msgstr "目标已存在" -#: builtin/mv.c:210 +#: builtin/mv.c:215 #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" -#: builtin/mv.c:213 +#: builtin/mv.c:218 msgid "Cannot overwrite" msgstr "不能覆盖" -#: builtin/mv.c:216 +#: builtin/mv.c:221 msgid "multiple sources for the same target" msgstr "同一目标具有多个源" -#: builtin/mv.c:218 +#: builtin/mv.c:223 msgid "destination directory does not exist" msgstr "目标目录不存在" -#: builtin/mv.c:233 +#: builtin/mv.c:243 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，源=%s，目标=%s" -#: builtin/mv.c:243 +#: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" @@ -7317,7 +7250,7 @@ msgstr "不能读取 'show' 的输出" msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" -#: builtin/notes.c:167 builtin/tag.c:341 +#: builtin/notes.c:167 builtin/tag.c:373 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" @@ -7326,7 +7259,7 @@ msgstr "不能创建文件 '%s'" msgid "Please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解提供内容" -#: builtin/notes.c:207 builtin/notes.c:844 +#: builtin/notes.c:207 builtin/notes.c:848 #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" @@ -7340,20 +7273,20 @@ msgstr "不能写注解对象" msgid "The note contents has been left in %s" msgstr "注解内容被留在文件 %s 中" -#: builtin/notes.c:248 builtin/tag.c:537 +#: builtin/notes.c:248 builtin/tag.c:604 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: builtin/notes.c:250 builtin/tag.c:540 +#: builtin/notes.c:250 builtin/tag.c:607 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" -#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318 -#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515 -#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637 -#: builtin/notes.c:839 builtin/tag.c:553 +#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322 +#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519 +#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641 +#: builtin/notes.c:843 builtin/tag.c:620 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" @@ -7363,89 +7296,94 @@ msgstr "无法解析 '%s' 为一个有效引用。" msgid "Failed to read object '%s'." msgstr "无法读取对象 '%s'。" -#: builtin/notes.c:312 +#: builtin/notes.c:276 +#, c-format +msgid "Cannot read note data from non-blob object '%s'." +msgstr "不能从非数据对象 '%s' 中读取注解数据" + +#: builtin/notes.c:316 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/notes.c:327 +#: builtin/notes.c:331 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "无法从 '%s' 到 '%s' 拷贝注解" -#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498 -#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630 -#: builtin/notes.c:904 +#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502 +#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634 +#: builtin/notes.c:908 msgid "too many parameters" msgstr "参数太多" -#: builtin/notes.c:384 builtin/notes.c:643 +#: builtin/notes.c:388 builtin/notes.c:647 #, c-format msgid "No note found for object %s." msgstr "未发现对象 %s 的注解。" -#: builtin/notes.c:406 builtin/notes.c:563 +#: builtin/notes.c:410 builtin/notes.c:567 msgid "note contents as a string" msgstr "注解内容作为一个字符串" -#: builtin/notes.c:409 builtin/notes.c:566 +#: builtin/notes.c:413 builtin/notes.c:570 msgid "note contents in a file" msgstr "注解内容到一个文件中" -#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568 -#: builtin/notes.c:571 builtin/tag.c:474 +#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572 +#: builtin/notes.c:575 builtin/tag.c:539 msgid "object" msgstr "对象" -#: builtin/notes.c:412 builtin/notes.c:569 +#: builtin/notes.c:416 builtin/notes.c:573 msgid "reuse and edit specified note object" msgstr "重用和编辑指定的注解对象" -#: builtin/notes.c:415 builtin/notes.c:572 +#: builtin/notes.c:419 builtin/notes.c:576 msgid "reuse specified note object" msgstr "重用指定的注解对象" -#: builtin/notes.c:417 builtin/notes.c:485 +#: builtin/notes.c:421 builtin/notes.c:489 msgid "replace existing notes" msgstr "替换已存在的注解" -#: builtin/notes.c:451 +#: builtin/notes.c:455 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:456 builtin/notes.c:533 +#: builtin/notes.c:460 builtin/notes.c:537 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" -#: builtin/notes.c:486 +#: builtin/notes.c:490 msgid "read objects from stdin" msgstr "从标准输入读取对象" -#: builtin/notes.c:488 +#: builtin/notes.c:492 msgid "load rewriting config for <command> (implies --stdin)" msgstr "重新加载 <命令> 的配置（隐含 --stdin）" -#: builtin/notes.c:506 +#: builtin/notes.c:510 msgid "too few parameters" msgstr "参数太少" -#: builtin/notes.c:527 +#: builtin/notes.c:531 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:539 +#: builtin/notes.c:543 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "源对象 %s 缺少注解。不能拷贝。" -#: builtin/notes.c:588 +#: builtin/notes.c:592 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -7454,215 +7392,239 @@ msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" -#: builtin/notes.c:735 +#: builtin/notes.c:739 msgid "General options" msgstr "通用选项" -#: builtin/notes.c:737 +#: builtin/notes.c:741 msgid "Merge options" msgstr "合并选项" -#: builtin/notes.c:739 +#: builtin/notes.c:743 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:741 +#: builtin/notes.c:745 msgid "Committing unmerged notes" msgstr "提交未合并的注解" -#: builtin/notes.c:743 +#: builtin/notes.c:747 msgid "finalize notes merge by committing unmerged notes" msgstr "通过提交未合并的注解来完成注解合并" -#: builtin/notes.c:745 +#: builtin/notes.c:749 msgid "Aborting notes merge resolution" msgstr "中止注解合并的方案" -#: builtin/notes.c:747 +#: builtin/notes.c:751 msgid "abort notes merge" msgstr "中止注解合并" -#: builtin/notes.c:842 +#: builtin/notes.c:846 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c:854 +#: builtin/notes.c:858 msgid "attempt to remove non-existent note is not an error" msgstr "尝试删除不存在的注解不是一个错误" -#: builtin/notes.c:857 +#: builtin/notes.c:861 msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c:938 -msgid "notes_ref" +#: builtin/notes.c:942 +msgid "notes-ref" msgstr "注解引用" -#: builtin/notes.c:939 +#: builtin/notes.c:943 msgid "use notes from <notes_ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:974 builtin/remote.c:1593 +#: builtin/notes.c:978 builtin/remote.c:1593 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/pack-objects.c:23 +#: builtin/pack-objects.c:25 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]" -#: builtin/pack-objects.c:24 +#: builtin/pack-objects.c:26 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]" -#: builtin/pack-objects.c:184 builtin/pack-objects.c:187 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: builtin/pack-objects.c:2396 +#: builtin/pack-objects.c:771 +msgid "Writing objects" +msgstr "写入对象中" + +#: builtin/pack-objects.c:1012 +msgid "disabling bitmap writing, as some objects are not being packed" +msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" + +#: builtin/pack-objects.c:2174 +msgid "Compressing objects" +msgstr "压缩对象中" + +#: builtin/pack-objects.c:2530 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:2400 +#: builtin/pack-objects.c:2534 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:2423 +#: builtin/pack-objects.c:2557 #, c-format msgid "option %s does not accept negative form" msgstr "选项 %s 不接受否定格式" -#: builtin/pack-objects.c:2427 +#: builtin/pack-objects.c:2561 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "不能解析选项 %1$s 的值 '%2$s'" -#: builtin/pack-objects.c:2446 +#: builtin/pack-objects.c:2580 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2582 msgid "show progress meter" msgstr "显示进度表" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2584 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/pack-objects.c:2453 +#: builtin/pack-objects.c:2587 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" -#: builtin/pack-objects.c:2454 +#: builtin/pack-objects.c:2588 msgid "version[,offset]" msgstr "版本[,偏移]" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2589 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:2458 +#: builtin/pack-objects.c:2592 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:2460 +#: builtin/pack-objects.c:2594 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从替代对象存储里借用对象" -#: builtin/pack-objects.c:2462 +#: builtin/pack-objects.c:2596 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:2464 +#: builtin/pack-objects.c:2598 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:2466 +#: builtin/pack-objects.c:2600 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:2468 +#: builtin/pack-objects.c:2602 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:2470 +#: builtin/pack-objects.c:2604 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:2472 +#: builtin/pack-objects.c:2606 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:2474 +#: builtin/pack-objects.c:2608 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:2476 +#: builtin/pack-objects.c:2610 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:2478 +#: builtin/pack-objects.c:2612 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:2480 +#: builtin/pack-objects.c:2614 msgid "read revision arguments from standard input" msgstr "从标准输入读取修订号参数" -#: builtin/pack-objects.c:2482 +#: builtin/pack-objects.c:2616 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:2485 +#: builtin/pack-objects.c:2619 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:2488 +#: builtin/pack-objects.c:2622 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:2491 +#: builtin/pack-objects.c:2625 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:2493 +#: builtin/pack-objects.c:2627 msgid "include tag objects that refer to objects to be packed" msgstr "包括引用了打包对象的 tag" -#: builtin/pack-objects.c:2495 +#: builtin/pack-objects.c:2629 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:2496 parse-options.h:143 +#: builtin/pack-objects.c:2630 parse-options.h:140 msgid "time" msgstr "时间" -#: builtin/pack-objects.c:2497 +#: builtin/pack-objects.c:2631 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:2500 +#: builtin/pack-objects.c:2634 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:2502 +#: builtin/pack-objects.c:2636 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:2504 +#: builtin/pack-objects.c:2638 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:2506 +#: builtin/pack-objects.c:2640 msgid "do not hide commits by grafts" msgstr "显示被嫁接隐藏的提交" +#: builtin/pack-objects.c:2642 +msgid "use a bitmap index if available to speed up counting objects" +msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度" + +#: builtin/pack-objects.c:2644 +msgid "write a bitmap index together with the pack index" +msgstr "在建立包索引的同时创建 bitmap 索引" + +#: builtin/pack-objects.c:2723 +msgid "Counting objects" +msgstr "对象计数中" + #: builtin/pack-refs.c:6 msgid "git pack-refs [options]" msgstr "git pack-refs [选项]" @@ -7679,6 +7641,10 @@ msgstr "清除松散的引用（默认）" msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +#: builtin/prune-packed.c:49 +msgid "Removing duplicate objects" +msgstr "正在删除重复对象" + #: builtin/prune.c:12 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" @@ -7699,15 +7665,15 @@ msgstr "使早于给定时间的对象过期" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<选项>] [<版本库> [<引用规则>...]]" -#: builtin/push.c:86 +#: builtin/push.c:85 msgid "tag shorthand without <tag>" msgstr "tag 简写没有跟 <tag> 参数" -#: builtin/push.c:96 +#: builtin/push.c:95 msgid "--delete only accepts plain target ref names" msgstr "--delete 只接受简单的目标引用名" -#: builtin/push.c:141 +#: builtin/push.c:140 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -7715,7 +7681,7 @@ msgstr "" "\n" "为了永久地选择任一选项，参见 'git help config' 中的 push.default。" -#: builtin/push.c:144 +#: builtin/push.c:143 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -7739,7 +7705,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:159 +#: builtin/push.c:158 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7753,7 +7719,7 @@ msgstr "" "\n" " git push %s HEAD:<name-of-remote-branch>\n" -#: builtin/push.c:173 +#: builtin/push.c:172 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7766,12 +7732,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:181 +#: builtin/push.c:180 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当前分支 %s 有多个上游分支，拒绝推送。" -#: builtin/push.c:184 +#: builtin/push.c:183 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7782,11 +7748,11 @@ msgstr "" "而没有告诉我要推送什么、更新哪个远程分支。" # 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短 -#: builtin/push.c:207 +#: builtin/push.c:206 msgid "" -"push.default is unset; its implicit value is changing in\n" +"push.default is unset; its implicit value has changed in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" -"and maintain the current behavior after the default changes, use:\n" +"and maintain the traditional behavior, use:\n" "\n" " git config --global push.default matching\n" "\n" @@ -7797,7 +7763,7 @@ msgid "" "When push.default is set to 'matching', git will push local branches\n" "to the remote branches that already exist with the same name.\n" "\n" -"In Git 2.0, Git will default to the more conservative 'simple'\n" +"Since Git 2.0, Git defaults to the more conservative 'simple'\n" "behavior, which only pushes the current branch to the corresponding\n" "remote branch that 'git pull' uses to update the current branch.\n" "\n" @@ -7806,7 +7772,7 @@ msgid "" "(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" +"push.default 尚未设置，它的默认值在 Git 2.0 已从 'matching'\n" "变更为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n" "\n" " git config --global push.default matching\n" @@ -7825,12 +7791,12 @@ msgstr "" "（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n" "为保持兼容，请用 'current' 代替 'simple'）" -#: builtin/push.c:274 +#: builtin/push.c:273 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推送指定任何引用规则，并且 push.default 为 \"nothing\"。" -#: builtin/push.c:281 +#: builtin/push.c:280 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -7841,19 +7807,7 @@ msgstr "" "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:287 -msgid "" -"Updates were rejected because a pushed branch tip is behind its remote\n" -"counterpart. If you did not intend to push that branch, you may want to\n" -"specify branches to push or set the 'push.default' configuration variable\n" -"to 'simple', 'current' or 'upstream' to push only the current branch." -msgstr "" -"更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n" -"如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n" -"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n" -"以便只推送当前分支。" - -#: builtin/push.c:293 +#: builtin/push.c:286 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -7864,7 +7818,7 @@ msgstr "" "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:299 +#: builtin/push.c:292 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" @@ -7877,11 +7831,11 @@ msgstr "" "（如 'git pull ...'）。\n" "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:306 +#: builtin/push.c:299 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒绝因为 tag 在远程已经存在。" -#: builtin/push.c:309 +#: builtin/push.c:302 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" @@ -7890,22 +7844,22 @@ msgstr "" "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n" "也不能更新远程引用让其指向一个非提交对象。\n" -#: builtin/push.c:375 +#: builtin/push.c:361 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:379 +#: builtin/push.c:365 #, c-format msgid "failed to push some refs to '%s'" msgstr "无法推送一些引用到 '%s'" -#: builtin/push.c:412 +#: builtin/push.c:395 #, c-format msgid "bad repository '%s'" msgstr "坏的版本库 '%s'" -#: builtin/push.c:413 +#: builtin/push.c:396 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7926,95 +7880,95 @@ msgstr "" "\n" " git push <name>\n" -#: builtin/push.c:428 +#: builtin/push.c:411 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" -#: builtin/push.c:429 +#: builtin/push.c:412 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用规则同时使用" -#: builtin/push.c:434 +#: builtin/push.c:417 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" -#: builtin/push.c:435 +#: builtin/push.c:418 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用规则同时使用" -#: builtin/push.c:440 +#: builtin/push.c:423 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:500 +#: builtin/push.c:483 msgid "repository" msgstr "版本库" -#: builtin/push.c:501 +#: builtin/push.c:484 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:502 +#: builtin/push.c:485 msgid "mirror all refs" msgstr "镜像所有引用" -#: builtin/push.c:504 +#: builtin/push.c:487 msgid "delete refs" msgstr "删除引用" -#: builtin/push.c:505 +#: builtin/push.c:488 msgid "push tags (can't be used with --all or --mirror)" msgstr "推送 tags（不能使用 --all or --mirror）" -#: builtin/push.c:508 +#: builtin/push.c:491 msgid "force updates" msgstr "强制更新" -#: builtin/push.c:510 +#: builtin/push.c:493 msgid "refname>:<expect" msgstr "引用名>:<期望值" -#: builtin/push.c:511 +#: builtin/push.c:494 msgid "require old value of ref to be at this value" msgstr "要求引用旧的取值为设定值" -#: builtin/push.c:513 +#: builtin/push.c:496 msgid "check" msgstr "检查" -#: builtin/push.c:514 +#: builtin/push.c:497 msgid "control recursive pushing of submodules" msgstr "控制子模组的递归推送" -#: builtin/push.c:516 +#: builtin/push.c:499 msgid "use thin pack" msgstr "使用精简打包" -#: builtin/push.c:517 builtin/push.c:518 +#: builtin/push.c:500 builtin/push.c:501 msgid "receive pack program" msgstr "接收包程序" -#: builtin/push.c:519 +#: builtin/push.c:502 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" -#: builtin/push.c:522 +#: builtin/push.c:505 msgid "prune locally removed refs" msgstr "清除本地删除的引用" -#: builtin/push.c:524 +#: builtin/push.c:507 msgid "bypass pre-push hook" msgstr "绕过 pre-push 钩子" -#: builtin/push.c:525 +#: builtin/push.c:508 msgid "push missing but relevant tags" msgstr "推送缺失的有关的 tags" -#: builtin/push.c:535 +#: builtin/push.c:518 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:537 +#: builtin/push.c:520 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" @@ -8598,67 +8552,75 @@ msgstr "将不会删除所有非推送URL地址" msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于子命令之前" -#: builtin/repack.c:15 +#: builtin/repack.c:16 msgid "git repack [options]" msgstr "git repack [选项]" -#: builtin/repack.c:143 +#: builtin/repack.c:156 msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件中" -#: builtin/repack.c:145 +#: builtin/repack.c:158 msgid "same as -a, and turn unreachable objects loose" msgstr "和 -a 相同，并将不可达的对象设为松散对象" -#: builtin/repack.c:148 +#: builtin/repack.c:161 msgid "remove redundant packs, and run git-prune-packed" msgstr "删除多余的包，运行 git-prune-packed" -#: builtin/repack.c:150 +#: builtin/repack.c:163 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" -#: builtin/repack.c:152 +#: builtin/repack.c:165 msgid "pass --no-reuse-object to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-object" -#: builtin/repack.c:154 +#: builtin/repack.c:167 msgid "do not run git-update-server-info" msgstr "不运行 git-update-server-info" -#: builtin/repack.c:157 +#: builtin/repack.c:170 msgid "pass --local to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --local" -#: builtin/repack.c:158 +#: builtin/repack.c:172 +msgid "write bitmap index" +msgstr "写 bitmap 索引" + +#: builtin/repack.c:173 msgid "approxidate" msgstr "近似日期" -#: builtin/repack.c:159 +#: builtin/repack.c:174 msgid "with -A, do not loosen objects older than this" msgstr "使用 -A，不要将早于给定时间的对象过期" -#: builtin/repack.c:161 +#: builtin/repack.c:176 msgid "size of the window used for delta compression" msgstr "用于增量压缩的窗口值" -#: builtin/repack.c:162 builtin/repack.c:166 +#: builtin/repack.c:177 builtin/repack.c:181 msgid "bytes" msgstr "字节" -#: builtin/repack.c:163 +#: builtin/repack.c:178 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上面的相似，但限制内存大小而非条目数" -#: builtin/repack.c:165 +#: builtin/repack.c:180 msgid "limits the maximum delta depth" msgstr "限制最大增量深度" -#: builtin/repack.c:167 +#: builtin/repack.c:182 msgid "maximum size of each packfile" msgstr "每个包的最大尺寸" -#: builtin/repack.c:343 +#: builtin/repack.c:184 +msgid "repack objects in packs marked with .keep" +msgstr "对标记为 .keep 的包中的对象重新打包" + +#: builtin/repack.c:371 #, c-format msgid "removing '%s' failed" msgstr "删除 '%s' 失败" @@ -8751,76 +8713,84 @@ msgid "HEAD is now at %s" msgstr "HEAD 现在位于 %s" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:172 +#: builtin/reset.c:182 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:262 +#: builtin/reset.c:273 msgid "be quiet, only report errors" msgstr "安静模式，只报告错误" -#: builtin/reset.c:264 +#: builtin/reset.c:275 msgid "reset HEAD and index" msgstr "重置 HEAD 和索引" -#: builtin/reset.c:265 +#: builtin/reset.c:276 msgid "reset only HEAD" msgstr "只重置 HEAD" -#: builtin/reset.c:267 builtin/reset.c:269 +#: builtin/reset.c:278 builtin/reset.c:280 msgid "reset HEAD, index and working tree" msgstr "重置 HEAD、索引和工作区" -#: builtin/reset.c:271 +#: builtin/reset.c:282 msgid "reset HEAD but keep local changes" msgstr "重置 HEAD 但保存本地变更" -#: builtin/reset.c:289 +#: builtin/reset.c:285 +msgid "record only the fact that removed paths will be added later" +msgstr "将删除的路径标记为稍后添加" + +#: builtin/reset.c:302 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "无法将 '%s' 解析为一个有效的版本。" -#: builtin/reset.c:292 builtin/reset.c:300 +#: builtin/reset.c:305 builtin/reset.c:313 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/reset.c:297 +#: builtin/reset.c:310 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "无法将 '%s' 解析为一个有效的树对象。" -#: builtin/reset.c:306 +#: builtin/reset.c:319 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" -#: builtin/reset.c:315 +#: builtin/reset.c:328 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用，而是用 'git reset -- <paths>'。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:317 +#: builtin/reset.c:330 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:327 +#: builtin/reset.c:340 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能对裸版本库进行%s重置" #: builtin/reset.c:344 +msgid "-N can only be used with --mixed" +msgstr "-N 只能和 --mixed 同时使用" + +#: builtin/reset.c:361 msgid "Unstaged changes after reset:" msgstr "重置后撤出暂存区的变更：" -#: builtin/reset.c:350 +#: builtin/reset.c:367 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" -#: builtin/reset.c:355 +#: builtin/reset.c:372 msgid "Could not write new index file." msgstr "不能写入新的索引文件。" @@ -8840,7 +8810,7 @@ msgstr "遇到第一个非选项参数后停止解析" msgid "output in stuck long form" msgstr "以固定长格式输出" -#: builtin/rev-parse.c:486 +#: builtin/rev-parse.c:497 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -8911,35 +8881,35 @@ msgstr "选项" msgid "option for merge strategy" msgstr "合并策略的选项" -#: builtin/revert.c:102 +#: builtin/revert.c:104 msgid "append commit name" msgstr "追加提交名称" -#: builtin/revert.c:103 +#: builtin/revert.c:105 msgid "allow fast-forward" msgstr "允许快进式" -#: builtin/revert.c:104 +#: builtin/revert.c:106 msgid "preserve initially empty commits" msgstr "保留初始化的空提交" -#: builtin/revert.c:105 +#: builtin/revert.c:107 msgid "allow commits with empty messages" msgstr "允许提交说明为空" -#: builtin/revert.c:106 +#: builtin/revert.c:108 msgid "keep redundant, empty commits" msgstr "保持多余的、空的提交" -#: builtin/revert.c:110 +#: builtin/revert.c:112 msgid "program error" msgstr "程序错误" -#: builtin/revert.c:195 +#: builtin/revert.c:197 msgid "revert failed" msgstr "还原失败" -#: builtin/revert.c:210 +#: builtin/revert.c:212 msgid "cherry-pick failed" msgstr "拣选失败" @@ -9206,11 +9176,11 @@ msgstr "删除符号引用" msgid "shorten ref output" msgstr "简短的引用输出" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:255 msgid "reason" msgstr "原因" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:255 msgid "reason of the update" msgstr "更新的原因" @@ -9235,32 +9205,32 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <标签名>..." -#: builtin/tag.c:60 +#: builtin/tag.c:67 #, c-format msgid "malformed object at '%s'" msgstr "非法的对象于 '%s'" -#: builtin/tag.c:207 +#: builtin/tag.c:239 #, c-format msgid "tag name too long: %.*s..." msgstr "tag 名字太长：%.*s..." -#: builtin/tag.c:212 +#: builtin/tag.c:244 #, c-format msgid "tag '%s' not found." msgstr "tag '%s' 未发现。" -#: builtin/tag.c:227 +#: builtin/tag.c:259 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "已删除 tag '%s'（曾为 %s）\n" -#: builtin/tag.c:239 +#: builtin/tag.c:271 #, c-format msgid "could not verify the tag '%s'" msgstr "不能校验 tag '%s'" -#: builtin/tag.c:249 +#: builtin/tag.c:281 #, c-format msgid "" "\n" @@ -9271,7 +9241,7 @@ msgstr "" "输入一个 tag 说明\n" "以 '%c' 开头的行将被忽略。\n" -#: builtin/tag.c:253 +#: builtin/tag.c:285 #, c-format msgid "" "\n" @@ -9283,254 +9253,271 @@ msgstr "" "输入一个 tag 说明\n" "以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n" -#: builtin/tag.c:292 +#: builtin/tag.c:324 msgid "unable to sign the tag" msgstr "无法签署 tag" -#: builtin/tag.c:294 +#: builtin/tag.c:326 msgid "unable to write tag file" msgstr "无法写 tag 文件" -#: builtin/tag.c:319 +#: builtin/tag.c:351 msgid "bad object type." msgstr "坏的对象类型。" -#: builtin/tag.c:332 +#: builtin/tag.c:364 msgid "tag header too big." msgstr "tag 头信息太大。" -#: builtin/tag.c:368 +#: builtin/tag.c:400 msgid "no tag message?" msgstr "无 tag 说明？" -#: builtin/tag.c:374 +#: builtin/tag.c:406 #, c-format msgid "The tag message has been left in %s\n" msgstr "tag 说明被保留在 %s\n" -#: builtin/tag.c:423 +#: builtin/tag.c:455 msgid "switch 'points-at' requires an object" msgstr "开关 'points-at' 需要一个对象" -#: builtin/tag.c:425 +#: builtin/tag.c:457 #, c-format msgid "malformed object name '%s'" msgstr "非法的对象名 '%s'" -#: builtin/tag.c:445 +#: builtin/tag.c:480 +#, c-format +msgid "unsupported sort specification %s" +msgstr "不支持的排序规格 %s" + +#: builtin/tag.c:500 msgid "list tag names" msgstr "列出tag名称" -#: builtin/tag.c:447 +#: builtin/tag.c:502 msgid "print <n> lines of each tag message" msgstr "每个 tag 信息打印 <n> 行" -#: builtin/tag.c:449 +#: builtin/tag.c:504 msgid "delete tags" msgstr "删除 tags" -#: builtin/tag.c:450 +#: builtin/tag.c:505 msgid "verify tags" msgstr "验证 tags" -#: builtin/tag.c:452 +#: builtin/tag.c:507 msgid "Tag creation options" msgstr "Tag 创建选项" -#: builtin/tag.c:454 +#: builtin/tag.c:509 msgid "annotated tag, needs a message" msgstr "注解 tag，需要一个说明" -#: builtin/tag.c:456 +#: builtin/tag.c:511 msgid "tag message" msgstr "tag 说明" -#: builtin/tag.c:458 +#: builtin/tag.c:513 msgid "annotated and GPG-signed tag" msgstr "注解并 GPG 签名的 tag" -#: builtin/tag.c:462 +#: builtin/tag.c:517 msgid "use another key to sign the tag" msgstr "使用另外的私钥签名 tag" -#: builtin/tag.c:463 +#: builtin/tag.c:518 msgid "replace the tag if exists" msgstr "如果存在，替换现有的 tag" -#: builtin/tag.c:464 +#: builtin/tag.c:519 msgid "show tag list in columns" msgstr "以列的方式显示 tag" -#: builtin/tag.c:466 +#: builtin/tag.c:521 +msgid "sort tags" +msgstr "排序 tags" + +#: builtin/tag.c:525 msgid "Tag listing options" msgstr "Tag 列表选项" -#: builtin/tag.c:469 +#: builtin/tag.c:528 builtin/tag.c:534 msgid "print only tags that contain the commit" msgstr "只打印包含提交的tags" -#: builtin/tag.c:475 +#: builtin/tag.c:540 msgid "print only tags of the object" msgstr "只打印tags对象" -#: builtin/tag.c:501 +#: builtin/tag.c:566 msgid "--column and -n are incompatible" msgstr "--column 和 -n 不兼容" -#: builtin/tag.c:518 +#: builtin/tag.c:578 +msgid "--sort and -n are incompatible" +msgstr "--sort 和 -n 不兼容" + +#: builtin/tag.c:585 msgid "-n option is only allowed with -l." msgstr "-n 选项只允许和 -l 同时使用。" -#: builtin/tag.c:520 +#: builtin/tag.c:587 msgid "--contains option is only allowed with -l." msgstr "--contains 选项只允许和 -l 同时使用。" -#: builtin/tag.c:522 +#: builtin/tag.c:589 msgid "--points-at option is only allowed with -l." msgstr "--points-at 选项只允许和 -l 同时使用。" -#: builtin/tag.c:530 +#: builtin/tag.c:597 msgid "only one -F or -m option is allowed." msgstr "只允许一个 -F 或 -m 选项。" -#: builtin/tag.c:550 +#: builtin/tag.c:617 msgid "too many params" msgstr "太多参数" -#: builtin/tag.c:556 +#: builtin/tag.c:623 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一个有效的tag名称。" -#: builtin/tag.c:561 +#: builtin/tag.c:628 #, c-format msgid "tag '%s' already exists" msgstr "tag '%s' 已存在" -#: builtin/tag.c:579 +#: builtin/tag.c:646 #, c-format msgid "%s: cannot lock the ref" msgstr "%s：不能锁定引用" -#: builtin/tag.c:581 +#: builtin/tag.c:648 #, c-format msgid "%s: cannot update the ref" msgstr "%s：不能更新引用" -#: builtin/tag.c:583 +#: builtin/tag.c:650 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新tag '%s'（曾为 %s）\n" -#: builtin/update-index.c:402 +#: builtin/unpack-objects.c:483 +msgid "Unpacking objects" +msgstr "展开对象中" + +#: builtin/update-index.c:399 msgid "git update-index [options] [--] [<file>...]" msgstr "git update-index [选项] [--] [<文件>...]" -#: builtin/update-index.c:720 +#: builtin/update-index.c:748 msgid "continue refresh even when index needs update" msgstr "当索引需要更新时继续刷新" -#: builtin/update-index.c:723 +#: builtin/update-index.c:751 msgid "refresh: ignore submodules" msgstr "刷新：忽略子模组" -#: builtin/update-index.c:726 +#: builtin/update-index.c:754 msgid "do not ignore new files" msgstr "不忽略新的文件" -#: builtin/update-index.c:728 +#: builtin/update-index.c:756 msgid "let files replace directories and vice-versa" msgstr "让文件替换目录（反之亦然）" -#: builtin/update-index.c:730 +#: builtin/update-index.c:758 msgid "notice files missing from worktree" msgstr "通知文件从工作区丢失" -#: builtin/update-index.c:732 +#: builtin/update-index.c:760 msgid "refresh even if index contains unmerged entries" msgstr "即使索引区包含未合并的条目也执行刷新" -#: builtin/update-index.c:735 +#: builtin/update-index.c:763 msgid "refresh stat information" msgstr "刷新统计信息" -#: builtin/update-index.c:739 +#: builtin/update-index.c:767 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置" -#: builtin/update-index.c:743 -msgid "<mode> <object> <path>" -msgstr "<mode> <object> <path>" +#: builtin/update-index.c:771 +msgid "<mode>,<object>,<path>" +msgstr "<mode>,<object>,<path>" -#: builtin/update-index.c:744 +#: builtin/update-index.c:772 msgid "add the specified entry to the index" msgstr "添加指定的条目到索引区" -#: builtin/update-index.c:748 +#: builtin/update-index.c:776 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:749 +#: builtin/update-index.c:777 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的可执行位" -#: builtin/update-index.c:753 +#: builtin/update-index.c:781 msgid "mark files as \"not changing\"" msgstr "把文件标记为 \"没有变更\"" -#: builtin/update-index.c:756 +#: builtin/update-index.c:784 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged 位" -#: builtin/update-index.c:759 +#: builtin/update-index.c:787 msgid "mark files as \"index-only\"" msgstr "把文件标记为 \"仅索引\"" -#: builtin/update-index.c:762 +#: builtin/update-index.c:790 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree 位" -#: builtin/update-index.c:765 +#: builtin/update-index.c:793 msgid "add to index only; do not add content to object database" msgstr "只添加到索引区；不添加对象到对象库" -#: builtin/update-index.c:767 +#: builtin/update-index.c:795 msgid "remove named paths even if present in worktree" msgstr "即使存在工作区里，也删除路径" -#: builtin/update-index.c:769 +#: builtin/update-index.c:797 msgid "with --stdin: input lines are terminated by null bytes" msgstr "携带 --stdin：输入的行以 null 字符终止" -#: builtin/update-index.c:771 +#: builtin/update-index.c:799 msgid "read list of paths to be updated from standard input" msgstr "从标准输入中读取需要更新的路径列表" -#: builtin/update-index.c:775 +#: builtin/update-index.c:803 msgid "add entries from standard input to the index" msgstr "从标准输入添加条目到索引区" -#: builtin/update-index.c:779 +#: builtin/update-index.c:807 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "为指定文件重新生成第2和第3暂存区" -#: builtin/update-index.c:783 +#: builtin/update-index.c:811 msgid "only update entries that differ from HEAD" msgstr "只更新与 HEAD 不同的条目" -#: builtin/update-index.c:787 +#: builtin/update-index.c:815 msgid "ignore files missing from worktree" msgstr "忽略工作区丢失的文件" -#: builtin/update-index.c:790 +#: builtin/update-index.c:818 msgid "report actions to standard output" msgstr "在标准输出显示操作" -#: builtin/update-index.c:792 +#: builtin/update-index.c:820 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘记保存的未解决的冲突" -#: builtin/update-index.c:796 +#: builtin/update-index.c:824 msgid "write index in this format" msgstr "以这种格式写入索引区" @@ -9546,19 +9533,19 @@ msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]" msgid "git update-ref [options] --stdin [-z]" msgstr "git update-ref [选项] --stdin [-z]" -#: builtin/update-ref.c:255 +#: builtin/update-ref.c:256 msgid "delete the reference" msgstr "删除引用" -#: builtin/update-ref.c:257 +#: builtin/update-ref.c:258 msgid "update <refname> not the one it points to" msgstr "更新 <引用名> 本身而不是它指向的引用" -#: builtin/update-ref.c:258 +#: builtin/update-ref.c:259 msgid "stdin has NUL-terminated arguments" msgstr "标准输入有以 NUL 字符终止的参数" -#: builtin/update-ref.c:259 +#: builtin/update-ref.c:260 msgid "read updates from stdin" msgstr "从标准输入读取更新" @@ -9615,23 +9602,23 @@ msgstr "" "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n" "'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。" -#: parse-options.h:146 -msgid "expiry date" +#: parse-options.h:143 +msgid "expiry-date" msgstr "逾期日期" -#: parse-options.h:161 +#: parse-options.h:158 msgid "no-op (backward compatibility)" msgstr "空操作（向后兼容）" -#: parse-options.h:235 +#: parse-options.h:232 msgid "be more verbose" msgstr "更加详细" -#: parse-options.h:237 +#: parse-options.h:234 msgid "be more quiet" msgstr "更加安静" -#: parse-options.h:243 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> 位数字显示 SHA-1 哈希值" @@ -9719,17 +9706,17 @@ msgstr "显示工作区状态" msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象" -#: git-am.sh:50 +#: git-am.sh:52 msgid "You need to set your committer info first" msgstr "您需要先设置你的提交者信息" -#: git-am.sh:95 +#: git-am.sh:97 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" -#: git-am.sh:105 +#: git-am.sh:107 #, sh-format msgid "" "When you have resolved this problem, run \"$cmdline --continue\".\n" @@ -9740,19 +9727,19 @@ msgstr "" "如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n" "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" -#: git-am.sh:121 +#: git-am.sh:123 msgid "Cannot fall back to three-way merge." msgstr "无法求助于三路合并。" -#: git-am.sh:137 +#: git-am.sh:139 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "版本库缺乏必要的数据（blob）对象以进行三路合并。" -#: git-am.sh:139 +#: git-am.sh:141 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三路合并的）基础目录树..." -#: git-am.sh:154 +#: git-am.sh:156 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9760,28 +9747,28 @@ msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据（blob）对象上。" -#: git-am.sh:163 +#: git-am.sh:165 msgid "Falling back to patching base and 3-way merge..." msgstr "转而在基础版本上打补丁及进行三路合并..." -#: git-am.sh:179 +#: git-am.sh:181 msgid "Failed to merge in the changes." msgstr "无法合并变更。" -#: git-am.sh:274 +#: git-am.sh:276 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: git-am.sh:361 +#: git-am.sh:363 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "不支持 $patch_format 补丁格式。" -#: git-am.sh:363 +#: git-am.sh:365 msgid "Patch format detection failed." msgstr "补丁格式检测失败。" -#: git-am.sh:389 +#: git-am.sh:392 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -9789,16 +9776,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被删除。\n" "请不要再使用它了。" -#: git-am.sh:479 +#: git-am.sh:486 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "之前的变基目录 $dotest 仍然存在，但却提供了 mbox。" -#: git-am.sh:484 +#: git-am.sh:491 msgid "Please make up your mind. --skip or --abort?" msgstr "请下决心。--skip 或是 --abort ？" -#: git-am.sh:520 +#: git-am.sh:527 #, sh-format msgid "" "Stray $dotest directory found.\n" @@ -9807,16 +9794,16 @@ msgstr "" "发现了错误的 $dotest 目录。\n" "使用 \"git am --abort\" 删除它。" -#: git-am.sh:528 +#: git-am.sh:535 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" -#: git-am.sh:594 +#: git-am.sh:601 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "脏的索引：不能应用补丁（脏文件：$files）" -#: git-am.sh:698 +#: git-am.sh:705 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -9827,15 +9814,15 @@ msgstr "" "如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n" "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" -#: git-am.sh:725 +#: git-am.sh:732 msgid "Patch does not have a valid e-mail address." msgstr "补丁中没有一个有效的邮件地址。" -#: git-am.sh:772 +#: git-am.sh:779 msgid "cannot be interactive without stdin connected to a terminal." msgstr "标准输入没有和终端关联，不能进行交互式操作。" -#: git-am.sh:776 +#: git-am.sh:783 msgid "Commit Body is:" msgstr "提交内容为：" @@ -9843,16 +9830,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:783 +#: git-am.sh:790 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -#: git-am.sh:819 +#: git-am.sh:826 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "正应用：$FIRSTLINE" -#: git-am.sh:840 +#: git-am.sh:847 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9862,22 +9849,22 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: git-am.sh:848 +#: git-am.sh:855 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？" -#: git-am.sh:864 +#: git-am.sh:871 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: git-am.sh:874 +#: git-am.sh:881 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "补丁失败于 $msgnum $FIRSTLINE" -#: git-am.sh:877 +#: git-am.sh:884 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" @@ -9886,7 +9873,7 @@ msgstr "" "失败的补丁文件副本位于：\n" " $dotest/patch" -#: git-am.sh:895 +#: git-am.sh:902 msgid "applying to an empty history" msgstr "正应用到一个空历史上" @@ -9953,8 +9940,6 @@ msgstr "输入坏的版本：$rev" msgid "'git bisect bad' can take only one argument." msgstr "'git bisect bad' 只能带一个参数。" -#. have bad but not good. we could bisect although -#. this is less optimum. #: git-bisect.sh:273 msgid "Warning: bisecting only with a bad commit." msgstr "警告：在仅有一个坏提交下进行二分查找。" @@ -10061,15 +10046,11 @@ msgstr "" msgid "Pull is not possible because you have unmerged files." msgstr "Pull 不可用，因为您尚有未合并的文件。" -#: git-pull.sh:223 +#: git-pull.sh:247 msgid "updating an unborn branch with changes added to the index" msgstr "更新尚未诞生的分支，变更添加至索引" -#. The fetch involved updating the current branch. -#. 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:247 +#: git-pull.sh:271 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -10079,15 +10060,15 @@ msgstr "" "警告：fetch 更新了当前的分支。您的工作区\n" "警告：从原提交 $orig_head 快进。" -#: git-pull.sh:272 +#: git-pull.sh:296 msgid "Cannot merge multiple branches into empty head" msgstr "无法将多个分支合并到空分支" -#: git-pull.sh:276 +#: git-pull.sh:300 msgid "Cannot rebase onto multiple branches" msgstr "无法变基到多个分支" -#: git-rebase.sh:55 +#: git-rebase.sh:57 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" @@ -10098,16 +10079,16 @@ msgstr "" "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n" "要恢复原分支并停止变基，执行 \"git rebase --abort\"。" -#: git-rebase.sh:158 +#: git-rebase.sh:164 msgid "Applied autostash." msgstr "成功应用 autostash。" -#: git-rebase.sh:161 +#: git-rebase.sh:167 #, sh-format msgid "Cannot store $stash_sha1" msgstr "无法保存 $stash_sha1" -#: git-rebase.sh:162 +#: git-rebase.sh:168 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -10117,31 +10098,31 @@ msgstr "" "您的修改安全地保存在 stash 中。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: git-rebase.sh:201 +#: git-rebase.sh:207 msgid "The pre-rebase hook refused to rebase." msgstr "钩子 pre-rebase 拒绝变基操作。" -#: git-rebase.sh:206 +#: git-rebase.sh:212 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" -#: git-rebase.sh:346 +#: git-rebase.sh:350 msgid "The --exec option must be used with the --interactive option" msgstr "选项 --exec 必须和选项 --interactive 同时使用" -#: git-rebase.sh:351 +#: git-rebase.sh:355 msgid "No rebase in progress?" msgstr "没有正在进行的变基？" -#: git-rebase.sh:362 +#: git-rebase.sh:366 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: git-rebase.sh:369 +#: git-rebase.sh:373 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" -#: git-rebase.sh:372 +#: git-rebase.sh:376 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -10149,12 +10130,12 @@ msgstr "" "您必须编辑所有的合并冲突，然后通过 git add\n" "命令将它们标记为已解决" -#: git-rebase.sh:390 +#: git-rebase.sh:394 #, sh-format msgid "Could not move back to $head_name" msgstr "无法移回 $head_name" -#: git-rebase.sh:409 +#: git-rebase.sh:413 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -10173,65 +10154,64 @@ msgstr "" "\t$cmd_clear_stale_rebase\n" "然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。" -#: git-rebase.sh:456 +#: git-rebase.sh:464 #, sh-format msgid "invalid upstream $upstream_name" msgstr "无效的上游 $upstream_name" -#: git-rebase.sh:480 +#: git-rebase.sh:488 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 有一个以上的合并基准" -#: git-rebase.sh:483 git-rebase.sh:487 +#: git-rebase.sh:491 git-rebase.sh:495 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 没有合并基准" -#: git-rebase.sh:492 +#: git-rebase.sh:500 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "没有指向一个有效的提交：$onto_name" -#: git-rebase.sh:515 +#: git-rebase.sh:523 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "严重错误：无此分支：$branch_name" -#: git-rebase.sh:548 +#: git-rebase.sh:556 msgid "Cannot autostash" msgstr "无法 autostash" -#: git-rebase.sh:553 +#: git-rebase.sh:561 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "创建了 autostash: $stash_abbrev" -#: git-rebase.sh:557 +#: git-rebase.sh:565 msgid "Please commit or stash them." msgstr "请提交或为它们保存进度。" -#: git-rebase.sh:577 +#: git-rebase.sh:585 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "当前分支 $branch_name 是最新的。" -#: git-rebase.sh:581 +#: git-rebase.sh:589 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "当前分支 $branch_name 是最新的，强制变基。" -#: git-rebase.sh:592 +#: git-rebase.sh:600 #, sh-format msgid "Changes from $mb to $onto:" msgstr "变更从 $mb 到 $onto：" -#. Detach HEAD and reset the tree -#: git-rebase.sh:601 +#: git-rebase.sh:609 msgid "First, rewinding head to replay your work on top of it..." msgstr "首先，重置头指针以便在上面重放您的工作..." -#: git-rebase.sh:611 +#: git-rebase.sh:619 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "快进 $branch_name 至 $onto_name。" @@ -10352,21 +10332,21 @@ msgstr "无法还原修改的文件" msgid "Index was not unstashed." msgstr "索引的进度没有被恢复。" -#: git-stash.sh:523 +#: git-stash.sh:529 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" -#: git-stash.sh:524 +#: git-stash.sh:530 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}：不能丢弃进度条目" -#: git-stash.sh:531 +#: git-stash.sh:537 msgid "No branch name specified" msgstr "未指定分支名" -#: git-stash.sh:603 +#: git-stash.sh:609 msgid "(To restore them type \"git stash apply\")" msgstr "（为恢复数据输入 \"git stash apply\"）" @@ -10380,31 +10360,31 @@ msgstr "无法从 url '$remoteurl' 剥离一个组件" msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射" -#: git-submodule.sh:281 +#: git-submodule.sh:287 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" -#: git-submodule.sh:293 +#: git-submodule.sh:299 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反" -#: git-submodule.sh:403 +#: git-submodule.sh:409 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "只能在工作区的顶级目录中使用相对路径" -#: git-submodule.sh:413 +#: git-submodule.sh:419 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:430 +#: git-submodule.sh:436 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:434 +#: git-submodule.sh:440 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -10415,134 +10395,134 @@ msgstr "" "$sm_path\n" "如果您确实想添加它，使用 -f 参数。" -#: git-submodule.sh:452 +#: git-submodule.sh:458 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存版本库到索引" -#: git-submodule.sh:454 +#: git-submodule.sh:460 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库" -#: git-submodule.sh:462 +#: git-submodule.sh:468 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程版本库：" -#: git-submodule.sh:464 +#: git-submodule.sh:470 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "如果您想重用此本地 git 目录而不是重新克隆自" -#: git-submodule.sh:466 +#: git-submodule.sh:472 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库" -#: git-submodule.sh:467 +#: git-submodule.sh:473 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。" -#: git-submodule.sh:469 +#: git-submodule.sh:475 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "激活本地 git 目录到子模组 '$sm_name'。" -#: git-submodule.sh:481 +#: git-submodule.sh:487 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:486 +#: git-submodule.sh:492 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:495 +#: git-submodule.sh:501 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:539 +#: git-submodule.sh:545 #, sh-format msgid "Entering '$prefix$displaypath'" msgstr "正在进入 '$prefix$displaypath'" -#: git-submodule.sh:559 +#: git-submodule.sh:565 #, sh-format msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "停止于 '$prefix$displaypath'，脚本返回非零值。" -#: git-submodule.sh:605 +#: git-submodule.sh:611 #, sh-format msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url" -#: git-submodule.sh:614 +#: git-submodule.sh:620 #, sh-format msgid "Failed to register url for submodule path '$displaypath'" msgstr "无法为子模组路径 '$displaypath' 注册 url" -#: git-submodule.sh:616 +#: git-submodule.sh:622 #, sh-format msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" -#: git-submodule.sh:633 +#: git-submodule.sh:639 #, sh-format msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "无法为子模组路径 '$displaypath' 注册更新模式" -#: git-submodule.sh:671 +#: git-submodule.sh:677 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化" -#: git-submodule.sh:688 +#: git-submodule.sh:694 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录" -#: git-submodule.sh:689 +#: git-submodule.sh:695 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" -#: git-submodule.sh:695 +#: git-submodule.sh:701 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们" -#: git-submodule.sh:698 +#: git-submodule.sh:704 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "已清除目录 '$displaypath'" -#: git-submodule.sh:699 +#: git-submodule.sh:705 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "无法移除子模组工作区 '$displaypath'" -#: git-submodule.sh:702 +#: git-submodule.sh:708 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "不能创建空的子模组目录 '$displaypath'" -#: git-submodule.sh:711 +#: git-submodule.sh:717 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" -#: git-submodule.sh:834 +#: git-submodule.sh:833 #, sh-format msgid "" "Submodule path '$displaypath' not initialized\n" @@ -10551,109 +10531,217 @@ msgstr "" "子模组路径 '$displaypath' 没有初始化\n" "也许您想用 'update --init'？" -#: git-submodule.sh:847 +#: git-submodule.sh:846 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" -#: git-submodule.sh:856 +#: git-submodule.sh:855 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:880 +#: git-submodule.sh:879 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中获取" +#: git-submodule.sh:893 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" +msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" + #: git-submodule.sh:894 #, sh-format +msgid "Submodule path '$displaypath': checked out '$sha1'" +msgstr "子模组路径 '$displaypath'：检出 '$sha1'" + +#: git-submodule.sh:898 +#, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" -#: git-submodule.sh:895 +#: git-submodule.sh:899 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模组路径 '$displaypath'：变基至 '$sha1'" -#: git-submodule.sh:900 +#: git-submodule.sh:904 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" -#: git-submodule.sh:901 +#: git-submodule.sh:905 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'" -#: git-submodule.sh:906 +#: git-submodule.sh:910 #, sh-format msgid "" "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败" -#: git-submodule.sh:907 +#: git-submodule.sh:911 #, sh-format msgid "Submodule path '$prefix$sm_path': '$command $sha1'" msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'" -#: git-submodule.sh:912 -#, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" -msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" - -#: git-submodule.sh:913 -#, sh-format -msgid "Submodule path '$displaypath': checked out '$sha1'" -msgstr "子模组路径 '$displaypath'：检出 '$sha1'" - -#: git-submodule.sh:940 +#: git-submodule.sh:941 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "无法递归进子模组路径 '$displaypath'" -#: git-submodule.sh:1048 +#: git-submodule.sh:1049 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached 不能和选项 --files 同时使用" -#. unexpected type -#: git-submodule.sh:1096 +#: git-submodule.sh:1097 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:1116 +#: git-submodule.sh:1117 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 警告：$display_name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:1119 +#: git-submodule.sh:1120 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:1122 +#: git-submodule.sh:1123 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst" -#: git-submodule.sh:1147 +#: git-submodule.sh:1148 msgid "blob" msgstr "数据对象" -#: git-submodule.sh:1261 +#: git-submodule.sh:1262 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "无法递归进子模组路径 '$sm_path'" -#: git-submodule.sh:1325 +#: git-submodule.sh:1326 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "为 '$displaypath' 同步子模组 url" +#~ msgid "key id" +#~ msgstr "key id" + +#~ msgid "Tracking not set up: name too long: %s" +#~ msgstr "跟踪未设置：名字太长：%s" + +#~ msgid "bug" +#~ msgstr "bug" + +# 译者：注意保持句尾空格 +#~ msgid "ahead " +#~ msgstr "领先 " + +# 译者：注意保持句尾空格 +#~ msgid ", behind " +#~ msgstr "，落后 " + +#~ msgid "could not find .gitmodules in index" +#~ msgstr "无法在索引中找到 .gitmodules" + +#~ msgid "reading updated .gitmodules failed" +#~ msgstr "读取更新后的 .gitmodules 失败" + +#~ msgid "unable to stat updated .gitmodules" +#~ msgstr "不能枚举更新后的 .gitmodules" + +#~ msgid "unable to remove .gitmodules from index" +#~ msgstr "不能从索引中移除 .gitmodules" + +#~ msgid "adding updated .gitmodules failed" +#~ msgstr "添加更新后的 .gitmodules 失败" + +# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短 +#~ msgid "" +#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n" +#~ "subdirectory of the tree will change in Git 2.0 and should not be used " +#~ "anymore.\n" +#~ "To add content for the whole tree, run:\n" +#~ "\n" +#~ " git add %s :/\n" +#~ " (or git add %s :/)\n" +#~ "\n" +#~ "To restrict the command to the current directory, run:\n" +#~ "\n" +#~ " git add %s .\n" +#~ " (or git add %s .)\n" +#~ "\n" +#~ "With the current Git version, the command is restricted to the current " +#~ "directory.\n" +#~ msgstr "" +#~ "在 Git 2.0 版本，位于一个子目录下不带任何路径参数地执行命令\n" +#~ "'git add %s (或 %s)' 的行为将被改变，不要再继续使用了。\n" +#~ "如果要添加整个目录树的内容，执行：\n" +#~ "\n" +#~ " git add %s :/\n" +#~ " (或 git add %s :/)\n" +#~ "\n" +#~ "如果要限制该命令只作用于当前目录，执行：\n" +#~ "\n" +#~ " git add %s .\n" +#~ " (或 git add %s .)\n" +#~ "\n" +#~ "对于当前版本的 Git，这条命令只作用于当前目录。\n" + +#~ msgid "" +#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" +#~ "whose behaviour will change in Git 2.0 with respect to paths you " +#~ "removed.\n" +#~ "Paths like '%s' that are\n" +#~ "removed from your working tree are ignored with this version of Git.\n" +#~ "\n" +#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n" +#~ " ignores paths you removed from your working tree.\n" +#~ "\n" +#~ "* 'git add --all <pathspec>' will let you also record the removals.\n" +#~ "\n" +#~ "Run 'git status' to check the paths you removed from your working tree.\n" +#~ msgstr "" +#~ "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal'，\n" +#~ "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n" +#~ "像本地工作区移除的路径 '%s'\n" +#~ "在此版本的 Git 中被忽略。\n" +#~ "\n" +#~ "* 'git add --ignore-removal <路径规则>'，是当前版本的默认操作，\n" +#~ " 忽略您本地工作区中移除的文件。\n" +#~ "\n" +#~ "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n" +#~ "\n" +#~ "运行 'git status' 来检查您本地工作区中移除的路径。\n" + +#~ msgid "" +#~ "Auto packing the repository for optimum performance. You may also\n" +#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n" +#~ msgstr "" +#~ "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n" +#~ "参见 \"git help gc\" 以获取更多信息。\n" + +#~ msgid "" +#~ "Updates were rejected because a pushed branch tip is behind its remote\n" +#~ "counterpart. If you did not intend to push that branch, you may want to\n" +#~ "specify branches to push or set the 'push.default' configuration " +#~ "variable\n" +#~ "to 'simple', 'current' or 'upstream' to push only the current branch." +#~ msgstr "" +#~ "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n" +#~ "如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n" +#~ "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n" +#~ "以便只推送当前分支。" + # 译者：为保证在输出中对齐，注意调整句中空格！ #~ msgid "copied: %s -> %s" #~ msgstr "拷贝： %s -> %s" @@ -10704,9 +10792,6 @@ msgstr "为 '$displaypath' 同步子模组 url" #~ "（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n" #~ "为保持兼容，请用 'current' 代替 'simple'）" -#~ msgid "done\n" -#~ msgstr "完成\n" - #~ msgid "input paths are terminated by a null character" #~ msgstr "输入路径以null字符终止" @@ -10844,9 +10929,6 @@ msgstr "为 '$displaypath' 同步子模组 url" #~ 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 | <分支>])" @@ -10857,9 +10939,6 @@ msgstr "为 '$displaypath' 同步子模组 url" #~ msgid " (use \"git add\" to track)" #~ msgstr "（使用 \"git add\" 建立跟踪）" -#~ msgid "-B cannot be used with -b" -#~ msgstr "-B 不能和 -b 同时使用" - #~ msgid "--detach cannot be used with -b/-B/--orphan" #~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用" |