diff options
| -rw-r--r-- | po/zh_CN.po | 1259 |
1 files changed, 776 insertions, 483 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index b3e1a54c8e..e6092cd7ef 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: 2012-07-03 10:23+0800\n" -"PO-Revision-Date: 2012-07-04 22:38+0800\n" +"POT-Creation-Date: 2012-07-30 09:18+0800\n" +"PO-Revision-Date: 2012-07-31 06:31+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language: zh_CN\n" @@ -52,7 +52,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:89 builtin/commit.c:696 +#: bundle.c:89 builtin/commit.c:699 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" @@ -62,7 +62,7 @@ msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的提交：" #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 -#: builtin/log.c:721 builtin/log.c:1310 builtin/log.c:1529 builtin/merge.c:347 +#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "版本遍历设置失败" @@ -89,7 +89,7 @@ msgstr[1] "这个包需要 %d 个这些引用" msgid "rev-list died" msgstr "rev-list 终止" -#: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" @@ -261,7 +261,7 @@ msgid_plural ", %d deletions(-)" msgstr[0] "，删除 %d 行(-)" msgstr[1] "，删除 %d 行(-)" -#: diff.c:3478 +#: diff.c:3461 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -297,16 +297,16 @@ msgstr "'%s'：%s" msgid "'%s': short read %s" msgstr "'%s'：读取不完整 %s" -#: help.c:208 +#: help.c:212 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" -#: help.c:215 +#: help.c:219 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" -#: help.c:271 +#: help.c:275 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -315,11 +315,11 @@ msgstr "" "'%s' 像是一个 git 命令，但却无法运行。\n" "可能是 git-%s 受损？" -#: help.c:328 +#: help.c:332 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" -#: help.c:350 +#: help.c:354 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -328,17 +328,17 @@ msgstr "" "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" "是 '%s'" -#: help.c:355 +#: help.c:359 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟后自动运行..." -#: help.c:362 +#: help.c:366 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:366 +#: help.c:370 msgid "" "\n" "Did you mean this?" @@ -352,36 +352,36 @@ msgstr[1] "" "\n" "您指的是这些其中一个么？" -#: parse-options.c:493 +#: parse-options.c:494 msgid "..." msgstr "..." -#: parse-options.c:511 +#: parse-options.c:512 #, c-format msgid "usage: %s" msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:515 +#: parse-options.c:516 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:518 +#: parse-options.c:519 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1629 +#: remote.c:1632 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" -#: remote.c:1635 +#: remote.c:1638 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -389,7 +389,7 @@ msgid_plural "" msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" -#: remote.c:1643 +#: remote.c:1646 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -612,7 +612,7 @@ msgstr "不能解析 HEAD" msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:805 builtin/apply.c:3697 +#: sequencer.c:805 builtin/apply.c:3988 #, c-format msgid "cannot open %s: %s" msgstr "不能打开 %s：%s" @@ -644,21 +644,21 @@ msgstr "不能作为初始提交还原" msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" -#: sha1_name.c:864 +#: sha1_name.c:1044 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" -#: sha1_name.c:867 +#: sha1_name.c:1047 #, c-format msgid "No such branch: '%s'" msgstr "没有此分支：'%s'" -#: sha1_name.c:869 +#: sha1_name.c:1049 #, c-format msgid "No upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: sha1_name.c:872 +#: sha1_name.c:1052 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" @@ -672,379 +672,378 @@ msgstr "无法在 passwd 文件中查询到当前用户：%s" msgid "no such user" msgstr "无此用户" -#: wt-status.c:141 +#: wt-status.c:140 msgid "Unmerged paths:" msgstr "未合并的路径：" # 译者：注意保持前导空格 -#: wt-status.c:168 wt-status.c:195 +#: wt-status.c:167 wt-status.c:194 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）" # 译者：注意保持前导空格 -#: wt-status.c:170 wt-status.c:197 +#: wt-status.c:169 wt-status.c:196 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）" # 译者：注意保持前导空格 -#: wt-status.c:174 +#: wt-status.c:173 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " （使用 \"git add <file>...\" 标记解决方案）" # 译者：注意保持前导空格 -#: wt-status.c:176 wt-status.c:180 +#: wt-status.c:175 wt-status.c:179 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）" # 译者：注意保持前导空格 -#: wt-status.c:178 +#: wt-status.c:177 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <file>...\" 标记解决方案）" -#: wt-status.c:189 +#: wt-status.c:188 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:207 +#: wt-status.c:206 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" # 译者：注意保持前导空格 -#: wt-status.c:211 +#: wt-status.c:210 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " （使用 \"git add <file>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:213 +#: wt-status.c:212 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:214 +#: wt-status.c:213 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）" # 译者：注意保持前导空格 -#: wt-status.c:216 +#: wt-status.c:215 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" -#: wt-status.c:225 +#: wt-status.c:224 #, c-format msgid "%s files:" msgstr "%s文件：" # 译者：注意保持前导空格 -#: wt-status.c:228 +#: wt-status.c:227 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）" -#: wt-status.c:245 +#: wt-status.c:244 msgid "bug" msgstr "bug" -#: wt-status.c:250 +#: wt-status.c:249 msgid "both deleted:" msgstr "双方删除：" -#: wt-status.c:251 +#: wt-status.c:250 msgid "added by us:" msgstr "由我们添加：" -#: wt-status.c:252 +#: wt-status.c:251 msgid "deleted by them:" msgstr "由他们删除：" -#: wt-status.c:253 +#: wt-status.c:252 msgid "added by them:" msgstr "由他们添加：" -#: wt-status.c:254 +#: wt-status.c:253 msgid "deleted by us:" msgstr "由我们删除：" -#: wt-status.c:255 +#: wt-status.c:254 msgid "both added:" msgstr "双方添加：" -#: wt-status.c:256 +#: wt-status.c:255 msgid "both modified:" msgstr "双方修改：" # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:286 +#: wt-status.c:285 msgid "new commits, " msgstr "新提交, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:288 +#: wt-status.c:287 msgid "modified content, " msgstr "修改的内容, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:290 +#: wt-status.c:289 msgid "untracked content, " msgstr "未跟踪的内容, " # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:304 +#: wt-status.c:303 #, c-format msgid "new file: %s" msgstr "新文件： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:307 +#: wt-status.c:306 #, c-format msgid "copied: %s -> %s" msgstr "拷贝： %s -> %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:310 +#: wt-status.c:309 #, c-format msgid "deleted: %s" msgstr "删除： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:313 +#: wt-status.c:312 #, c-format msgid "modified: %s" msgstr "修改： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:316 +#: wt-status.c:315 #, c-format msgid "renamed: %s -> %s" msgstr "重命名： %s -> %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:319 +#: wt-status.c:318 #, c-format msgid "typechange: %s" msgstr "类型变更： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:322 +#: wt-status.c:321 #, c-format msgid "unknown: %s" msgstr "未知： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:325 +#: wt-status.c:324 #, c-format msgid "unmerged: %s" msgstr "未合并： %s" -#: wt-status.c:328 +#: wt-status.c:327 #, c-format msgid "bug: unhandled diff status %c" msgstr "bug：未处理的差异状态 %c" -#: wt-status.c:786 +#: wt-status.c:785 msgid "You have unmerged paths." msgstr "您有路径尚未合并。" # 译者：注意保持前导空格 -#: wt-status.c:789 wt-status.c:913 +#: wt-status.c:788 wt-status.c:912 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" -#: wt-status.c:792 +#: wt-status.c:791 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:795 +#: wt-status.c:794 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:805 +#: wt-status.c:804 msgid "You are in the middle of an am session." msgstr "您正处于一个 am 过程中。" -#: wt-status.c:808 +#: wt-status.c:807 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:812 +#: wt-status.c:811 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr " （解决冲突，然后运行 \"git am --resolved\"）" # 译者：注意保持前导空格 -#: wt-status.c:814 +#: wt-status.c:813 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:816 +#: wt-status.c:815 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:874 wt-status.c:884 +#: wt-status.c:873 wt-status.c:883 msgid "You are currently rebasing." msgstr "您正在变基。" # 译者：注意保持前导空格 -#: wt-status.c:877 +#: wt-status.c:876 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:879 +#: wt-status.c:878 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:881 +#: wt-status.c:880 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:887 +#: wt-status.c:886 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:889 +#: wt-status.c:888 msgid "You are currently splitting a commit during a rebase." msgstr "您正在变基过程中拆分一个提交。" # 译者：注意保持前导空格 -#: wt-status.c:892 +#: wt-status.c:891 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:894 +#: wt-status.c:893 msgid "You are currently editing a commit during a rebase." msgstr "您正在变基过程中编辑一个提交。" # 译者：注意保持前导空格 -#: wt-status.c:897 +#: wt-status.c:896 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:899 +#: wt-status.c:898 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" -msgstr "" -" （执行 \"git rebase --continue\" 一旦您满意您的修改）" +msgstr " （执行 \"git rebase --continue\" 一旦您满意您的修改）" -#: wt-status.c:909 +#: wt-status.c:908 msgid "You are currently cherry-picking." msgstr "您正在做拣选操作。" # 译者：注意保持前导空格 -#: wt-status.c:916 +#: wt-status.c:915 msgid " (all conflicts fixed: run \"git commit\")" msgstr " （解决所有冲突后，执行 \"git commit\"）" -#: wt-status.c:925 +#: wt-status.c:924 msgid "You are currently bisecting." msgstr "您正在做二分查找。" # 译者：注意保持前导空格 -#: wt-status.c:928 +#: wt-status.c:927 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:979 +#: wt-status.c:978 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:986 +#: wt-status.c:985 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:998 +#: wt-status.c:997 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1012 +#: wt-status.c:1011 msgid "Untracked" msgstr "未跟踪的" -#: wt-status.c:1014 +#: wt-status.c:1013 msgid "Ignored" msgstr "忽略的" -#: wt-status.c:1016 +#: wt-status.c:1015 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1018 +#: wt-status.c:1017 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1024 +#: wt-status.c:1023 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1028 +#: wt-status.c:1027 #, c-format msgid "no changes added to commit%s\n" msgstr "修改尚未加入提交%s\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1030 +#: wt-status.c:1029 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）" -#: wt-status.c:1032 +#: wt-status.c:1031 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "空提交但存在未跟踪文件%s\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1034 +#: wt-status.c:1033 msgid " (use \"git add\" to track)" msgstr "（使用 \"git add\" 建立跟踪）" -#: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042 +#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041 #, c-format msgid "nothing to commit%s\n" msgstr "无须提交%s\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1037 +#: wt-status.c:1036 msgid " (create/copy files and use \"git add\" to track)" msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1040 +#: wt-status.c:1039 msgid " (use -u to show untracked files)" msgstr "（使用 -u 显示未跟踪文件）" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1043 +#: wt-status.c:1042 msgid " (working directory clean)" msgstr "（干净的工作区）" -#: wt-status.c:1151 +#: wt-status.c:1150 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" # 译者：注意保持句尾空格 -#: wt-status.c:1157 +#: wt-status.c:1156 msgid "Initial commit on " msgstr "初始提交于 " # 译者：注意保持句尾空格 -#: wt-status.c:1172 +#: wt-status.c:1171 msgid "behind " msgstr "落后 " # 译者：注意保持句尾空格 -#: wt-status.c:1175 wt-status.c:1178 +#: wt-status.c:1174 wt-status.c:1177 msgid "ahead " msgstr "领先 " # 译者：注意保持句尾空格 -#: wt-status.c:1180 +#: wt-status.c:1179 msgid ", behind " msgstr "，落后 " @@ -1053,7 +1052,7 @@ msgstr "，落后 " msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:67 builtin/commit.c:226 +#: builtin/add.c:67 builtin/commit.c:229 msgid "updating files failed" msgstr "更新文件失败" @@ -1143,75 +1142,75 @@ msgstr "没有指定文件，也没有文件被添加。\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 #: builtin/rm.c:162 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: builtin/apply.c:53 +#: builtin/apply.c:57 msgid "git apply [options] [<patch>...]" msgstr "git apply [选项] [<补丁>...]" -#: builtin/apply.c:106 +#: builtin/apply.c:110 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" -#: builtin/apply.c:121 +#: builtin/apply.c:125 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: builtin/apply.c:815 +#: builtin/apply.c:824 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" -#: builtin/apply.c:824 +#: builtin/apply.c:833 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" -#: builtin/apply.c:905 +#: builtin/apply.c:914 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" -#: builtin/apply.c:937 +#: builtin/apply.c:946 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply：错误的 git-diff - 期望 /dev/null，但在第 %2$d 行得到 %1$s" -#: builtin/apply.c:941 +#: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" -#: builtin/apply.c:942 +#: builtin/apply.c:951 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" -#: builtin/apply.c:949 +#: builtin/apply.c:958 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：错误的 git-diff - 期望 /dev/null 于第 %d 行" -#: builtin/apply.c:1394 +#: builtin/apply.c:1403 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: builtin/apply.c:1451 +#: builtin/apply.c:1460 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" -#: builtin/apply.c:1468 +#: builtin/apply.c:1477 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1222,82 +1221,82 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: builtin/apply.c:1628 +#: builtin/apply.c:1637 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: builtin/apply.c:1630 +#: builtin/apply.c:1639 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: builtin/apply.c:1656 +#: builtin/apply.c:1665 #, c-format msgid "corrupt patch at line %d" msgstr "补丁损坏位于第 %d 行" -#: builtin/apply.c:1692 +#: builtin/apply.c:1701 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: builtin/apply.c:1694 +#: builtin/apply.c:1703 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: builtin/apply.c:1697 +#: builtin/apply.c:1706 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: builtin/apply.c:1843 +#: builtin/apply.c:1852 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1872 +#: builtin/apply.c:1881 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: builtin/apply.c:1958 +#: builtin/apply.c:1967 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: builtin/apply.c:2048 +#: builtin/apply.c:2057 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: builtin/apply.c:2052 +#: builtin/apply.c:2061 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: builtin/apply.c:2123 +#: builtin/apply.c:2132 msgid "oops" msgstr "哎哟" -#: builtin/apply.c:2645 +#: builtin/apply.c:2654 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: builtin/apply.c:2763 +#: builtin/apply.c:2772 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行）" msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行）" -#: builtin/apply.c:2775 +#: builtin/apply.c:2784 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: builtin/apply.c:2781 +#: builtin/apply.c:2790 #, c-format msgid "" "while searching for:\n" @@ -1306,313 +1305,321 @@ msgstr "" "当查询：\n" "%.*s" -#: builtin/apply.c:2800 +#: builtin/apply.c:2809 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: builtin/apply.c:2903 +#: builtin/apply.c:2912 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: builtin/apply.c:2909 +#: builtin/apply.c:2918 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（预期 %s，得到 %s）" -#: builtin/apply.c:2930 +#: builtin/apply.c:2939 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: builtin/apply.c:3045 +#: builtin/apply.c:3061 #, c-format -msgid "patch %s has been renamed/deleted" -msgstr "补丁 %s 已经被重命名/删除" +msgid "cannot checkout %s" +msgstr "不能检出 %s" -#: builtin/apply.c:3052 builtin/apply.c:3069 +#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159 #, c-format msgid "read of %s failed" msgstr "读取 %s 失败" -#: builtin/apply.c:3084 -msgid "removal patch leaves file contents" -msgstr "移除补丁仍留下了文件内容" - -#: builtin/apply.c:3105 +#: builtin/apply.c:3139 builtin/apply.c:3361 #, c-format -msgid "%s: already exists in working directory" -msgstr "%s：已经存在于工作区中" +msgid "path %s has been renamed/deleted" +msgstr "路径 %s 已经被重命名/删除" -#: builtin/apply.c:3143 +#: builtin/apply.c:3220 builtin/apply.c:3375 #, c-format -msgid "%s: has been deleted/renamed" -msgstr "%s：已经被删除/重命名" +msgid "%s: does not exist in index" +msgstr "%s：不存在于索引中" -#: builtin/apply.c:3148 builtin/apply.c:3179 +#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: builtin/apply.c:3159 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s：不存在于索引中" - -#: builtin/apply.c:3173 +#: builtin/apply.c:3229 builtin/apply.c:3383 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: builtin/apply.c:3190 +#: builtin/apply.c:3331 +msgid "removal patch leaves file contents" +msgstr "移除补丁仍留下了文件内容" + +#: builtin/apply.c:3400 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: builtin/apply.c:3192 +#: builtin/apply.c:3402 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，预期是 %o" -#: builtin/apply.c:3247 +#: builtin/apply.c:3503 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: builtin/apply.c:3267 +#: builtin/apply.c:3506 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s：已经存在于工作区中" + +#: builtin/apply.c:3526 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: builtin/apply.c:3272 +#: builtin/apply.c:3531 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配" -#: builtin/apply.c:3280 +#: builtin/apply.c:3539 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: builtin/apply.c:3293 +#: builtin/apply.c:3552 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." -#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158 +#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: builtin/apply.c:3491 +#: builtin/apply.c:3750 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: builtin/apply.c:3518 +#: builtin/apply.c:3778 #, c-format msgid "corrupt patch for subproject %s" msgstr "子项目 %s 损坏的补丁" -#: builtin/apply.c:3522 +#: builtin/apply.c:3782 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能枚举新建文件 '%s' 的状态" -#: builtin/apply.c:3527 +#: builtin/apply.c:3787 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: builtin/apply.c:3530 +#: builtin/apply.c:3790 builtin/apply.c:3898 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: builtin/apply.c:3563 +#: builtin/apply.c:3823 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: builtin/apply.c:3612 +#: builtin/apply.c:3872 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: builtin/apply.c:3668 +#: builtin/apply.c:3959 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: builtin/apply.c:3676 +#: builtin/apply.c:3967 msgid "internal error" msgstr "内部错误" #. Say this even without --verbose -#: builtin/apply.c:3679 +#: builtin/apply.c:3970 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..." msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..." -#: builtin/apply.c:3689 +#: builtin/apply.c:3980 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: builtin/apply.c:3710 +#: builtin/apply.c:4001 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: builtin/apply.c:3713 +#: builtin/apply.c:4004 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: builtin/apply.c:3844 +#: builtin/apply.c:4154 msgid "unrecognized input" msgstr "未能识别的输入" -#: builtin/apply.c:3855 +#: builtin/apply.c:4165 msgid "unable to read index file" msgstr "无法读取索引文件" -#: builtin/apply.c:3970 builtin/apply.c:3973 +#: builtin/apply.c:4284 builtin/apply.c:4287 msgid "path" msgstr "路径" -#: builtin/apply.c:3971 +#: builtin/apply.c:4285 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: builtin/apply.c:3974 +#: builtin/apply.c:4288 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: builtin/apply.c:3976 +#: builtin/apply.c:4290 msgid "num" msgstr "数字" -#: builtin/apply.c:3977 +#: builtin/apply.c:4291 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除 <数字> 个前导路径" -#: builtin/apply.c:3980 +#: builtin/apply.c:4294 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: builtin/apply.c:3982 +#: builtin/apply.c:4296 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: builtin/apply.c:3986 +#: builtin/apply.c:4300 msgid "shows number of added and deleted lines in decimal notation" msgstr "以数字方式显示添加或删除行的数量" -#: builtin/apply.c:3988 +#: builtin/apply.c:4302 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: builtin/apply.c:3990 +#: builtin/apply.c:4304 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: builtin/apply.c:3992 +#: builtin/apply.c:4306 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: builtin/apply.c:3994 +#: builtin/apply.c:4308 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: builtin/apply.c:3996 +#: builtin/apply.c:4310 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "同时应用此补丁（和 --stat/--summary/--check 共用）" -#: builtin/apply.c:3998 +#: builtin/apply.c:4312 +msgid "attempt three-way merge if a patch does not apply" +msgstr "如果一个补丁不能应用则尝试三路合并" + +#: builtin/apply.c:4314 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: builtin/apply.c:4000 +#: builtin/apply.c:4316 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: builtin/apply.c:4003 +#: builtin/apply.c:4319 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: builtin/apply.c:4004 +#: builtin/apply.c:4320 msgid "action" msgstr "动作" -#: builtin/apply.c:4005 +#: builtin/apply.c:4321 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: builtin/apply.c:4008 builtin/apply.c:4011 +#: builtin/apply.c:4324 builtin/apply.c:4327 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: builtin/apply.c:4014 +#: builtin/apply.c:4330 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: builtin/apply.c:4016 +#: builtin/apply.c:4332 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: builtin/apply.c:4018 +#: builtin/apply.c:4334 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: builtin/apply.c:4020 +#: builtin/apply.c:4336 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: builtin/apply.c:4021 +#: builtin/apply.c:4337 msgid "be verbose" msgstr "冗长输出" -#: builtin/apply.c:4023 +#: builtin/apply.c:4339 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "宽容不正确的文件末尾换行符" -#: builtin/apply.c:4026 +#: builtin/apply.c:4342 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: builtin/apply.c:4028 +#: builtin/apply.c:4344 msgid "root" msgstr "根目录" -#: builtin/apply.c:4029 +#: builtin/apply.c:4345 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: builtin/apply.c:4050 +#: builtin/apply.c:4367 +msgid "--3way outside a repository" +msgstr "--3way 在一个版本库之外" + +#: builtin/apply.c:4375 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" -#: builtin/apply.c:4053 +#: builtin/apply.c:4378 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" -#: builtin/apply.c:4069 +#: builtin/apply.c:4394 #, c-format msgid "can't open patch '%s'" msgstr "不能打开补丁 '%s'" -#: builtin/apply.c:4083 +#: builtin/apply.c:4408 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: builtin/apply.c:4089 builtin/apply.c:4099 +#: builtin/apply.c:4414 builtin/apply.c:4424 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1819,7 +1826,7 @@ msgstr "不能写分支描述模版：%s" msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:788 builtin/clone.c:558 +#: builtin/branch.c:788 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" @@ -1844,100 +1851,100 @@ msgstr "需要一个版本库来创建包。" msgid "Need a repository to unbundle." msgstr "需要一个版本库来解包。" -#: builtin/checkout.c:113 builtin/checkout.c:146 +#: builtin/checkout.c:114 builtin/checkout.c:147 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" -#: builtin/checkout.c:115 builtin/checkout.c:148 +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" -#: builtin/checkout.c:131 +#: builtin/checkout.c:132 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必须的版本" -#: builtin/checkout.c:175 +#: builtin/checkout.c:176 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必须的版本" -#: builtin/checkout.c:192 +#: builtin/checkout.c:193 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" -#: builtin/checkout.c:209 +#: builtin/checkout.c:210 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:234 builtin/checkout.c:392 +#: builtin/checkout.c:235 builtin/checkout.c:393 msgid "corrupt index file" msgstr "损坏的索引文件" -#: builtin/checkout.c:264 builtin/checkout.c:271 +#: builtin/checkout.c:265 builtin/checkout.c:272 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 +#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586 #: builtin/merge.c:812 msgid "unable to write new index file" msgstr "无法写新的索引文件" -#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 +#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408 msgid "diff_setup_done failed" msgstr "diff_setup_done 失败" -#: builtin/checkout.c:414 +#: builtin/checkout.c:415 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:533 +#: builtin/checkout.c:534 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "不能对 '%s' 执行 reflog 操作\n" -#: builtin/checkout.c:566 +#: builtin/checkout.c:567 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:573 +#: builtin/checkout.c:574 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:576 +#: builtin/checkout.c:577 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:580 +#: builtin/checkout.c:581 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:582 +#: builtin/checkout.c:583 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:584 +#: builtin/checkout.c:585 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:640 +#: builtin/checkout.c:641 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" #. The singular version -#: builtin/checkout.c:646 +#: builtin/checkout.c:647 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -1958,7 +1965,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:664 +#: builtin/checkout.c:665 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -1973,71 +1980,71 @@ msgstr "" " git branch new_branch_name %s\n" "\n" -#: builtin/checkout.c:694 +#: builtin/checkout.c:695 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:698 +#: builtin/checkout.c:699 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:724 +#: builtin/checkout.c:725 builtin/checkout.c:920 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" #. case (1) -#: builtin/checkout.c:855 +#: builtin/checkout.c:856 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" #. case (1): want a tree -#: builtin/checkout.c:894 +#: builtin/checkout.c:895 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:974 +#: builtin/checkout.c:977 msgid "-B cannot be used with -b" msgstr "-B 不能和 -b 共用" -#: builtin/checkout.c:983 +#: builtin/checkout.c:986 msgid "--patch is incompatible with all other options" msgstr "--patch 选项和其他选项不兼容" -#: builtin/checkout.c:986 +#: builtin/checkout.c:989 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "--detach 不能和 -b/-B/--orphan 共用" -#: builtin/checkout.c:988 +#: builtin/checkout.c:991 msgid "--detach cannot be used with -t" msgstr "--detach 不能和 -t 共用" -#: builtin/checkout.c:994 +#: builtin/checkout.c:997 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1001 +#: builtin/checkout.c:1004 msgid "Missing branch name; try -b" msgstr "缺少分支名；尝试 -b" -#: builtin/checkout.c:1007 +#: builtin/checkout.c:1010 msgid "--orphan and -b|-B are mutually exclusive" msgstr "--orphan 和 -b|-B 互斥" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1012 msgid "--orphan cannot be used with -t" msgstr "--orphan 不能和 -t 共用" -#: builtin/checkout.c:1019 +#: builtin/checkout.c:1022 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout：-f 和 -m 不兼容" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1056 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1061 +#: builtin/checkout.c:1064 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" @@ -2046,26 +2053,26 @@ msgstr "" "git checkout：更新路径和切换分支不兼容。\n" "您是想要检出 '%s' 但未能将其解析为提交么？" -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1066 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "git checkout：更新路径和切换分支不兼容。" -#: builtin/checkout.c:1068 +#: builtin/checkout.c:1071 msgid "git checkout: --detach does not take a path argument" msgstr "git checkout：--detach 不跟路径参数" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1074 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。" -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1093 msgid "Cannot switch branch to a non-commit." msgstr "无法切换分支到一个非提交。" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1096 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs 和切换分支不兼容。" @@ -2161,78 +2168,78 @@ msgstr "无法拷贝文件至 '%s'" msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:440 +#: builtin/clone.c:443 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:549 +#: builtin/clone.c:552 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:639 +#: builtin/clone.c:642 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:643 +#: builtin/clone.c:646 msgid "You must specify a repository to clone." msgstr "您必须指定一个版本库来克隆。" -#: builtin/clone.c:654 +#: builtin/clone.c:657 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:668 +#: builtin/clone.c:671 #, c-format msgid "repository '%s' does not exist" msgstr "版本库 '%s' 不存在" -#: builtin/clone.c:673 +#: builtin/clone.c:676 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" -#: builtin/clone.c:683 +#: builtin/clone.c:686 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:693 +#: builtin/clone.c:696 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:706 builtin/clone.c:720 +#: builtin/clone.c:709 builtin/clone.c:723 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:709 +#: builtin/clone.c:712 #, c-format msgid "could not create work tree dir '%s'." msgstr "不能为 '%s' 创建工作区目录。" -#: builtin/clone.c:728 +#: builtin/clone.c:731 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到裸版本库 '%s'...\n" -#: builtin/clone.c:730 +#: builtin/clone.c:733 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:786 +#: builtin/clone.c:789 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" -#: builtin/clone.c:835 +#: builtin/clone.c:838 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:842 +#: builtin/clone.c:845 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" @@ -2288,93 +2295,93 @@ msgstr "" "\n" "否则，请使用命令 'git reset'\n" -#: builtin/commit.c:253 +#: builtin/commit.c:256 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" -#: builtin/commit.c:295 +#: builtin/commit.c:298 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:301 +#: builtin/commit.c:304 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405 +#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:386 +#: builtin/commit.c:389 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:388 +#: builtin/commit.c:391 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:398 +#: builtin/commit.c:401 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:418 +#: builtin/commit.c:421 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:493 builtin/commit.c:499 +#: builtin/commit.c:496 builtin/commit.c:502 #, c-format msgid "invalid commit: %s" msgstr "无效的提交：%s" -#: builtin/commit.c:522 +#: builtin/commit.c:525 msgid "malformed --author parameter" msgstr "非法的 --author 参数" -#: builtin/commit.c:582 +#: builtin/commit.c:585 #, c-format msgid "Malformed ident string: '%s'" msgstr "非法的身份字符串：'%s'" -#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967 +#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:632 builtin/shortlog.c:296 +#: builtin/commit.c:635 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:634 +#: builtin/commit.c:637 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:638 +#: builtin/commit.c:641 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:644 +#: builtin/commit.c:647 msgid "commit has empty message" msgstr "提交说明为空" -#: builtin/commit.c:660 +#: builtin/commit.c:663 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:664 +#: builtin/commit.c:667 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:668 +#: builtin/commit.c:671 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: builtin/commit.c:720 +#: builtin/commit.c:723 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:731 +#: builtin/commit.c:734 #, c-format msgid "" "\n" @@ -2388,7 +2395,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:736 +#: builtin/commit.c:739 #, c-format msgid "" "\n" @@ -2402,7 +2409,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:748 +#: builtin/commit.c:751 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" @@ -2410,7 +2417,7 @@ msgstr "" "请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:753 +#: builtin/commit.c:756 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" @@ -2420,160 +2427,160 @@ msgstr "" "如果您想这样做的话。而一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:766 +#: builtin/commit.c:769 #, c-format msgid "%sAuthor: %s" msgstr "%s作者： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:773 +#: builtin/commit.c:776 #, c-format msgid "%sCommitter: %s" msgstr "%s提交者： %s" -#: builtin/commit.c:793 +#: builtin/commit.c:796 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:830 +#: builtin/commit.c:833 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:845 builtin/tag.c:361 +#: builtin/commit.c:848 builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或者 -F 选项提供提交说明。\n" -#: builtin/commit.c:942 +#: builtin/commit.c:945 #, c-format msgid "No existing author found with '%s'" msgstr "没有找到匹配 '%s' 的作者" -#: builtin/commit.c:957 builtin/commit.c:1157 +#: builtin/commit.c:960 builtin/commit.c:1160 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:997 +#: builtin/commit.c:1000 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1008 +#: builtin/commit.c:1011 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1011 +#: builtin/commit.c:1014 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1013 +#: builtin/commit.c:1016 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1016 +#: builtin/commit.c:1019 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能共用" -#: builtin/commit.c:1026 +#: builtin/commit.c:1029 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1028 +#: builtin/commit.c:1031 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。" -#: builtin/commit.c:1036 +#: builtin/commit.c:1039 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。" -#: builtin/commit.c:1053 +#: builtin/commit.c:1056 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1055 +#: builtin/commit.c:1058 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1057 +#: builtin/commit.c:1060 msgid "Clever... amending the last one with dirty index." msgstr "聪明... 在索引不干净下修补最后的提交。" -#: builtin/commit.c:1059 +#: builtin/commit.c:1062 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..." -#: builtin/commit.c:1069 builtin/tag.c:577 +#: builtin/commit.c:1072 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" -#: builtin/commit.c:1074 +#: builtin/commit.c:1077 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项共用没有意义。" -#: builtin/commit.c:1257 +#: builtin/commit.c:1260 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1259 +#: builtin/commit.c:1262 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1300 +#: builtin/commit.c:1303 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:1302 +#: builtin/commit.c:1305 msgid " (root-commit)" msgstr "（根提交）" -#: builtin/commit.c:1446 +#: builtin/commit.c:1449 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1484 builtin/merge.c:509 +#: builtin/commit.c:1487 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "不能为读入打开 '%s'" -#: builtin/commit.c:1491 +#: builtin/commit.c:1494 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1498 +#: builtin/commit.c:1501 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1517 +#: builtin/commit.c:1520 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1531 +#: builtin/commit.c:1534 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1536 +#: builtin/commit.c:1539 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/commit.c:1572 +#: builtin/commit.c:1575 msgid "cannot lock HEAD ref" msgstr "无法锁定 HEAD 引用" -#: builtin/commit.c:1576 +#: builtin/commit.c:1579 msgid "cannot update HEAD ref" msgstr "无法更新 HEAD 引用" -#: builtin/commit.c:1587 +#: builtin/commit.c:1590 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -2944,30 +2951,30 @@ msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" -#: builtin/help.c:63 +#: builtin/help.c:65 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c:91 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c:104 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c:112 +#: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老 (< 22)。" -#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 +#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 #, c-format msgid "failed to exec '%s': %s" msgstr "无法执行 '%s'：%s" -#: builtin/help.c:215 +#: builtin/help.c:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -2976,7 +2983,7 @@ msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<tool>.cmd'。" -#: builtin/help.c:227 +#: builtin/help.c:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -2985,34 +2992,29 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<tool>.path'。" -#: builtin/help.c:291 +#: builtin/help.c:299 msgid "The most commonly used git commands are:" msgstr "最常用的 git 命令有：" -#: builtin/help.c:359 +#: builtin/help.c:367 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:376 +#: builtin/help.c:384 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:384 +#: builtin/help.c:392 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:395 -#, c-format -msgid "'%s': not a documentation directory." -msgstr "'%s'：不是一个文档目录。" - -#: builtin/help.c:436 builtin/help.c:443 +#: builtin/help.c:447 builtin/help.c:454 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:459 +#: builtin/help.c:470 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别名" @@ -3086,176 +3088,176 @@ msgstr "delta 基准偏移越界" msgid "unknown object type %d" msgstr "未知对象类型 %d" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:530 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: builtin/index-pack.c:533 +#: builtin/index-pack.c:532 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "包文件过早结束，缺少 %lu 字节" msgstr[1] "包文件过早结束，缺少 %lu 字节" -#: builtin/index-pack.c:555 +#: builtin/index-pack.c:558 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" -#: builtin/index-pack.c:646 builtin/index-pack.c:652 builtin/index-pack.c:675 -#: builtin/index-pack.c:709 builtin/index-pack.c:718 +#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678 +#: builtin/index-pack.c:712 builtin/index-pack.c:721 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:649 builtin/pack-objects.c:170 +#: builtin/index-pack.c:652 builtin/pack-objects.c:170 #: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "不能读 %s" -#: builtin/index-pack.c:715 +#: builtin/index-pack.c:718 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" -#: builtin/index-pack.c:729 +#: builtin/index-pack.c:732 #, c-format msgid "invalid blob object %s" msgstr "无效的 blob 对象 %s" -#: builtin/index-pack.c:744 +#: builtin/index-pack.c:747 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/index-pack.c:746 +#: builtin/index-pack.c:749 msgid "Error in object" msgstr "对象中出错" -#: builtin/index-pack.c:748 +#: builtin/index-pack.c:751 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c:818 builtin/index-pack.c:844 +#: builtin/index-pack.c:821 builtin/index-pack.c:847 msgid "failed to apply delta" msgstr "无法应用 delta" -#: builtin/index-pack.c:983 +#: builtin/index-pack.c:986 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:983 +#: builtin/index-pack.c:986 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:1009 +#: builtin/index-pack.c:1012 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c:1014 +#: builtin/index-pack.c:1017 msgid "cannot fstat packfile" msgstr "不能枚举包文件状态" -#: builtin/index-pack.c:1017 +#: builtin/index-pack.c:1020 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:1028 +#: builtin/index-pack.c:1031 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" -#: builtin/index-pack.c:1051 +#: builtin/index-pack.c:1054 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1102 +#: builtin/index-pack.c:1105 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1124 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" -#: builtin/index-pack.c:1146 +#: builtin/index-pack.c:1149 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能缩小附加对象（%d）" -#: builtin/index-pack.c:1225 +#: builtin/index-pack.c:1228 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1252 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1262 +#: builtin/index-pack.c:1265 #, c-format msgid "cannot write keep file '%s'" msgstr "无法写保留文件 '%s'" -#: builtin/index-pack.c:1270 +#: builtin/index-pack.c:1273 #, c-format msgid "cannot close written keep file '%s'" msgstr "无法关闭保留文件 '%s'" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1286 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1294 +#: builtin/index-pack.c:1297 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1395 +#: builtin/index-pack.c:1398 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1397 +#: builtin/index-pack.c:1400 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1444 +#: builtin/index-pack.c:1447 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 个对象" msgstr[1] "非 delta：%d 个对象" -#: builtin/index-pack.c:1451 +#: builtin/index-pack.c:1454 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "链长 = %d: %lu 对象" msgstr[1] "链长 = %d: %lu 对象" -#: builtin/index-pack.c:1478 +#: builtin/index-pack.c:1481 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c:1522 builtin/index-pack.c:1525 -#: builtin/index-pack.c:1537 builtin/index-pack.c:1541 +#: builtin/index-pack.c:1525 builtin/index-pack.c:1528 +#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1555 +#: builtin/index-pack.c:1558 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 共用" -#: builtin/index-pack.c:1559 builtin/index-pack.c:1569 +#: builtin/index-pack.c:1562 builtin/index-pack.c:1572 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1578 +#: builtin/index-pack.c:1581 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包名参数" @@ -3329,22 +3331,22 @@ msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" msgid "insane git directory %s" msgstr "不正常的 git 目录 %s" -#: builtin/init-db.c:322 builtin/init-db.c:325 +#: builtin/init-db.c:323 builtin/init-db.c:326 #, c-format msgid "%s already exists" msgstr "%s 已经存在" -#: builtin/init-db.c:354 +#: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" -#: builtin/init-db.c:357 +#: builtin/init-db.c:358 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" -#: builtin/init-db.c:362 +#: builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "不能创建 git link %s" @@ -3354,39 +3356,39 @@ msgstr "不能创建 git link %s" #. * existing" or "Initialized empty", the second " shared" or #. * "", and the last '%s%s' is the verbatim directory name. #. -#: builtin/init-db.c:419 +#: builtin/init-db.c:420 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git 版本库于 %s%s\n" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Reinitialized existing" msgstr "重新初始化现存的" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Initialized empty" msgstr "初始化空的" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/init-db.c:421 +#: builtin/init-db.c:422 msgid " shared" msgstr "共享" -#: builtin/init-db.c:440 +#: builtin/init-db.c:441 msgid "cannot tell cwd" msgstr "无法获知当前路径" -#: builtin/init-db.c:521 builtin/init-db.c:528 +#: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:532 +#: builtin/init-db.c:533 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -3395,11 +3397,11 @@ msgstr "" "不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-" "dir=<directory>）" -#: builtin/init-db.c:578 +#: builtin/init-db.c:579 msgid "Cannot access current working directory" msgstr "不能访问当前工作目录" -#: builtin/init-db.c:585 +#: builtin/init-db.c:586 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" @@ -3409,95 +3411,95 @@ msgstr "不能访问工作区 '%s'" msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:402 builtin/log.c:490 +#: builtin/log.c:403 builtin/log.c:494 #, c-format msgid "Could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:514 +#: builtin/log.c:518 #, c-format msgid "Unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:603 +#: builtin/log.c:608 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:677 +#: builtin/log.c:682 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:688 +#: builtin/log.c:693 #, c-format msgid "Cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:702 +#: builtin/log.c:707 msgid "Need exactly one range." msgstr "只需要一个范围。" -#: builtin/log.c:710 +#: builtin/log.c:715 msgid "Not a range." msgstr "不是一个范围。" -#: builtin/log.c:787 +#: builtin/log.c:792 msgid "Cover letter needs email format" msgstr "信封需要邮件地址格式" -#: builtin/log.c:860 +#: builtin/log.c:865 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:933 +#: builtin/log.c:938 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1154 +#: builtin/log.c:1160 #, c-format msgid "bogus committer info %s" msgstr "虚假的提交者信息 %s" -#: builtin/log.c:1199 +#: builtin/log.c:1205 msgid "-n and -k are mutually exclusive." msgstr "-n 和 -k 互斥。" -#: builtin/log.c:1201 +#: builtin/log.c:1207 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix 和 -k 互斥。" -#: builtin/log.c:1209 +#: builtin/log.c:1215 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1211 +#: builtin/log.c:1217 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1213 +#: builtin/log.c:1219 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1236 +#: builtin/log.c:1242 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1238 +#: builtin/log.c:1244 #, c-format msgid "Could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/log.c:1391 +#: builtin/log.c:1397 msgid "Failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:1495 +#: builtin/log.c:1501 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n" -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531 #, c-format msgid "Unknown commit %s" msgstr "未知提交 %s" @@ -4594,32 +4596,32 @@ msgstr "重置后撤出暂存区的变更：" msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:297 +#: builtin/reset.c:303 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/reset.c:302 +#: builtin/reset.c:308 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hard,mixed,soft} 不兼容" -#: builtin/reset.c:311 +#: builtin/reset.c:317 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." -msgstr "--mixed 带路径已弃用，代之以 'git reset -- <paths>'。" +msgstr "--mixed 带路径已弃用，而是用 'git reset -- <paths>'。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:313 +#: builtin/reset.c:319 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:325 +#: builtin/reset.c:331 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能对裸版本库进行%s重置" -#: builtin/reset.c:341 +#: builtin/reset.c:347 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" @@ -5016,7 +5018,7 @@ msgstr "解决操作未进行，我们不会继续。" msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "脏的索引：不能应用补丁（脏文件：$files）" -#: git-am.sh:671 +#: git-am.sh:683 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -5027,15 +5029,15 @@ msgstr "" "如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n" "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" -#: git-am.sh:708 +#: git-am.sh:710 msgid "Patch does not have a valid e-mail address." msgstr "补丁中没有一个有效的邮件地址。" -#: git-am.sh:755 +#: git-am.sh:757 msgid "cannot be interactive without stdin connected to a terminal." msgstr "标准输入没有和终端关联，不能进行交互式操作。" -#: git-am.sh:759 +#: git-am.sh:761 msgid "Commit Body is:" msgstr "提交内容为：" @@ -5043,16 +5045,16 @@ msgstr "提交内容为：" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:766 +#: git-am.sh:768 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -#: git-am.sh:802 +#: git-am.sh:804 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "正应用：$FIRSTLINE" -#: git-am.sh:823 +#: git-am.sh:825 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5062,22 +5064,22 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: git-am.sh:831 +#: git-am.sh:833 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？" -#: git-am.sh:847 +#: git-am.sh:849 msgid "No changes -- Patch already applied." msgstr "没有变更 -- 补丁已经应用过。" -#: git-am.sh:857 +#: git-am.sh:859 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "补丁失败于 $msgnum $FIRSTLINE" -#: git-am.sh:873 +#: git-am.sh:880 msgid "applying to an empty history" msgstr "正应用到一个空历史上" @@ -5417,27 +5419,27 @@ msgstr "无法从 url '$remoteurl' 剥离一个组件" msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射" -#: git-submodule.sh:186 +#: git-submodule.sh:189 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" -#: git-submodule.sh:196 +#: git-submodule.sh:201 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反" -#: git-submodule.sh:285 +#: git-submodule.sh:290 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:302 +#: git-submodule.sh:307 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:306 +#: git-submodule.sh:311 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5448,62 +5450,62 @@ msgstr "" "$sm_path\n" "如果您确实想添加它，使用 -f 参数。" -#: git-submodule.sh:317 +#: git-submodule.sh:322 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存版本库到索引" -#: git-submodule.sh:319 +#: git-submodule.sh:324 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库" -#: git-submodule.sh:333 +#: git-submodule.sh:338 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:338 +#: git-submodule.sh:343 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:343 +#: git-submodule.sh:348 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:385 +#: git-submodule.sh:390 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "正在进入 '$prefix$sm_path'" -#: git-submodule.sh:399 +#: git-submodule.sh:404 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "停止于 '$sm_path'，脚本返回非零值。" -#: git-submodule.sh:442 +#: git-submodule.sh:447 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url" -#: git-submodule.sh:451 +#: git-submodule.sh:456 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "无法为子模组路径 '$sm_path' 注册 url" -#: git-submodule.sh:453 +#: git-submodule.sh:458 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册" -#: git-submodule.sh:461 +#: git-submodule.sh:466 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "无法为子模组路径 '$sm_path' 注册更新模式" -#: git-submodule.sh:560 +#: git-submodule.sh:565 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -5512,96 +5514,387 @@ msgstr "" "子模组路径 '$sm_path' 没有初始化\n" "也许您想用 'update --init'？" -#: git-submodule.sh:573 +#: git-submodule.sh:578 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中找到当前版本" -#: git-submodule.sh:592 +#: git-submodule.sh:597 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:606 +#: git-submodule.sh:611 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'" -#: git-submodule.sh:607 +#: git-submodule.sh:612 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "子模组路径 '$sm_path'：变基至 '$sha1'" -#: git-submodule.sh:612 +#: git-submodule.sh:617 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中" -#: git-submodule.sh:613 +#: git-submodule.sh:618 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'" -#: git-submodule.sh:618 +#: git-submodule.sh:623 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'" -#: git-submodule.sh:619 +#: git-submodule.sh:624 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "子模组路径 '$sm_path'：检出 '$sha1'" -#: git-submodule.sh:641 git-submodule.sh:964 +#: git-submodule.sh:646 git-submodule.sh:969 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "无法递归进子模组路径 '$sm_path'" -#: git-submodule.sh:749 +#: git-submodule.sh:754 msgid "--cached cannot be used with --files" msgstr "--cached 不能和 --files 共用" #. unexpected type -#: git-submodule.sh:789 +#: git-submodule.sh:794 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:807 +#: git-submodule.sh:812 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " 警告：$name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:810 +#: git-submodule.sh:815 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " 警告：$name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:813 +#: git-submodule.sh:818 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst" -#: git-submodule.sh:838 +#: git-submodule.sh:843 msgid "blob" msgstr "blob" -#: git-submodule.sh:839 +#: git-submodule.sh:844 msgid "submodule" msgstr "子模组" -#: git-submodule.sh:876 +#: git-submodule.sh:881 msgid "# Submodules changed but not updated:" msgstr "# 子模组已修改但尚未更新：" -#: git-submodule.sh:878 +#: git-submodule.sh:883 msgid "# Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: git-submodule.sh:1022 +#: git-submodule.sh:1027 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "为 '$name' 同步子模组 url" + +#~ msgid "(bad commit)\n" +#~ msgstr "（坏提交）\n" + +#~ msgid "addinfo_cache failed for path '%s'" +#~ msgstr "为路径 '%s' addinfo_cache 失败" + +#~ msgid "error building trees" +#~ msgstr "无法创建树" + +#~ msgid "diff setup failed" +#~ msgstr "diff 设置失败" + +#~ msgid "merge-recursive: disk full?" +#~ msgstr "merge-recursive: 磁盘已满？" + +#~ msgid "failed to create path '%s'%s" +#~ msgstr "无法创建路径 '%s'%s" + +#~ msgid "Removing %s to make room for subdirectory\n" +#~ msgstr "删除 %s 以便为子目录留出空间\n" + +#~ msgid ": perhaps a D/F conflict?" +#~ msgstr "：可能是一个 D/F 冲突？" + +#~ msgid "refusing to lose untracked file at '%s'" +#~ msgstr "拒绝丢失 '%s' 下的未跟踪文件" + +#~ msgid "cannot read object %s '%s'" +#~ msgstr "不能读取对象 %s '%s'" + +#~ msgid "blob expected for %s '%s'" +#~ msgstr "%s '%s' 应为 blob" + +#~ msgid "failed to symlink '%s'" +#~ msgstr "无法创建符号链接 '%s'" + +#~ msgid "do not know what to do with %06o %s '%s'" +#~ msgstr "不知道如何处理 %06o %s '%s'" + +#~ msgid "Failed to execute internal merge" +#~ msgstr "无法执行内部合并" + +#~ msgid "Unable to add %s to database" +#~ msgstr "不能添加 %s 至对象库" + +#~ msgid "unsupported object type in the tree" +#~ msgstr "在树中有不支持的对象类型" + +#~ msgid "" +#~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s " +#~ "left in tree." +#~ msgstr "" +#~ "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s " +#~ "中的版本被保留。" + +#~ msgid "" +#~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s " +#~ "left in tree at %s." +#~ msgstr "" +#~ "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s " +#~ "中的版本保留于 %8$s 中。" + +#~ msgid "rename" +#~ msgstr "重命名" + +#~ msgid "renamed" +#~ msgstr "重命名" + +#~ msgid "%s is a directory in %s adding as %s instead" +#~ msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" + +#~ msgid "" +#~ "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " +#~ "\"%s\"->\"%s\" in \"%s\"%s" +#~ msgstr "" +#~ "冲突（重命名/重命名）：在分支 \"%3$s\" 重命名 \"%1$s\"->\"%2$s\"，在分支 " +#~ "\"%6$s\" 重命名 \"%4$s\"->\"%5$s\"%7$s" + +#~ msgid " (left unresolved)" +#~ msgstr "（留下未解决）" + +#~ 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" + +#~ msgid "Renaming %s to %s and %s to %s instead" +#~ msgstr "而是重命名 %s 至 %s 以及 %s 至 %s" + +#~ msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +#~ msgstr "" +#~ "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" + +#~ msgid "Adding merged %s" +#~ msgstr "添加合并后的 %s" + +#~ msgid "Adding as %s instead" +#~ msgstr "而是以 %s 为名添加" + +#~ msgid "cannot read object %s" +#~ msgstr "不能读取对象 %s" + +#~ msgid "object %s is not a blob" +#~ msgstr "对象 %s 不是一个 blob" + +#~ msgid "modify" +#~ msgstr "修改" + +#~ msgid "modified" +#~ msgstr "修改" + +#~ msgid "content" +#~ msgstr "内容" + +#~ msgid "add/add" +#~ msgstr "添加/添加" + +#~ msgid "Skipped %s (merged same as existing)" +#~ msgstr "略过 %s（已经做过相同合并）" + +#~ msgid "Auto-merging %s" +#~ msgstr "自动合并 %s" + +#~ msgid "CONFLICT (%s): Merge conflict in %s" +#~ msgstr "冲突（%s）：合并冲突于 %s" + +#~ msgid "Removing %s" +#~ msgstr "删除 %s" + +#~ msgid "file/directory" +#~ msgstr "文件/目录" + +#~ msgid "directory/file" +#~ msgstr "目录/文件" + +#~ 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" + +#~ msgid "Adding %s" +#~ msgstr "添加 %s" + +#~ msgid "Fatal merge failure, shouldn't happen." +#~ msgstr "严重的合并错误，不应发生。" + +#~ msgid "Already up-to-date!" +#~ msgstr "已经是最新的！" + +#~ msgid "merging of trees %s and %s failed" +#~ msgstr "无法合并树 %s 和 %s" + +#~ msgid "Unprocessed path??? %s" +#~ msgstr "未处理的路径??? %s" + +#~ msgid "Merging:" +#~ msgstr "合并：" + +#~ msgid "found %u common ancestor(s):" +#~ msgstr "发现 %u 个共同祖先：" + +#~ msgid "merge returned no commit" +#~ msgstr "合并未返回提交" + +#~ msgid "Could not parse object '%s'" +#~ msgstr "不能解析对象 '%s'" + +#~ msgid "Using index info to reconstruct a base tree..." +#~ msgstr "更新索引信息以重建基树..." + +#~ msgid "Failed to merge in the changes." +#~ msgstr "无法合并变更。" + +#~ msgid "" +#~ "The -b option has been a no-op for long time, and\n" +#~ "it will be removed. Please do not use it anymore." +#~ msgstr "" +#~ "参数 -b 已经很长时间不做任何实质操作了，并且将被\n" +#~ "删除。请不要再使用它了。" + +#~ msgid "" +#~ "\n" +#~ "When you have resolved this problem run \"git rebase --continue\".\n" +#~ "If you would prefer to skip this patch, instead run \"git rebase --skip" +#~ "\".\n" +#~ "To check out the original branch and stop rebasing run \"git rebase --" +#~ "abort\".\n" +#~ msgstr "" +#~ "\n" +#~ "当您解决了此问题后，执行 \"git rebase --continue\"。\n" +#~ "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n" +#~ "要恢复原分支并停止变基，执行 \"git rebase --abort\"。\n" + +#~ msgid "The pre-rebase hook refused to rebase." +#~ msgstr "钩子 pre-rebase 拒绝变基。" + +#~ msgid "It looks like git-am is in progress. Cannot rebase." +#~ msgstr "看起来 git-am 正在进行中。无法变基。" + +#~ msgid "The --exec option must be used with the --interactive option" +#~ msgstr "选项 --exec 必须和选项 --interactive 共用" + +#~ msgid "No rebase in progress?" +#~ msgstr "没有正在进行的变基？" + +#~ msgid "Cannot read HEAD" +#~ msgstr "不能读取 HEAD" + +#~ msgid "" +#~ "You must edit all merge conflicts and then\n" +#~ "mark them as resolved using git add" +#~ msgstr "" +#~ "您必须编辑所有的合并冲突，然后通过 git add\n" +#~ "命令将它们标记为已解决" + +#~ msgid "Could not move back to $head_name" +#~ msgstr "无法移回 $head_name" + +#~ msgid "" +#~ "\n" +#~ "It seems that there is already a $state_dir_base directory, and\n" +#~ "I wonder if you are in the middle of another rebase. If that is the\n" +#~ "case, please try\n" +#~ "\tgit rebase (--continue | --abort | --skip)\n" +#~ "If that is not the case, please\n" +#~ "\trm -fr \"$state_dir\"\n" +#~ "and run me again. I am stopping in case you still have something\n" +#~ "valuable there." +#~ msgstr "" +#~ "\n" +#~ "好像已有一个 $state_dir_base 目录，并且我猜您正处于另一个变基过程\n" +#~ "中。如果是这样，请尝试执行\n" +#~ "\tgit rebase (--continue | --abort | --skip)\n" +#~ "如果不是这样，请执行\n" +#~ "\trm -fr \"$state_dir\"\n" +#~ "然后再执行我。我停止以免您在那儿仍有一些重要的数据。" + +#~ msgid "invalid upstream $upstream_name" +#~ msgstr "无效的上游 $upstream_name" + +#~ msgid "$onto_name: there are more than one merge bases" +#~ msgstr "$onto_name: 有一个以上的合并基准" + +#~ msgid "$onto_name: there is no merge base" +#~ msgstr "$onto_name: 没有合并基准" + +#~ msgid "Does not point to a valid commit: $onto_name" +#~ msgstr "没有指向一个有效的提交：$onto_name" + +#~ msgid "fatal: no such branch: $branch_name" +#~ msgstr "严重：无此分支：$branch_name" + +#~ msgid "Please commit or stash them." +#~ msgstr "请提交或为它们保存进度。" + +#~ msgid "Current branch $branch_name is up to date." +#~ msgstr "当前分支 $branch_name 是最新的。" + +#~ msgid "Current branch $branch_name is up to date, rebase forced." +#~ msgstr "当前分支 $branch_name 是最新的，强制变基。" + +#~ msgid "Changes from $mb to $onto:" +#~ msgstr "变更从 $mb 到 $onto：" + +#~ msgid "First, rewinding head to replay your work on top of it..." +#~ msgstr "首先，重置头指针以便在上面重放您的工作..." + +#~ msgid "Fast-forwarded $branch_name to $onto_name." +#~ msgstr "快进 $branch_name 至 $onto_name。" + +#~ msgid "The --cached option cannot be used with the --files option" +#~ msgstr "选项 --cached 不能和选项 --files 共用" + +#~ msgid "BUG: There are unmerged index entries:\n" +#~ msgstr "BUG: 有未合并的索引条目：\n" + +#~ msgid "Bug in merge-recursive.c" +#~ msgstr "在 merge-recursive.c 有 bug" + +#~ msgid "BUG: unexpected number of arguments left to parse" +#~ msgstr "BUG: 参数解析后留下意外数目的参数" + +#~ msgid "BUG: %d %.*s\n" +#~ msgstr "BUG: %d %.*s\n" + +#~ msgid "%s: has been deleted/renamed" +#~ msgstr "%s：已经被删除/重命名" + +#~ msgid "'%s': not a documentation directory." +#~ msgstr "'%s'：不是一个文档目录。" |