msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2012-08-06 23:47+0800\n"
-"PO-Revision-Date: 2012-08-07 01:07+0800\n"
+"POT-Creation-Date: 2012-09-05 06:20+0800\n"
+"PO-Revision-Date: 2012-09-07 17:56+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
"Language: zh_CN\n"
msgstr "版本库缺少这些必备的提交："
#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
-#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347
+#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
msgid "rev-list died"
msgstr "rev-list 终止"
-#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284
+#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:1400
+#: diff.c:1401
msgid " 0 files changed"
msgstr " 0 个文件被修改"
-#: diff.c:1404
+#: diff.c:1405
#, c-format
msgid " %d file changed"
msgid_plural " %d files changed"
msgstr[0] " %d 个文件被修改"
msgstr[1] " %d 个文件被修改"
-#: diff.c:1421
+#: diff.c:1422
#, c-format
msgid ", %d insertion(+)"
msgid_plural ", %d insertions(+)"
msgstr[0] "，插入 %d 行(+)"
msgstr[1] "，插入 %d 行(+)"
-#: diff.c:1432
+#: diff.c:1433
#, c-format
msgid ", %d deletion(-)"
msgid_plural ", %d deletions(-)"
msgstr[0] "，删除 %d 行(-)"
msgstr[1] "，删除 %d 行(-)"
-#: diff.c:3461
+#: diff.c:3460
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
msgid "error building trees"
msgstr "无法创建树"
-#: merge-recursive.c:497
-msgid "diff setup failed"
-msgstr "diff 设置失败"
-
-#: merge-recursive.c:627
-msgid "merge-recursive: disk full?"
-msgstr "merge-recursive：磁盘已满？"
-
-#: merge-recursive.c:690
+#: merge-recursive.c:672
#, c-format
msgid "failed to create path '%s'%s"
msgstr "无法创建路径 '%s'%s"
-#: merge-recursive.c:701
+#: merge-recursive.c:683
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"
#. something else exists
#. .. but not some other error (who really cares what?)
-#: merge-recursive.c:715 merge-recursive.c:736
+#: merge-recursive.c:697 merge-recursive.c:718
msgid ": perhaps a D/F conflict?"
msgstr "：可能是一个目录/文件冲突？"
-#: merge-recursive.c:726
+#: merge-recursive.c:708
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
-#: merge-recursive.c:766
+#: merge-recursive.c:748
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"
-#: merge-recursive.c:768
+#: merge-recursive.c:750
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为二进制对象（blob）"
-#: merge-recursive.c:791 builtin/clone.c:302
+#: merge-recursive.c:773 builtin/clone.c:302
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
-#: merge-recursive.c:799
+#: merge-recursive.c:781
#, c-format
msgid "failed to symlink '%s'"
msgstr "无法创建符号链接 '%s'"
-#: merge-recursive.c:802
+#: merge-recursive.c:784
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
-#: merge-recursive.c:939
+#: merge-recursive.c:921
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
-#: merge-recursive.c:943
+#: merge-recursive.c:925
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
-#: merge-recursive.c:959
+#: merge-recursive.c:941
msgid "unsupported object type in the tree"
msgstr "在树中有不支持的对象类型"
-#: merge-recursive.c:1038 merge-recursive.c:1052
+#: merge-recursive.c:1020 merge-recursive.c:1034
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
"的版本被保留。"
-#: merge-recursive.c:1044 merge-recursive.c:1057
+#: merge-recursive.c:1026 merge-recursive.c:1039
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
"的版本保留于 %8$s 中。"
-#: merge-recursive.c:1098
+#: merge-recursive.c:1080
msgid "rename"
msgstr "重命名"
-#: merge-recursive.c:1098
+#: merge-recursive.c:1080
msgid "renamed"
msgstr "重命名"
-#: merge-recursive.c:1154
+#: merge-recursive.c:1136
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: merge-recursive.c:1176
+#: merge-recursive.c:1158
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1181
+#: merge-recursive.c:1163
msgid " (left unresolved)"
msgstr "（留下未解决）"
-#: merge-recursive.c:1235
+#: merge-recursive.c:1217
#, 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:1265
+#: merge-recursive.c:1247
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "而是重命名 %s 至 %s 以及 %s 至 %s"
-#: merge-recursive.c:1464
+#: merge-recursive.c:1446
#, 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:1474
+#: merge-recursive.c:1456
#, c-format
msgid "Adding merged %s"
msgstr "添加合并后的 %s"
-#: merge-recursive.c:1479 merge-recursive.c:1677
+#: merge-recursive.c:1461 merge-recursive.c:1659
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
-#: merge-recursive.c:1530
+#: merge-recursive.c:1512
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
-#: merge-recursive.c:1533
+#: merge-recursive.c:1515
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个二进制对象（blob）"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1563
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1563
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:1591
+#: merge-recursive.c:1573
msgid "content"
msgstr "内容"
-#: merge-recursive.c:1598
+#: merge-recursive.c:1580
msgid "add/add"
msgstr "添加/添加"
-#: merge-recursive.c:1632
+#: merge-recursive.c:1614
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s（已经做过相同合并）"
-#: merge-recursive.c:1646
+#: merge-recursive.c:1628
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
-#: merge-recursive.c:1650 git-submodule.sh:844
+#: merge-recursive.c:1632 git-submodule.sh:869
msgid "submodule"
msgstr "子模组"
-#: merge-recursive.c:1651
+#: merge-recursive.c:1633
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突（%s）：合并冲突于 %s"
-#: merge-recursive.c:1741
+#: merge-recursive.c:1723
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:1766
+#: merge-recursive.c:1748
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:1772
+#: merge-recursive.c:1754
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:1777
+#: merge-recursive.c:1759
#, 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:1787
+#: merge-recursive.c:1769
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:1804
+#: merge-recursive.c:1786
msgid "Fatal merge failure, shouldn't happen."
msgstr "严重的合并错误，不应发生。"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1805
msgid "Already up-to-date!"
msgstr "已经是最新的！"
-#: merge-recursive.c:1832
+#: merge-recursive.c:1814
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
-#: merge-recursive.c:1862
+#: merge-recursive.c:1844
#, c-format
msgid "Unprocessed path??? %s"
msgstr "未处理的路径??? %s"
-#: merge-recursive.c:1907
+#: merge-recursive.c:1889
msgid "Merging:"
msgstr "合并："
-#: merge-recursive.c:1920
+#: merge-recursive.c:1902
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先："
msgstr[1] "发现 %u 个共同祖先："
-#: merge-recursive.c:1957
+#: merge-recursive.c:1939
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:2014
+#: merge-recursive.c:1996
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:2026 builtin/merge.c:697
+#: merge-recursive.c:2008 builtin/merge.c:696
msgid "Unable to write index."
msgstr "不能写入索引。"
"您的分支和 '%s' 出现了偏离，\n"
"并且各自分别有 %d 和 %d 处不同的提交。\n"
-#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
-#: builtin/merge.c:1088 builtin/merge.c:1098
+#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977
+#: builtin/merge.c:1087 builtin/merge.c:1097
#, c-format
msgid "Could not open '%s' for writing"
msgstr "不能为写入打开 '%s'"
-#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
-#: builtin/merge.c:1090 builtin/merge.c:1103
+#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867
+#: builtin/merge.c:1089 builtin/merge.c:1102
#, c-format
msgid "Could not write to '%s'"
msgstr "不能写入 '%s'"
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:805 builtin/apply.c:3988
+#: sequencer.c:805 builtin/apply.c:3987
#, c-format
msgid "cannot open %s: %s"
msgstr "不能打开 %s：%s"
msgid ", behind "
msgstr "，落后 "
+#: compat/precompose_utf8.c:58 builtin/clone.c:341
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "无法删除 '%s'"
+
#: builtin/add.c:62
#, c-format
msgid "unexpected diff status %c"
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260
+#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
-#: builtin/apply.c:824
+#: builtin/apply.c:823
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "无法准备时间戳正则表达式 %s"
-#: builtin/apply.c:833
+#: builtin/apply.c:832
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d，输入为：%s"
-#: builtin/apply.c:914
+#: builtin/apply.c:913
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在补丁的第 %d 行找到文件名"
-#: builtin/apply.c:946
+#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply：错误的 git-diff - 期望 /dev/null，但在第 %2$d 行得到 %1$s"
-#: builtin/apply.c:950
+#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
-#: builtin/apply.c:951
+#: builtin/apply.c:950
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
-#: builtin/apply.c:958
+#: builtin/apply.c:957
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply：错误的 git-diff - 期望 /dev/null 于第 %d 行"
-#: builtin/apply.c:1403
+#: builtin/apply.c:1402
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount：意外的行：%.*s"
-#: builtin/apply.c:1460
+#: builtin/apply.c:1459
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补丁片段没有头信息：%.*s"
-#: builtin/apply.c:1477
+#: builtin/apply.c:1476
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
-#: builtin/apply.c:1637
+#: builtin/apply.c:1636
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"
-#: builtin/apply.c:1639
+#: builtin/apply.c:1638
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"
-#: builtin/apply.c:1665
+#: builtin/apply.c:1664
#, c-format
msgid "corrupt patch at line %d"
msgstr "补丁损坏位于第 %d 行"
-#: builtin/apply.c:1701
+#: builtin/apply.c:1700
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"
-#: builtin/apply.c:1703
+#: builtin/apply.c:1702
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"
-#: builtin/apply.c:1706
+#: builtin/apply.c:1705
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告：文件 %s 成为空文件但并未删除"
-#: builtin/apply.c:1852
+#: builtin/apply.c:1851
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏：%.*s"
#. there has to be one hunk (forward hunk)
-#: builtin/apply.c:1881
+#: builtin/apply.c:1880
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
-#: builtin/apply.c:1967
+#: builtin/apply.c:1966
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
-#: builtin/apply.c:2057
+#: builtin/apply.c:2056
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
-#: builtin/apply.c:2061
+#: builtin/apply.c:2060
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
-#: builtin/apply.c:2132
+#: builtin/apply.c:2131
msgid "oops"
msgstr "哎哟"
-#: builtin/apply.c:2654
+#: builtin/apply.c:2653
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符：'%c'"
-#: builtin/apply.c:2772
+#: builtin/apply.c:2771
#, 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:2784
+#: builtin/apply.c:2783
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
-#: builtin/apply.c:2790
+#: builtin/apply.c:2789
#, c-format
msgid ""
"while searching for:\n"
"当查询：\n"
"%.*s"
-#: builtin/apply.c:2809
+#: builtin/apply.c:2808
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
-#: builtin/apply.c:2912
+#: builtin/apply.c:2911
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
-#: builtin/apply.c:2918
+#: builtin/apply.c:2917
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果（预期 %s，得到 %s）"
-#: builtin/apply.c:2939
+#: builtin/apply.c:2938
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败：%s:%ld"
-#: builtin/apply.c:3061
+#: builtin/apply.c:3060
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
+#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158
#, c-format
msgid "read of %s failed"
msgstr "读取 %s 失败"
-#: builtin/apply.c:3139 builtin/apply.c:3361
+#: builtin/apply.c:3138 builtin/apply.c:3360
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
-#: builtin/apply.c:3220 builtin/apply.c:3375
+#: builtin/apply.c:3219 builtin/apply.c:3374
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在于索引中"
-#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
+#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388
#, c-format
msgid "%s: %s"
msgstr "%s：%s"
-#: builtin/apply.c:3229 builtin/apply.c:3383
+#: builtin/apply.c:3228 builtin/apply.c:3382
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不匹配"
-#: builtin/apply.c:3331
+#: builtin/apply.c:3330
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
-#: builtin/apply.c:3400
+#: builtin/apply.c:3399
#, c-format
msgid "%s: wrong type"
msgstr "%s：错误类型"
-#: builtin/apply.c:3402
+#: builtin/apply.c:3401
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o，预期是 %o"
-#: builtin/apply.c:3503
+#: builtin/apply.c:3502
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已经存在于索引中"
-#: builtin/apply.c:3506
+#: builtin/apply.c:3505
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已经存在于工作区中"
-#: builtin/apply.c:3526
+#: builtin/apply.c:3525
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
-#: builtin/apply.c:3531
+#: builtin/apply.c:3530
#, 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:3539
+#: builtin/apply.c:3538
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：补丁未应用"
-#: builtin/apply.c:3552
+#: builtin/apply.c:3551
#, c-format
msgid "Checking patch %s..."
msgstr "检查补丁 %s..."
-#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158
+#: builtin/apply.c:3606 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:3750
+#: builtin/apply.c:3749
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-#: builtin/apply.c:3778
+#: builtin/apply.c:3777
#, c-format
msgid "corrupt patch for subproject %s"
msgstr "子项目 %s 损坏的补丁"
-#: builtin/apply.c:3782
+#: builtin/apply.c:3781
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能枚举新建文件 '%s' 的状态"
-#: builtin/apply.c:3787
+#: builtin/apply.c:3786
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
-#: builtin/apply.c:3790 builtin/apply.c:3898
+#: builtin/apply.c:3789 builtin/apply.c:3897
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
-#: builtin/apply.c:3823
+#: builtin/apply.c:3822
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: builtin/apply.c:3872
+#: builtin/apply.c:3871
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
-#: builtin/apply.c:3959
+#: builtin/apply.c:3958
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
-#: builtin/apply.c:3967
+#: builtin/apply.c:3966
msgid "internal error"
msgstr "内部错误"
#. Say this even without --verbose
-#: builtin/apply.c:3970
+#: builtin/apply.c:3969
#, 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:3980
+#: builtin/apply.c:3979
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: builtin/apply.c:4001
+#: builtin/apply.c:4000
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
-#: builtin/apply.c:4004
+#: builtin/apply.c:4003
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
-#: builtin/apply.c:4154
+#: builtin/apply.c:4153
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: builtin/apply.c:4165
+#: builtin/apply.c:4164
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: builtin/apply.c:4284 builtin/apply.c:4287
+#: builtin/apply.c:4283 builtin/apply.c:4286
msgid "path"
msgstr "路径"
-#: builtin/apply.c:4285
+#: builtin/apply.c:4284
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: builtin/apply.c:4288
+#: builtin/apply.c:4287
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: builtin/apply.c:4290
+#: builtin/apply.c:4289
msgid "num"
msgstr "数字"
-#: builtin/apply.c:4291
+#: builtin/apply.c:4290
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"
-#: builtin/apply.c:4294
+#: builtin/apply.c:4293
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: builtin/apply.c:4296
+#: builtin/apply.c:4295
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
-#: builtin/apply.c:4300
+#: builtin/apply.c:4299
msgid "shows number of added and deleted lines in decimal notation"
msgstr "以数字方式显示添加或删除行的数量"
-#: builtin/apply.c:4302
+#: builtin/apply.c:4301
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁，而是显示输入的概要"
-#: builtin/apply.c:4304
+#: builtin/apply.c:4303
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁，而是查看补丁是否可应用"
-#: builtin/apply.c:4306
+#: builtin/apply.c:4305
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: builtin/apply.c:4308
+#: builtin/apply.c:4307
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: builtin/apply.c:4310
+#: builtin/apply.c:4309
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁（使用 --stat/--summary/--check 参数）"
-#: builtin/apply.c:4312
+#: builtin/apply.c:4311
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三路合并"
-#: builtin/apply.c:4314
+#: builtin/apply.c:4313
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: builtin/apply.c:4316
+#: builtin/apply.c:4315
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: builtin/apply.c:4319
+#: builtin/apply.c:4318
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: builtin/apply.c:4320
+#: builtin/apply.c:4319
msgid "action"
msgstr "动作"
-#: builtin/apply.c:4321
+#: builtin/apply.c:4320
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: builtin/apply.c:4324 builtin/apply.c:4327
+#: builtin/apply.c:4323 builtin/apply.c:4326
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: builtin/apply.c:4330
+#: builtin/apply.c:4329
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: builtin/apply.c:4332
+#: builtin/apply.c:4331
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: builtin/apply.c:4334
+#: builtin/apply.c:4333
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: builtin/apply.c:4336
+#: builtin/apply.c:4335
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: builtin/apply.c:4337
+#: builtin/apply.c:4336
msgid "be verbose"
msgstr "冗长输出"
-#: builtin/apply.c:4339
+#: builtin/apply.c:4338
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "宽容不正确的文件末尾换行符"
-#: builtin/apply.c:4342
+#: builtin/apply.c:4341
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: builtin/apply.c:4344
+#: builtin/apply.c:4343
msgid "root"
msgstr "根目录"
-#: builtin/apply.c:4345
+#: builtin/apply.c:4344
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
-#: builtin/apply.c:4367
+#: builtin/apply.c:4366
msgid "--3way outside a repository"
msgstr "--3way 在一个版本库之外"
-#: builtin/apply.c:4375
+#: builtin/apply.c:4374
msgid "--index outside a repository"
msgstr "--index 在一个版本库之外"
-#: builtin/apply.c:4378
+#: builtin/apply.c:4377
msgid "--cached outside a repository"
msgstr "--cached 在一个版本库之外"
-#: builtin/apply.c:4394
+#: builtin/apply.c:4393
#, c-format
msgid "can't open patch '%s'"
msgstr "不能打开补丁 '%s'"
-#: builtin/apply.c:4408
+#: builtin/apply.c:4407
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: builtin/apply.c:4414 builtin/apply.c:4424
+#: builtin/apply.c:4413 builtin/apply.c:4423
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
-#: builtin/checkout.c:235 builtin/checkout.c:393
+#: builtin/checkout.c:235 builtin/checkout.c:392
msgid "corrupt index file"
msgstr "损坏的索引文件"
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586
-#: builtin/merge.c:812
+#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586
+#: builtin/merge.c:811
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
-#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
-msgid "diff_setup_done failed"
-msgstr "diff_setup_done 失败"
-
-#: builtin/checkout.c:415
+#: builtin/checkout.c:414
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:534
+#: builtin/checkout.c:533
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr "不能对 '%s' 执行 reflog 操作\n"
-#: builtin/checkout.c:567
+#: builtin/checkout.c:566
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:574
+#: builtin/checkout.c:573
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:577
+#: builtin/checkout.c:576
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:581
+#: builtin/checkout.c:580
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:583
+#: builtin/checkout.c:582
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:585
+#: builtin/checkout.c:584
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:641
+#: builtin/checkout.c:640
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
#. The singular version
-#: builtin/checkout.c:647
+#: builtin/checkout.c:646
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:665
+#: builtin/checkout.c:664
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
" git branch new_branch_name %s\n"
"\n"
-#: builtin/checkout.c:695
+#: builtin/checkout.c:694
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:699
+#: builtin/checkout.c:698
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:725 builtin/checkout.c:920
+#: builtin/checkout.c:724 builtin/checkout.c:919
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
#. case (1)
-#: builtin/checkout.c:856
+#: builtin/checkout.c:855
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
#. case (1): want a tree
-#: builtin/checkout.c:895
+#: builtin/checkout.c:894
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:977
+#: builtin/checkout.c:976
msgid "-B cannot be used with -b"
msgstr "-B 不能和 -b 同时使用"
-#: builtin/checkout.c:986
+#: builtin/checkout.c:985
msgid "--patch is incompatible with all other options"
msgstr "--patch 选项和其他选项不兼容"
-#: builtin/checkout.c:989
+#: builtin/checkout.c:988
msgid "--detach cannot be used with -b/-B/--orphan"
msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
-#: builtin/checkout.c:991
+#: builtin/checkout.c:990
msgid "--detach cannot be used with -t"
msgstr "--detach 不能和 -t 同时使用"
-#: builtin/checkout.c:997
+#: builtin/checkout.c:996
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1003
msgid "Missing branch name; try -b"
msgstr "缺少分支名；尝试 -b"
-#: builtin/checkout.c:1010
+#: builtin/checkout.c:1009
msgid "--orphan and -b|-B are mutually exclusive"
msgstr "--orphan 和 -b|-B 互斥"
-#: builtin/checkout.c:1012
+#: builtin/checkout.c:1011
msgid "--orphan cannot be used with -t"
msgstr "--orphan 不能和 -t 同时使用"
-#: builtin/checkout.c:1022
+#: builtin/checkout.c:1021
msgid "git checkout: -f and -m are incompatible"
msgstr "git checkout：-f 和 -m 不兼容"
-#: builtin/checkout.c:1056
+#: builtin/checkout.c:1055
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1064
+#: builtin/checkout.c:1063
#, c-format
msgid ""
"git checkout: updating paths is incompatible with switching branches.\n"
"git checkout：更新路径和切换分支不兼容。\n"
"您是想要检出 '%s' 但未能将其解析为提交么？"
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1065
msgid "git checkout: updating paths is incompatible with switching branches."
msgstr "git checkout：更新路径和切换分支不兼容。"
-#: builtin/checkout.c:1071
+#: builtin/checkout.c:1070
msgid "git checkout: --detach does not take a path argument"
msgstr "git checkout：--detach 不跟路径参数"
-#: builtin/checkout.c:1074
+#: builtin/checkout.c:1073
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:1093
+#: builtin/checkout.c:1092
msgid "Cannot switch branch to a non-commit."
msgstr "无法切换分支到一个非提交。"
-#: builtin/checkout.c:1096
+#: builtin/checkout.c:1095
msgid "--ours/--theirs is incompatible with switching branches."
msgstr "--ours/--theirs 和切换分支不兼容。"
msgid "failed to create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: builtin/clone.c:308 builtin/diff.c:75
+#: builtin/clone.c:308 builtin/diff.c:77
#, c-format
msgid "failed to stat '%s'"
msgstr "无法枚举 '%s' 状态"
msgid "failed to stat %s\n"
msgstr "无法枚举 %s 状态\n"
-#: builtin/clone.c:341
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "无法删除 '%s'"
-
#: builtin/clone.c:346
#, c-format
msgid "failed to create link '%s'"
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: builtin/commit.c:1487 builtin/merge.c:509
+#: builtin/commit.c:1487 builtin/merge.c:508
#, c-format
msgid "could not open '%s' for reading"
msgstr "不能为读入打开 '%s'"
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"
-#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
+#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960
msgid "failed to write commit object"
msgstr "无法写提交对象"
msgid "--dirty is incompatible with committishes"
msgstr "--dirty 不能与提交同时使用"
-#: builtin/diff.c:77
+#: builtin/diff.c:79
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s'：不是一个正规文件或符号链接"
-#: builtin/diff.c:220
+#: builtin/diff.c:224
#, c-format
msgid "invalid option: %s"
msgstr "无效选项：%s"
-#: builtin/diff.c:297
+#: builtin/diff.c:301
msgid "Not a git repository"
msgstr "不是一个 git 版本库"
-#: builtin/diff.c:341
+#: builtin/diff.c:344
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"
-#: builtin/diff.c:346
+#: builtin/diff.c:349
#, c-format
msgid "more than %d trees given: '%s'"
msgstr "提供了超过 %d 个树对象：'%s'"
-#: builtin/diff.c:356
+#: builtin/diff.c:359
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个二进制对象（blob）：'%s'"
-#: builtin/diff.c:364
+#: builtin/diff.c:367
#, c-format
msgid "unhandled object '%s' given."
msgstr "提供了无法处理的对象 '%s'。"
msgid "grep: failed to create thread: %s"
msgstr "grep：无法创建线程：%s"
-#: builtin/grep.c:402
+#: builtin/grep.c:454
#, c-format
msgid "Failed to chdir: %s"
msgstr "无法切换目录：%s"
-#: builtin/grep.c:478 builtin/grep.c:512
+#: builtin/grep.c:530 builtin/grep.c:564
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树（%s）"
-#: builtin/grep.c:526
+#: builtin/grep.c:578
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:584
+#: builtin/grep.c:636
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:601
+#: builtin/grep.c:653
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: builtin/grep.c:885
+#: builtin/grep.c:917
msgid "no pattern given."
msgstr "未提供模式匹配。"
-#: builtin/grep.c:899
+#: builtin/grep.c:931
#, c-format
msgid "bad object %s"
msgstr "坏对象 %s"
-#: builtin/grep.c:940
+#: builtin/grep.c:972
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:963
+#: builtin/grep.c:995
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
-#: builtin/grep.c:968
+#: builtin/grep.c:1000
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index 或 --untracked 不能和版本同时使用。"
-#: builtin/grep.c:971
+#: builtin/grep.c:1003
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
-#: builtin/grep.c:979
+#: builtin/grep.c:1011
msgid "both --cached and trees are given."
msgstr "同时给出了 --cached 和树对象。"
msgid "Not a range."
msgstr "不是一个范围。"
-#: builtin/log.c:792
+#: builtin/log.c:789
msgid "Cover letter needs email format"
msgstr "信封需要邮件地址格式"
-#: builtin/log.c:865
+#: builtin/log.c:862
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:938
+#: builtin/log.c:935
msgid "Two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1160
+#: builtin/log.c:1157
#, c-format
msgid "bogus committer info %s"
msgstr "虚假的提交者信息 %s"
-#: builtin/log.c:1205
+#: builtin/log.c:1202
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
-#: builtin/log.c:1207
+#: builtin/log.c:1204
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix 和 -k 互斥。"
-#: builtin/log.c:1215
+#: builtin/log.c:1212
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1217
+#: builtin/log.c:1214
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1219
+#: builtin/log.c:1216
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1242
+#: builtin/log.c:1239
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录，哪一个？"
-#: builtin/log.c:1244
+#: builtin/log.c:1241
#, c-format
msgid "Could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/log.c:1397
+#: builtin/log.c:1394
msgid "Failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:1501
+#: builtin/log.c:1498
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"
-#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
+#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
#, c-format
msgid "Unknown commit %s"
msgstr "未知提交 %s"
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"
-#: builtin/merge.c:437
+#: builtin/merge.c:436
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指向一个提交"
-#: builtin/merge.c:536
+#: builtin/merge.c:535
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
-#: builtin/merge.c:629
+#: builtin/merge.c:628
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入一树对象"
-#: builtin/merge.c:679
+#: builtin/merge.c:678
msgid "failed to read the cache"
msgstr "无法读取缓存"
-#: builtin/merge.c:710
+#: builtin/merge.c:709
msgid "Not handling anything other than two heads merge."
msgstr "不能处理两个头合并之外的任何操作。"
-#: builtin/merge.c:724
+#: builtin/merge.c:723
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive 的未知选项：-X%s"
-#: builtin/merge.c:738
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "不能写 %s"
-#: builtin/merge.c:877
+#: builtin/merge.c:876
#, c-format
msgid "Could not read from '%s'"
msgstr "不能从 '%s' 读取"
-#: builtin/merge.c:886
+#: builtin/merge.c:885
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
-#: builtin/merge.c:892
+#: builtin/merge.c:891
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
"以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
-#: builtin/merge.c:916
+#: builtin/merge.c:915
msgid "Empty commit message."
msgstr "空提交信息。"
-#: builtin/merge.c:928
+#: builtin/merge.c:927
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:993
+#: builtin/merge.c:992
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
-#: builtin/merge.c:1009
+#: builtin/merge.c:1008
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s' 不是一个提交"
-#: builtin/merge.c:1050
+#: builtin/merge.c:1049
msgid "No current branch."
msgstr "没有当前分支。"
-#: builtin/merge.c:1052
+#: builtin/merge.c:1051
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程版本库。"
-#: builtin/merge.c:1054
+#: builtin/merge.c:1053
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/merge.c:1059
+#: builtin/merge.c:1058
#, c-format
msgid "No remote tracking branch for %s from %s"
msgstr "%s 没有来自 %s 的远程跟踪分支"
-#: builtin/merge.c:1146 builtin/merge.c:1303
+#: builtin/merge.c:1145 builtin/merge.c:1302
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
-#: builtin/merge.c:1214
+#: builtin/merge.c:1213
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1230 git-pull.sh:31
+#: builtin/merge.c:1229 git-pull.sh:31
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you can merge."
"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1233 git-pull.sh:34
+#: builtin/merge.c:1232 git-pull.sh:34
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
-#: builtin/merge.c:1237
+#: builtin/merge.c:1236
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you can merge."
"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1240
+#: builtin/merge.c:1239
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
-#: builtin/merge.c:1249
+#: builtin/merge.c:1248
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 与 --no-ff 同时使用。"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1253
msgid "You cannot combine --no-ff with --ff-only."
msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
-#: builtin/merge.c:1261
+#: builtin/merge.c:1260
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1293
+#: builtin/merge.c:1292
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
-#: builtin/merge.c:1296
+#: builtin/merge.c:1295
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
-#: builtin/merge.c:1298
+#: builtin/merge.c:1297
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
-#: builtin/merge.c:1413
+#: builtin/merge.c:1412
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1451
+#: builtin/merge.c:1450
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1458
+#: builtin/merge.c:1457
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1490
+#: builtin/merge.c:1489
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进，终止。"
-#: builtin/merge.c:1513 builtin/merge.c:1592
+#: builtin/merge.c:1512 builtin/merge.c:1591
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1517
+#: builtin/merge.c:1516
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1583
+#: builtin/merge.c:1582
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1584
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1593
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1606
+#: builtin/merge.c:1605
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n"
"您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
"而没有告诉我要推送什么、更新哪个远程分支。"
-#: builtin/push.c:174
+# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
+#: builtin/push.c:151
+msgid ""
+"push.default is unset; its implicit value is changing in\n"
+"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
+"and maintain the current behavior after the default changes, use:\n"
+"\n"
+" git config --global push.default matching\n"
+"\n"
+"To squelch this message and adopt the new behavior now, use:\n"
+"\n"
+" git config --global push.default simple\n"
+"\n"
+"See 'git help config' and search for 'push.default' for further "
+"information.\n"
+"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
+"'current' instead of 'simple' if you sometimes use older versions of Git)"
+msgstr ""
+"push.default 未设置，它的默认值将会在 Git 2.0 由 'matching'\n"
+"修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯，\n"
+"进行如下设置：\n"
+"\n"
+" git config --global push.default matching\n"
+"\n"
+"若要不再显示本信息并从现在开始采用新的使用习惯，设置：\n"
+"\n"
+" git config --global push.default simple\n"
+"\n"
+"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
+"（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n"
+"为保持兼容，请用 'current' 代替 'simple' 模式）"
+
+#: builtin/push.c:199
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。"
-#: builtin/push.c:181
+#: builtin/push.c:206
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
"再次推送前，先与远程变更合并（如 'git pull'）。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/push.c:187
+#: builtin/push.c:212
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. If you did not intend to push that branch, you may want to\n"
-"specify branches to push or set the 'push.default' configuration\n"
-"variable to 'current' or 'upstream' to push only the current branch."
+"specify branches to push or set the 'push.default' configuration variable\n"
+"to 'simple', 'current' or 'upstream' to push only the current branch."
msgstr ""
"更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
"如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n"
-"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。"
+"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
+"以便只推送当前分支。"
-#: builtin/push.c:193
+#: builtin/push.c:218
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and merge the remote changes\n"
"检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/push.c:233
+#: builtin/push.c:258
#, c-format
msgid "Pushing to %s\n"
msgstr "推送到 %s\n"
-#: builtin/push.c:237
+#: builtin/push.c:262
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "无法推送一些引用到 '%s'"
-#: builtin/push.c:269
+#: builtin/push.c:294
#, c-format
msgid "bad repository '%s'"
msgstr "坏的版本库 '%s'"
-#: builtin/push.c:270
+#: builtin/push.c:295
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
"\n"
" git push <name>\n"
-#: builtin/push.c:285
+#: builtin/push.c:310
msgid "--all and --tags are incompatible"
msgstr "--all 和 --tags 不兼容"
-#: builtin/push.c:286
+#: builtin/push.c:311
msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用表达式同时使用"
-#: builtin/push.c:291
+#: builtin/push.c:316
msgid "--mirror and --tags are incompatible"
msgstr "--mirror 和 --tags 不兼容"
-#: builtin/push.c:292
+#: builtin/push.c:317
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用表达式同时使用"
-#: builtin/push.c:297
+#: builtin/push.c:322
msgid "--all and --mirror are incompatible"
msgstr "--all 和 --mirror 不兼容"
-#: builtin/push.c:385
+#: builtin/push.c:410
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
-#: builtin/push.c:387
+#: builtin/push.c:412
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有意义"
msgid "cannot strip one component off url '$remoteurl'"
msgstr "无法从 url '$remoteurl' 剥离一个组件"
-#: git-submodule.sh:145
+#: git-submodule.sh:167
#, sh-format
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
-#: git-submodule.sh:189
+#: git-submodule.sh:211
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
-#: git-submodule.sh:201
+#: git-submodule.sh:223
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
-#: git-submodule.sh:290
+#: git-submodule.sh:312
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
-#: git-submodule.sh:307
+#: git-submodule.sh:329
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' 已经存在于索引中"
-#: git-submodule.sh:311
+#: git-submodule.sh:333
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"如果您确实想添加它，使用 -f 参数。"
-#: git-submodule.sh:322
+#: git-submodule.sh:344
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "添加位于 '$sm_path' 的现存版本库到索引"
-#: git-submodule.sh:324
+#: git-submodule.sh:346
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
-#: git-submodule.sh:338
+#: git-submodule.sh:360
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "不能检出子模组 '$sm_path'"
-#: git-submodule.sh:343
+#: git-submodule.sh:365
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加子模组 '$sm_path'"
-#: git-submodule.sh:348
+#: git-submodule.sh:370
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
-#: git-submodule.sh:390
+#: git-submodule.sh:413
#, sh-format
msgid "Entering '$prefix$sm_path'"
msgstr "正在进入 '$prefix$sm_path'"
-#: git-submodule.sh:404
+#: git-submodule.sh:427
#, sh-format
msgid "Stopping at '$sm_path'; script returned non-zero status."
msgstr "停止于 '$sm_path'，脚本返回非零值。"
-#: git-submodule.sh:447
+#: git-submodule.sh:471
#, sh-format
msgid "No url found for submodule path '$sm_path' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
-#: git-submodule.sh:456
+#: git-submodule.sh:480
#, sh-format
msgid "Failed to register url for submodule path '$sm_path'"
msgstr "无法为子模组路径 '$sm_path' 注册 url"
-#: git-submodule.sh:458
+#: git-submodule.sh:482
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
-#: git-submodule.sh:466
+#: git-submodule.sh:490
#, sh-format
msgid "Failed to register update mode for submodule path '$sm_path'"
msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
-#: git-submodule.sh:565
+#: git-submodule.sh:590
#, sh-format
msgid ""
"Submodule path '$sm_path' not initialized\n"
"子模组路径 '$sm_path' 没有初始化\n"
"也许您想用 'update --init'？"
-#: git-submodule.sh:578
+#: git-submodule.sh:603
#, sh-format
msgid "Unable to find current revision in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
-#: git-submodule.sh:597
+#: git-submodule.sh:622
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-submodule.sh:611
+#: git-submodule.sh:636
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
-#: git-submodule.sh:612
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$sm_path': rebased into '$sha1'"
msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"
-#: git-submodule.sh:617
+#: git-submodule.sh:642
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
-#: git-submodule.sh:618
+#: git-submodule.sh:643
#, sh-format
msgid "Submodule path '$sm_path': merged in '$sha1'"
msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"
-#: git-submodule.sh:623
+#: git-submodule.sh:648
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
-#: git-submodule.sh:624
+#: git-submodule.sh:649
#, sh-format
msgid "Submodule path '$sm_path': checked out '$sha1'"
msgstr "子模组路径 '$sm_path'：检出 '$sha1'"
-#: git-submodule.sh:646 git-submodule.sh:969
+#: git-submodule.sh:671 git-submodule.sh:995
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进子模组路径 '$sm_path'"
-#: git-submodule.sh:754
+#: git-submodule.sh:779
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached 不能和选项 --files 同时使用"
#. unexpected type
-#: git-submodule.sh:794
+#: git-submodule.sh:819
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:812
+#: git-submodule.sh:837
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr " 警告：$name 未包含提交 $sha1_src"
# 译者：注意保持前导空格
-#: git-submodule.sh:815
+#: git-submodule.sh:840
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr " 警告：$name 未包含提交 $sha1_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:818
+#: git-submodule.sh:843
#, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"
-#: git-submodule.sh:843
+#: git-submodule.sh:868
msgid "blob"
msgstr "二进制对象"
-#: git-submodule.sh:881
+#: git-submodule.sh:906
msgid "# Submodules changed but not updated:"
msgstr "# 子模组已修改但尚未更新："
-#: git-submodule.sh:883
+#: git-submodule.sh:908
msgid "# Submodule changes to be committed:"
msgstr "要提交的子模组变更："
-#: git-submodule.sh:1027
+#: git-submodule.sh:1054
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr "为 '$name' 同步子模组 url"
+
+#~ msgid "diff setup failed"
+#~ msgstr "diff 设置失败"
+
+#~ msgid "merge-recursive: disk full?"
+#~ msgstr "merge-recursive：磁盘已满？"
+
+#~ msgid "diff_setup_done failed"
+#~ msgstr "diff_setup_done 失败"