msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
- "POT-Creation-Date: 2012-09-05 06:20+0800\n"
+ "POT-Creation-Date: 2012-09-15 10:21+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"
"'git add/rm <file>' 标记解决方案，\n"
"或使用 'git commit -a'。"
+ #: archive.c:10
+ #, fuzzy
+ msgid "git archive [options] <tree-ish> [<path>...]"
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: archive.c:11
+ #, fuzzy
+ msgid "git archive --list"
+ msgstr "git archive：NACK %s"
+
+ #: archive.c:12
+ msgid ""
+ "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
+ msgstr ""
+
+ #: archive.c:13
+ msgid "git archive --remote <repo> [--exec <cmd>] --list"
+ msgstr ""
+
+ #: archive.c:322
+ msgid "fmt"
+ msgstr ""
+
+ #: archive.c:322
+ msgid "archive format"
+ msgstr ""
+
+ #: archive.c:323 builtin/log.c:1079
+ msgid "prefix"
+ msgstr ""
+
+ #: archive.c:324
+ msgid "prepend prefix to each pathname in the archive"
+ msgstr ""
+
+ #: archive.c:325 builtin/archive.c:91 builtin/blame.c:2332
+ #: builtin/blame.c:2333 builtin/config.c:56 builtin/fast-export.c:642
+ #: builtin/fast-export.c:644 builtin/grep.c:800 builtin/hash-object.c:77
+ #: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:537
+ #: builtin/notes.c:694 builtin/read-tree.c:107 parse-options.h:149
+ msgid "file"
+ msgstr "文件"
+
+ #: archive.c:326 builtin/archive.c:92
+ msgid "write the archive to this file"
+ msgstr ""
+
+ #: archive.c:328
+ #, fuzzy
+ msgid "read .gitattributes in working directory"
+ msgstr "%s：已经存在于工作区中"
+
+ #: archive.c:329
+ msgid "report archived files on stderr"
+ msgstr ""
+
+ #: archive.c:330
+ msgid "store only"
+ msgstr ""
+
+ #: archive.c:331
+ msgid "compress faster"
+ msgstr ""
+
+ #: archive.c:339
+ msgid "compress better"
+ msgstr ""
+
+ #: archive.c:342
+ msgid "list supported archive formats"
+ msgstr ""
+
+ #: archive.c:344 builtin/archive.c:93 builtin/clone.c:85
+ msgid "repo"
+ msgstr ""
+
+ #: archive.c:345 builtin/archive.c:94
+ msgid "retrieve the archive from remote repository <repo>"
+ msgstr ""
+
+ #: archive.c:346 builtin/archive.c:95 builtin/notes.c:616
+ #, fuzzy
+ msgid "command"
+ msgstr "运行 $command"
+
+ #: archive.c:347 builtin/archive.c:96
+ msgid "path to the remote git-upload-archive command"
+ msgstr ""
+
#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"
- #: bundle.c:89 builtin/commit.c:699
+ #: bundle.c:89 builtin/commit.c:714
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "版本库缺少这些必备的提交："
- #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
+ #: bundle.c:164 sequencer.c:557 sequencer.c:989 builtin/log.c:290
#: 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[1] ""
"\n"
-"您指的是这些其中一个么？"
+"您指的是这其中的某一个么？"
#: merge-recursive.c:190
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
- #: merge-recursive.c:921
+ #: merge-recursive.c:922
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
- #: merge-recursive.c:925
+ #: merge-recursive.c:926
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
- #: merge-recursive.c:941
+ #: merge-recursive.c:942
msgid "unsupported object type in the tree"
msgstr "在树中有不支持的对象类型"
- #: merge-recursive.c:1020 merge-recursive.c:1034
+ #: merge-recursive.c:1021 merge-recursive.c:1035
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
"的版本被保留。"
- #: merge-recursive.c:1026 merge-recursive.c:1039
+ #: merge-recursive.c:1027 merge-recursive.c:1040
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
"的版本保留于 %8$s 中。"
- #: merge-recursive.c:1080
+ #: merge-recursive.c:1081
msgid "rename"
msgstr "重命名"
- #: merge-recursive.c:1080
+ #: merge-recursive.c:1081
msgid "renamed"
msgstr "重命名"
- #: merge-recursive.c:1136
+ #: merge-recursive.c:1137
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
- #: merge-recursive.c:1158
+ #: merge-recursive.c:1159
#, 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:1163
+ #: merge-recursive.c:1164
msgid " (left unresolved)"
msgstr "（留下未解决）"
- #: merge-recursive.c:1217
+ #: merge-recursive.c:1218
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
"%5$s"
- #: merge-recursive.c:1247
+ #: merge-recursive.c:1248
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "而是重命名 %s 至 %s 以及 %s 至 %s"
- #: merge-recursive.c:1446
+ #: merge-recursive.c:1447
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
- #: merge-recursive.c:1456
+ #: merge-recursive.c:1457
#, c-format
msgid "Adding merged %s"
msgstr "添加合并后的 %s"
- #: merge-recursive.c:1461 merge-recursive.c:1659
+ #: merge-recursive.c:1462 merge-recursive.c:1660
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
- #: merge-recursive.c:1512
+ #: merge-recursive.c:1513
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
- #: merge-recursive.c:1515
+ #: merge-recursive.c:1516
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个二进制对象（blob）"
- #: merge-recursive.c:1563
+ #: merge-recursive.c:1564
msgid "modify"
msgstr "修改"
- #: merge-recursive.c:1563
+ #: merge-recursive.c:1564
msgid "modified"
msgstr "修改"
- #: merge-recursive.c:1573
+ #: merge-recursive.c:1574
msgid "content"
msgstr "内容"
- #: merge-recursive.c:1580
+ #: merge-recursive.c:1581
msgid "add/add"
msgstr "添加/添加"
- #: merge-recursive.c:1614
+ #: merge-recursive.c:1615
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s（已经做过相同合并）"
- #: merge-recursive.c:1628
+ #: merge-recursive.c:1629
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
- #: merge-recursive.c:1632 git-submodule.sh:869
+ #: merge-recursive.c:1633 git-submodule.sh:869
msgid "submodule"
msgstr "子模组"
- #: merge-recursive.c:1633
+ #: merge-recursive.c:1634
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突（%s）：合并冲突于 %s"
- #: merge-recursive.c:1723
+ #: merge-recursive.c:1724
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
- #: merge-recursive.c:1748
+ #: merge-recursive.c:1749
msgid "file/directory"
msgstr "文件/目录"
- #: merge-recursive.c:1754
+ #: merge-recursive.c:1755
msgid "directory/file"
msgstr "目录/文件"
- #: merge-recursive.c:1759
+ #: merge-recursive.c:1760
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
- #: merge-recursive.c:1769
+ #: merge-recursive.c:1770
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
- #: merge-recursive.c:1786
+ #: merge-recursive.c:1787
msgid "Fatal merge failure, shouldn't happen."
msgstr "严重的合并错误，不应发生。"
- #: merge-recursive.c:1805
+ #: merge-recursive.c:1806
msgid "Already up-to-date!"
msgstr "已经是最新的！"
- #: merge-recursive.c:1814
+ #: merge-recursive.c:1815
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
- #: merge-recursive.c:1844
+ #: merge-recursive.c:1845
#, c-format
msgid "Unprocessed path??? %s"
msgstr "未处理的路径??? %s"
- #: merge-recursive.c:1889
+ #: merge-recursive.c:1890
msgid "Merging:"
msgstr "合并："
- #: merge-recursive.c:1902
+ #: merge-recursive.c:1903
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先："
msgstr[1] "发现 %u 个共同祖先："
- #: merge-recursive.c:1939
+ #: merge-recursive.c:1940
msgid "merge returned no commit"
msgstr "合并未返回提交"
- #: merge-recursive.c:1996
+ #: merge-recursive.c:1997
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
- #: merge-recursive.c:2008 builtin/merge.c:696
+ #: merge-recursive.c:2009 builtin/merge.c:696
msgid "Unable to write index."
msgstr "不能写入索引。"
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
"您的分支和 '%s' 出现了偏离，\n"
-"并ä¸\94å\90\84è\87ªå\88\86å\88«æ\9c\89 %d å\92\8c %d å¤\84ä¸\8då\90\8cç\9a\84æ\8f\90交ã\80\82\n"
+"并且分别有 %d 和 %d 处不同的提交。\n"
msgstr[1] ""
"您的分支和 '%s' 出现了偏离，\n"
-"并ä¸\94å\90\84è\87ªå\88\86å\88«æ\9c\89 %d å\92\8c %d å¤\84ä¸\8då\90\8cç\9a\84æ\8f\90交ã\80\82\n"
+"并且分别有 %d 和 %d 处不同的提交。\n"
#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977
#: builtin/merge.c:1087 builtin/merge.c:1097
"冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"
"对修正后的文件做标记，然后用 'git commit' 提交"
- #: sequencer.c:160 sequencer.c:758 sequencer.c:841
+ #: sequencer.c:160 sequencer.c:765 sequencer.c:848
#, c-format
msgid "Could not write to %s"
msgstr "不能写入 %s"
msgid "Unable to update cache tree\n"
msgstr "不能更新缓存\n"
- #: sequencer.c:324
+ #: sequencer.c:327
#, c-format
msgid "Could not parse commit %s\n"
msgstr "不能解析提交 %s\n"
- #: sequencer.c:329
+ #: sequencer.c:332
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "不能解析父提交 %s\n"
- #: sequencer.c:395
+ #: sequencer.c:398
msgid "Your index file is unmerged."
msgstr "您的索引文件未完成合并。"
- #: sequencer.c:398
+ #: sequencer.c:401
msgid "You do not have a valid HEAD"
msgstr "您没有一个有效的 HEAD"
- #: sequencer.c:413
+ #: sequencer.c:416
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
- #: sequencer.c:421
+ #: sequencer.c:424
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "提交 %s 没有父提交 %d"
- #: sequencer.c:425
+ #: sequencer.c:428
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr "指定了主线但提交 %s 不是一个合并。"
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
- #: sequencer.c:436
+ #: sequencer.c:439
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
- #: sequencer.c:440
+ #: sequencer.c:443
#, c-format
msgid "Cannot get commit message for %s"
msgstr "不能得到 %s 的提交说明"
- #: sequencer.c:524
+ #: sequencer.c:527
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
- #: sequencer.c:525
+ #: sequencer.c:528
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
- #: sequencer.c:553
+ #: sequencer.c:560
msgid "empty commit set passed"
msgstr "提供了空的提交集"
- #: sequencer.c:561
+ #: sequencer.c:568
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：无法读取索引"
- #: sequencer.c:566
+ #: sequencer.c:573
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：无法刷新索引"
- #: sequencer.c:624
+ #: sequencer.c:631
#, c-format
msgid "Cannot %s during a %s"
msgstr "无法 %s 在一个 %s 过程中"
- #: sequencer.c:646
+ #: sequencer.c:653
#, c-format
msgid "Could not parse line %d."
msgstr "不能解析第 %d 行。"
- #: sequencer.c:651
+ #: sequencer.c:658
msgid "No commits parsed."
msgstr "没有提交被解析。"
- #: sequencer.c:664
+ #: sequencer.c:671
#, c-format
msgid "Could not open %s"
msgstr "不能打开 %s"
- #: sequencer.c:668
+ #: sequencer.c:675
#, c-format
msgid "Could not read %s."
msgstr "不能读取 %s。"
- #: sequencer.c:675
+ #: sequencer.c:682
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "无用的指令表单：%s"
- #: sequencer.c:703
+ #: sequencer.c:710
#, c-format
msgid "Invalid key: %s"
msgstr "无效键名：%s"
- #: sequencer.c:706
+ #: sequencer.c:713
#, c-format
msgid "Invalid value for %s: %s"
msgstr "%s 的值无效：%s"
- #: sequencer.c:718
+ #: sequencer.c:725
#, c-format
msgid "Malformed options sheet: %s"
msgstr "非法的选项表单：%s"
- #: sequencer.c:739
+ #: sequencer.c:746
msgid "a cherry-pick or revert is already in progress"
msgstr "一个拣选或还原操作已在进行"
- #: sequencer.c:740
+ #: sequencer.c:747
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
- #: sequencer.c:744
+ #: sequencer.c:751
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "不能创建序列目录 %s"
- #: sequencer.c:760 sequencer.c:845
+ #: sequencer.c:767 sequencer.c:852
#, c-format
msgid "Error wrapping up %s."
msgstr "错误收尾 %s。"
- #: sequencer.c:779 sequencer.c:913
+ #: sequencer.c:786 sequencer.c:920
msgid "no cherry-pick or revert in progress"
-msgstr "没æ\9c\89æ\8b£é\80\89æ\88\96è¿\98å\8e\9fæ\93\8dä½\9cå\9c¨进行"
+msgstr "æ\8b£é\80\89æ\88\96è¿\98å\8e\9fæ\93\8dä½\9c并æ\9cª进行"
- #: sequencer.c:781
+ #: sequencer.c:788
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
- #: sequencer.c:783
+ #: sequencer.c:790
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
- #: sequencer.c:805 builtin/apply.c:3987
+ #: sequencer.c:812 builtin/apply.c:4005
#, c-format
msgid "cannot open %s: %s"
msgstr "不能打开 %s：%s"
- #: sequencer.c:808
+ #: sequencer.c:815
#, c-format
msgid "cannot read %s: %s"
msgstr "不能读取 %s：%s"
- #: sequencer.c:809
+ #: sequencer.c:816
msgid "unexpected end of file"
-msgstr "æ\9cªé¢\84æ\9c\9f的文件结束"
+msgstr "æ\84\8få¤\96的文件结束"
- #: sequencer.c:815
+ #: sequencer.c:822
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
- #: sequencer.c:838
+ #: sequencer.c:845
#, c-format
msgid "Could not format %s."
msgstr "不能格式化 %s。"
- #: sequencer.c:1000
+ #: sequencer.c:1007
msgid "Can't revert as initial commit"
msgstr "不能作为初始提交还原"
- #: sequencer.c:1001
+ #: sequencer.c:1008
msgid "Can't cherry-pick into empty head"
msgstr "不能拣选到空分支"
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
- #: wrapper.c:413
+ #: wrapper.c:408
+ #, fuzzy, c-format
+ msgid "unable to access '%s': %s"
+ msgstr "不能创建 '%s'"
+
+ #: wrapper.c:426
#, c-format
msgid "unable to look up current user in the passwd file: %s"
-msgstr "无法在 passwd 文件中查询到当前用户：%s"
+msgstr "无法在 passwd 文件中查询到该用户：%s"
- #: wrapper.c:414
+ #: wrapper.c:427
msgid "no such user"
msgstr "无此用户"
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
- #: wt-status.c:224
- #, c-format
- msgid "%s files:"
- msgstr "%s文件："
-
# 译者：注意保持前导空格
#: wt-status.c:227
#, c-format
#: wt-status.c:785
msgid "You have unmerged paths."
-msgstr "您有路径尚未合并。"
+msgstr "您有尚未合并的路径。"
# 译者：注意保持前导空格
#: wt-status.c:788 wt-status.c:912
#: 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:908
msgid "You are currently cherry-picking."
msgstr "初始提交"
#: wt-status.c:1011
- msgid "Untracked"
+ #, fuzzy
+ msgid "Untracked files"
msgstr "未跟踪的"
#: wt-status.c:1013
- msgid "Ignored"
+ #, fuzzy
+ msgid "Ignored files"
msgstr "忽略的"
#: wt-status.c:1015
msgid "No changes"
msgstr "没有修改"
- #: wt-status.c:1027
- #, c-format
- msgid "no changes added to commit%s\n"
- msgstr "修改尚未加入提交%s\n"
-
# 译者：中文字符串拼接，可删除前导空格
- #: wt-status.c:1029
- msgid " (use \"git add\" and/or \"git commit -a\")"
+ #: wt-status.c:1028
+ #, fuzzy, c-format
+ msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）"
#: wt-status.c:1031
- #, c-format
- msgid "nothing added to commit but untracked files present%s\n"
- msgstr "空提交但存在未跟踪文件%s\n"
+ #, fuzzy, c-format
+ msgid "no changes added to commit\n"
+ msgstr "修改尚未加入提交%s\n"
- # 译者：中文字符串拼接，可删除前导空格
- #: wt-status.c:1033
- msgid " (use \"git add\" to track)"
- msgstr "（使用 \"git add\" 建立跟踪）"
+ #: wt-status.c:1034
+ #, fuzzy, c-format
+ msgid ""
+ "nothing added to commit but untracked files present (use \"git add\" to "
+ "track)\n"
+ msgstr "空提交但存在未跟踪文件%s\n"
- #: 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
+ #, fuzzy, c-format
+ msgid "nothing added to commit but untracked files present\n"
+ msgstr "空提交但存在未跟踪文件%s\n"
# 译者：中文字符串拼接，可删除前导空格
- #: wt-status.c:1036
- msgid " (create/copy files and use \"git add\" to track)"
+ #: wt-status.c:1040
+ #, fuzzy, c-format
+ msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）"
+ #: wt-status.c:1043 wt-status.c:1048
+ #, fuzzy, c-format
+ msgid "nothing to commit\n"
+ msgstr "无须提交%s\n"
+
# 译者：中文字符串拼接，可删除前导空格
- #: wt-status.c:1039
- msgid " (use -u to show untracked files)"
+ #: wt-status.c:1046
+ #, fuzzy, c-format
+ msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "（使用 -u 显示未跟踪文件）"
# 译者：中文字符串拼接，可删除前导空格
- #: wt-status.c:1042
- msgid " (working directory clean)"
+ #: wt-status.c:1050
+ #, fuzzy, c-format
+ msgid "nothing to commit, working directory clean\n"
msgstr "（干净的工作区）"
- #: wt-status.c:1150
+ #: wt-status.c:1158
msgid "HEAD (no branch)"
msgstr "HEAD（非分支）"
# 译者：注意保持句尾空格
- #: wt-status.c:1156
+ #: wt-status.c:1164
msgid "Initial commit on "
msgstr "初始提交于 "
# 译者：注意保持句尾空格
- #: wt-status.c:1171
+ #: wt-status.c:1179
msgid "behind "
msgstr "落后 "
# 译者：注意保持句尾空格
- #: wt-status.c:1174 wt-status.c:1177
+ #: wt-status.c:1182 wt-status.c:1185
msgid "ahead "
msgstr "领先 "
# 译者：注意保持句尾空格
- #: wt-status.c:1179
+ #: wt-status.c:1187
msgid ", behind "
msgstr "，落后 "
msgid "failed to unlink '%s'"
msgstr "无法删除 '%s'"
+ #: builtin/add.c:19
+ #, fuzzy
+ msgid "git add [options] [--] <filepattern>..."
+ msgstr "git apply [选项] [<补丁>...]"
+
#: builtin/add.c:62
#, c-format
msgid "unexpected diff status %c"
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更："
- #: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
+ #: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径 '%s' 未匹配任何文件"
#: builtin/add.c:286
#, c-format
msgid "Could not open '%s' for writing."
-msgstr "不能为写入打开 '%s'。"
+msgstr "不能打开 '%s' 以写入。"
#: builtin/add.c:290
msgid "Could not write patch"
-msgstr "不能写补丁"
+msgstr "不能生成补丁"
#: builtin/add.c:295
#, c-format
msgid "Could not apply '%s'"
msgstr "不能应用 '%s'"
- #: builtin/add.c:312
+ #: builtin/add.c:313
msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n"
+msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
- #: builtin/add.c:352
+ #: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63
+ #: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253
+ #: builtin/rm.c:133
+ msgid "dry run"
+ msgstr ""
+
+ #: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1187
+ #: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477
+ #: builtin/mv.c:62 builtin/read-tree.c:112
+ msgid "be verbose"
+ msgstr "冗长输出"
+
+ #: builtin/add.c:322
+ #, fuzzy
+ msgid "interactive picking"
+ msgstr "交互式添加失败"
+
+ #: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248
+ msgid "select hunks interactively"
+ msgstr ""
+
+ #: builtin/add.c:324
+ msgid "edit current diff and apply"
+ msgstr ""
+
+ #: builtin/add.c:325
+ msgid "allow adding otherwise ignored files"
+ msgstr ""
+
+ #: builtin/add.c:326
+ #, fuzzy
+ msgid "update tracked files"
+ msgstr "无法存储包文件"
+
+ #: builtin/add.c:327
+ msgid "record only the fact that the path will be added later"
+ msgstr ""
+
+ #: builtin/add.c:328
+ msgid "add changes from all tracked and untracked files"
+ msgstr ""
+
+ #: builtin/add.c:329
+ #, fuzzy
+ msgid "don't add, only refresh the index"
+ msgstr "git %s：无法刷新索引"
+
+ #: builtin/add.c:330
+ msgid "just skip files which cannot be added because of errors"
+ msgstr ""
+
+ #: builtin/add.c:331
+ msgid "check if - even missing - files are ignored in dry run"
+ msgstr ""
+
+ #: builtin/add.c:353
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "使用 -f 参数如果您确实要添加它们。\n"
- #: builtin/add.c:353
+ #: builtin/add.c:354
msgid "no files added"
msgstr "没有文件被添加"
- #: builtin/add.c:359
+ #: builtin/add.c:360
msgid "adding files failed"
msgstr "添加文件失败"
- #: builtin/add.c:391
+ #: builtin/add.c:392
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 选项互斥"
- #: builtin/add.c:393
+ #: builtin/add.c:394
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
- #: builtin/add.c:413
+ #: builtin/add.c:414
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件，也没有文件被添加。\n"
- #: builtin/add.c:414
+ #: builtin/add.c:415
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想要执行 'git add .'？\n"
- #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
+ #: builtin/add.c:421 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:4432 builtin/mv.c:229 builtin/rm.c:260
+ #: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr "git apply：错误的 git-diff - 期望 /dev/null，但在第 %2$d 行得到 %1$s"
+msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
#: builtin/apply.c:949
#, c-format
#: builtin/apply.c:957
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply：错误的 git-diff - 期望 /dev/null 于第 %d 行"
+msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
- #: builtin/apply.c:1402
+ #: builtin/apply.c:1420
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount：意外的行：%.*s"
- #: builtin/apply.c:1459
+ #: builtin/apply.c:1477
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补丁片段没有头信息：%.*s"
- #: builtin/apply.c:1476
+ #: builtin/apply.c:1494
#, 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:1636
+ #: builtin/apply.c:1654
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"
- #: builtin/apply.c:1638
+ #: builtin/apply.c:1656
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"
- #: builtin/apply.c:1664
+ #: builtin/apply.c:1682
#, c-format
msgid "corrupt patch at line %d"
-msgstr "补丁损坏位于第 %d 行"
+msgstr "补丁在第 %d 行损坏"
- #: builtin/apply.c:1700
+ #: builtin/apply.c:1718
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"
- #: builtin/apply.c:1702
+ #: builtin/apply.c:1720
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"
- #: builtin/apply.c:1705
+ #: builtin/apply.c:1723
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告：文件 %s 成为空文件但并未删除"
- #: builtin/apply.c:1851
+ #: builtin/apply.c:1869
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏：%.*s"
#. there has to be one hunk (forward hunk)
- #: builtin/apply.c:1880
+ #: builtin/apply.c:1898
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
- #: builtin/apply.c:1966
+ #: builtin/apply.c:1984
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
- #: builtin/apply.c:2056
+ #: builtin/apply.c:2074
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
- #: builtin/apply.c:2060
+ #: builtin/apply.c:2078
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
- #: builtin/apply.c:2131
+ #: builtin/apply.c:2149
msgid "oops"
msgstr "哎哟"
- #: builtin/apply.c:2653
+ #: builtin/apply.c:2671
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符：'%c'"
- #: builtin/apply.c:2771
+ #: builtin/apply.c:2789
#, 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:2783
+ #: builtin/apply.c:2801
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
- #: builtin/apply.c:2789
+ #: builtin/apply.c:2807
#, c-format
msgid ""
"while searching for:\n"
"当查询：\n"
"%.*s"
- #: builtin/apply.c:2808
+ #: builtin/apply.c:2826
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
- #: builtin/apply.c:2911
+ #: builtin/apply.c:2929
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
- #: builtin/apply.c:2917
+ #: builtin/apply.c:2935
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr "到 '%s' 的二进制补丁产生了不正确的结果（预期 %s，得到 %s）"
+msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
- #: builtin/apply.c:2938
+ #: builtin/apply.c:2956
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败：%s:%ld"
- #: builtin/apply.c:3060
+ #: builtin/apply.c:3078
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
- #: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158
+ #: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176
#, c-format
msgid "read of %s failed"
msgstr "读取 %s 失败"
- #: builtin/apply.c:3138 builtin/apply.c:3360
+ #: builtin/apply.c:3156 builtin/apply.c:3378
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
- #: builtin/apply.c:3219 builtin/apply.c:3374
+ #: builtin/apply.c:3237 builtin/apply.c:3392
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在于索引中"
- #: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388
+ #: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406
#, c-format
msgid "%s: %s"
msgstr "%s：%s"
- #: builtin/apply.c:3228 builtin/apply.c:3382
+ #: builtin/apply.c:3246 builtin/apply.c:3400
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不匹配"
- #: builtin/apply.c:3330
+ #: builtin/apply.c:3348
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
- #: builtin/apply.c:3399
+ #: builtin/apply.c:3417
#, c-format
msgid "%s: wrong type"
msgstr "%s：错误类型"
- #: builtin/apply.c:3401
+ #: builtin/apply.c:3419
#, c-format
msgid "%s has type %o, expected %o"
-msgstr "%s 的类型是 %o，预期是 %o"
+msgstr "%s 的类型是 %o，应为 %o"
- #: builtin/apply.c:3502
+ #: builtin/apply.c:3520
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已经存在于索引中"
- #: builtin/apply.c:3505
+ #: builtin/apply.c:3523
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已经存在于工作区中"
- #: builtin/apply.c:3525
+ #: builtin/apply.c:3543
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
- #: builtin/apply.c:3530
+ #: builtin/apply.c:3548
#, 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:3538
+ #: builtin/apply.c:3556
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：补丁未应用"
- #: builtin/apply.c:3551
+ #: builtin/apply.c:3569
#, c-format
msgid "Checking patch %s..."
msgstr "检查补丁 %s..."
- #: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158
+ #: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
- #: builtin/apply.c:3749
+ #: builtin/apply.c:3767
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
- #: builtin/apply.c:3777
+ #: builtin/apply.c:3795
#, c-format
msgid "corrupt patch for subproject %s"
msgstr "子项目 %s 损坏的补丁"
- #: builtin/apply.c:3781
+ #: builtin/apply.c:3799
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能枚举新建文件 '%s' 的状态"
- #: builtin/apply.c:3786
+ #: builtin/apply.c:3804
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
- #: builtin/apply.c:3789 builtin/apply.c:3897
+ #: builtin/apply.c:3807 builtin/apply.c:3915
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
- #: builtin/apply.c:3822
+ #: builtin/apply.c:3840
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
- #: builtin/apply.c:3871
+ #: builtin/apply.c:3889
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
- #: builtin/apply.c:3958
+ #: builtin/apply.c:3976
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
- #: builtin/apply.c:3966
+ #: builtin/apply.c:3984
msgid "internal error"
msgstr "内部错误"
#. Say this even without --verbose
- #: builtin/apply.c:3969
+ #: builtin/apply.c:3987
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..."
-msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..."
+msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
+msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
- #: builtin/apply.c:3979
+ #: builtin/apply.c:3997
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
- #: builtin/apply.c:4000
+ #: builtin/apply.c:4018
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
- #: builtin/apply.c:4003
+ #: builtin/apply.c:4021
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
- #: builtin/apply.c:4153
+ #: builtin/apply.c:4171
msgid "unrecognized input"
msgstr "未能识别的输入"
- #: builtin/apply.c:4164
+ #: builtin/apply.c:4182
msgid "unable to read index file"
msgstr "无法读取索引文件"
- #: builtin/apply.c:4283 builtin/apply.c:4286
+ #: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91
+ #: builtin/fetch.c:63
msgid "path"
msgstr "路径"
- #: builtin/apply.c:4284
+ #: builtin/apply.c:4302
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
- #: builtin/apply.c:4287
+ #: builtin/apply.c:4305
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
- #: builtin/apply.c:4289
+ #: builtin/apply.c:4307
msgid "num"
msgstr "数字"
- #: builtin/apply.c:4290
+ #: builtin/apply.c:4308
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"
- #: builtin/apply.c:4293
+ #: builtin/apply.c:4311
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
- #: builtin/apply.c:4295
+ #: builtin/apply.c:4313
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
- #: builtin/apply.c:4299
- msgid "shows number of added and deleted lines in decimal notation"
+ #: builtin/apply.c:4317
+ #, fuzzy
+ msgid "show number of added and deleted lines in decimal notation"
msgstr "以数字方式显示添加或删除行的数量"
- #: builtin/apply.c:4301
+ #: builtin/apply.c:4319
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁，而是显示输入的概要"
- #: builtin/apply.c:4303
+ #: builtin/apply.c:4321
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁，而是查看补丁是否可应用"
- #: builtin/apply.c:4305
+ #: builtin/apply.c:4323
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
- #: builtin/apply.c:4307
+ #: builtin/apply.c:4325
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
- #: builtin/apply.c:4309
+ #: builtin/apply.c:4327
msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "è¿\98åº\94ç\94¨æ¤è¡¥ä¸\81ï¼\88使ç\94¨ --stat/--summary/--check å\8f\82æ\95°）"
+msgstr "è¿\98åº\94ç\94¨æ¤è¡¥ä¸\81ï¼\88ä¸\8e --stat/--summary/--check é\80\89项å\90\8cæ\97¶ä½¿ç\94¨）"
- #: builtin/apply.c:4311
+ #: builtin/apply.c:4329
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三路合并"
- #: builtin/apply.c:4313
+ #: builtin/apply.c:4331
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
- #: builtin/apply.c:4315
+ #: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
- #: builtin/apply.c:4318
+ #: builtin/apply.c:4336
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
- #: builtin/apply.c:4319
+ #: builtin/apply.c:4337
msgid "action"
msgstr "动作"
- #: builtin/apply.c:4320
+ #: builtin/apply.c:4338
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
- #: builtin/apply.c:4323 builtin/apply.c:4326
+ #: builtin/apply.c:4341 builtin/apply.c:4344
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
- #: builtin/apply.c:4329
+ #: builtin/apply.c:4347
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
- #: builtin/apply.c:4331
+ #: builtin/apply.c:4349
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
- #: builtin/apply.c:4333
+ #: builtin/apply.c:4351
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
- #: builtin/apply.c:4335
+ #: builtin/apply.c:4353
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
- #: builtin/apply.c:4336
- msgid "be verbose"
- msgstr "冗长输出"
-
- #: builtin/apply.c:4338
+ #: builtin/apply.c:4356
msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr "宽容不正确的文件末尾换行符"
+msgstr "å\85\81许不正确的文件末尾换行符"
- #: builtin/apply.c:4341
+ #: builtin/apply.c:4359
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
- #: builtin/apply.c:4343
+ #: builtin/apply.c:4361
msgid "root"
msgstr "根目录"
- #: builtin/apply.c:4344
+ #: builtin/apply.c:4362
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
- #: builtin/apply.c:4366
+ #: builtin/apply.c:4384
msgid "--3way outside a repository"
msgstr "--3way 在一个版本库之外"
- #: builtin/apply.c:4374
+ #: builtin/apply.c:4392
msgid "--index outside a repository"
msgstr "--index 在一个版本库之外"
- #: builtin/apply.c:4377
+ #: builtin/apply.c:4395
msgid "--cached outside a repository"
msgstr "--cached 在一个版本库之外"
- #: builtin/apply.c:4393
+ #: builtin/apply.c:4411
#, c-format
msgid "can't open patch '%s'"
msgstr "不能打开补丁 '%s'"
- #: builtin/apply.c:4407
+ #: builtin/apply.c:4425
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
- #: builtin/apply.c:4413 builtin/apply.c:4423
+ #: builtin/apply.c:4431 builtin/apply.c:4441
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
#: builtin/archive.c:20
msgid "could not redirect output"
-msgstr "不能输出重定向"
+msgstr "不能重定向输出"
#: builtin/archive.c:37
msgid "git archive: Remote with no URL"
#: builtin/archive.c:58
msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive：期待ACK/NACK，却得到EOF"
+msgstr "git archive：应为ACK/NACK，却得到EOF"
#: builtin/archive.c:63
#, c-format
#: builtin/archive.c:71
msgid "git archive: expected a flush"
-msgstr "git archive：预期一个刷新"
+msgstr "git archive：应为刷新"
+ #: builtin/bisect--helper.c:7
+ msgid "git bisect--helper --next-all [--no-checkout]"
+ msgstr ""
+
+ #: builtin/bisect--helper.c:17
+ msgid "perform 'git bisect next'"
+ msgstr ""
+
+ #: builtin/bisect--helper.c:19
+ msgid "update BISECT_HEAD instead of checking out the current commit"
+ msgstr ""
+
+ #: builtin/blame.c:25
+ msgid "git blame [options] [rev-opts] [rev] [--] file"
+ msgstr ""
+
+ #: builtin/blame.c:30 builtin/shortlog.c:15
+ msgid "[rev-opts] are documented in git-rev-list(1)"
+ msgstr ""
+
+ #: builtin/blame.c:2316
+ msgid "Show blame entries as we find them, incrementally"
+ msgstr ""
+
+ #: builtin/blame.c:2317
+ msgid "Show blank SHA-1 for boundary commits (Default: off)"
+ msgstr ""
+
+ #: builtin/blame.c:2318
+ msgid "Do not treat root commits as boundaries (Default: off)"
+ msgstr ""
+
+ #: builtin/blame.c:2319
+ #, fuzzy
+ msgid "Show work cost statistics"
+ msgstr "显示工作区状态"
+
+ #: builtin/blame.c:2320
+ msgid "Show output score for blame entries"
+ msgstr ""
+
+ #: builtin/blame.c:2321
+ msgid "Show original filename (Default: auto)"
+ msgstr ""
+
+ #: builtin/blame.c:2322
+ msgid "Show original linenumber (Default: off)"
+ msgstr ""
+
+ #: builtin/blame.c:2323
+ msgid "Show in a format designed for machine consumption"
+ msgstr ""
+
+ #: builtin/blame.c:2324
+ msgid "Show porcelain format with per-line commit information"
+ msgstr ""
+
+ #: builtin/blame.c:2325
+ msgid "Use the same output mode as git-annotate (Default: off)"
+ msgstr ""
+
+ #: builtin/blame.c:2326
+ msgid "Show raw timestamp (Default: off)"
+ msgstr ""
+
+ #: builtin/blame.c:2327
+ msgid "Show long commit SHA1 (Default: off)"
+ msgstr ""
+
+ #: builtin/blame.c:2328
+ msgid "Suppress author name and timestamp (Default: off)"
+ msgstr ""
+
+ #: builtin/blame.c:2329
+ msgid "Show author email instead of name (Default: off)"
+ msgstr ""
+
+ #: builtin/blame.c:2330
+ msgid "Ignore whitespace differences"
+ msgstr ""
+
+ #: builtin/blame.c:2331
+ msgid "Spend extra cycles to find better match"
+ msgstr ""
+
+ #: builtin/blame.c:2332
+ msgid "Use revisions from <file> instead of calling git-rev-list"
+ msgstr ""
+
+ #: builtin/blame.c:2333
+ #, fuzzy
+ msgid "Use <file>'s contents as the final image"
+ msgstr "添加文件内容至索引"
+
+ #: builtin/blame.c:2334 builtin/blame.c:2335
+ msgid "score"
+ msgstr ""
+
+ #: builtin/blame.c:2334
+ msgid "Find line copies within and across files"
+ msgstr ""
+
+ #: builtin/blame.c:2335
+ msgid "Find line movements within and across files"
+ msgstr ""
+
+ #: builtin/blame.c:2336
+ #, fuzzy
+ msgid "n,m"
+ msgstr "数字"
+
+ #: builtin/blame.c:2336
+ msgid "Process only line range n,m, counting from 1"
+ msgstr ""
+
+ #: builtin/branch.c:23
+ msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
+ msgstr ""
+
+ #: builtin/branch.c:24
+ msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
+ msgstr ""
+
+ #: builtin/branch.c:25
+ #, fuzzy
+ msgid "git branch [options] [-r] (-d | -D) <branchname>..."
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/branch.c:26
+ msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
+ msgstr ""
+
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
- #: builtin/branch.c:144
+ #: builtin/branch.c:145
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s'，但未合并到 HEAD。"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
- #: builtin/branch.c:148
+ #: builtin/branch.c:149
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
" 然而却尚未被合并到分支 '%s' 。"
- #: builtin/branch.c:180
+ #: builtin/branch.c:181
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 同时使用"
- #: builtin/branch.c:186
+ #: builtin/branch.c:187
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
- #: builtin/branch.c:191
+ #: builtin/branch.c:192
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "无法删除您当前所在的分支 '%s'。"
- #: builtin/branch.c:202
+ #: builtin/branch.c:203
#, c-format
msgid "remote branch '%s' not found."
msgstr "远程分支 '%s' 未发现。"
- #: builtin/branch.c:203
+ #: builtin/branch.c:204
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未发现。"
- #: builtin/branch.c:210
+ #: builtin/branch.c:211
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"
- #: builtin/branch.c:216
+ #: builtin/branch.c:217
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"分支 '%s' 没有完全合并。\n"
"如果您确认要删除它，执行 'git branch -D %s'。"
- #: builtin/branch.c:225
+ #: builtin/branch.c:226
#, c-format
msgid "Error deleting remote branch '%s'"
msgstr "删除远程分支 '%s' 时出错"
- #: builtin/branch.c:226
+ #: builtin/branch.c:227
#, c-format
msgid "Error deleting branch '%s'"
msgstr "删除分支 '%s' 时出错"
- #: builtin/branch.c:233
+ #: builtin/branch.c:234
#, c-format
msgid "Deleted remote branch %s (was %s).\n"
msgstr "已删除远程分支 %s（曾为 %s）。\n"
- #: builtin/branch.c:234
+ #: builtin/branch.c:235
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s（曾为 %s）。\n"
- #: builtin/branch.c:239
+ #: builtin/branch.c:240
msgid "Update of config-file failed"
msgstr "无法更新 config 文件"
- #: builtin/branch.c:337
+ #: builtin/branch.c:338
#, c-format
msgid "branch '%s' does not point at a commit"
msgstr "分支 '%s' 未指向一个提交"
- #: builtin/branch.c:409
+ #: builtin/branch.c:410
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s：落后 %d]"
- #: builtin/branch.c:411
+ #: builtin/branch.c:412
#, c-format
msgid "[behind %d]"
msgstr "[落后 %d]"
- #: builtin/branch.c:415
+ #: builtin/branch.c:416
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s：领先 %d]"
- #: builtin/branch.c:417
+ #: builtin/branch.c:418
#, c-format
msgid "[ahead %d]"
msgstr "[领先 %d]"
- #: builtin/branch.c:420
+ #: builtin/branch.c:421
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s：领先 %d，落后 %d]"
- #: builtin/branch.c:423
+ #: builtin/branch.c:424
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[领先 %d，落后 %d]"
- #: builtin/branch.c:535
+ #: builtin/branch.c:537
msgid "(no branch)"
msgstr "（非分支）"
- #: builtin/branch.c:600
+ #: builtin/branch.c:602
msgid "some refs could not be read"
msgstr "一些引用不能读取"
- #: builtin/branch.c:613
+ #: builtin/branch.c:615
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
- #: builtin/branch.c:623
+ #: builtin/branch.c:625
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名：'%s'"
- #: builtin/branch.c:638
+ #: builtin/branch.c:640
msgid "Branch rename failed"
msgstr "分支重命名失败"
- #: builtin/branch.c:642
+ #: builtin/branch.c:644
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "重命名掉一个错误命名的旧分支 '%s'"
- #: builtin/branch.c:646
+ #: builtin/branch.c:648
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s，但 HEAD 没有更新！"
- #: builtin/branch.c:653
+ #: builtin/branch.c:655
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名，但更新 config 文件失败"
- #: builtin/branch.c:668
+ #: builtin/branch.c:670
#, c-format
msgid "malformed object name %s"
msgstr "非法的对象名 %s"
- #: builtin/branch.c:692
+ #: builtin/branch.c:694
#, c-format
msgid "could not write branch description template: %s"
msgstr "不能写分支描述模版：%s"
- #: builtin/branch.c:783
+ #: builtin/branch.c:724
+ #, fuzzy
+ msgid "Generic options"
+ msgstr "无效选项：%s"
+
+ #: builtin/branch.c:726
+ msgid "show hash and subject, give twice for upstream branch"
+ msgstr ""
+
+ #: builtin/branch.c:727
+ msgid "suppress informational messages"
+ msgstr ""
+
+ #: builtin/branch.c:728
+ msgid "set up tracking mode (see git-pull(1))"
+ msgstr ""
+
+ #: builtin/branch.c:730
+ msgid "change upstream info"
+ msgstr ""
+
+ #: builtin/branch.c:734
+ #, fuzzy
+ msgid "use colored output"
+ msgstr "不能输出重定向"
+
+ #: builtin/branch.c:735
+ #, fuzzy
+ msgid "act on remote-tracking branches"
+ msgstr "%s 没有来自 %s 的远程跟踪分支"
+
+ #: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765
+ #: builtin/branch.c:771 builtin/commit.c:1395 builtin/commit.c:1396
+ #: builtin/commit.c:1397 builtin/commit.c:1398 builtin/tag.c:470
+ #, fuzzy
+ msgid "commit"
+ msgstr "（坏提交）\n"
+
+ #: builtin/branch.c:739 builtin/branch.c:745
+ msgid "print only branches that contain the commit"
+ msgstr ""
+
+ #: builtin/branch.c:751
+ msgid "Specific git-branch actions:"
+ msgstr ""
+
+ #: builtin/branch.c:752
+ msgid "list both remote-tracking and local branches"
+ msgstr ""
+
+ #: builtin/branch.c:754
+ msgid "delete fully merged branch"
+ msgstr ""
+
+ #: builtin/branch.c:755
+ msgid "delete branch (even if not merged)"
+ msgstr ""
+
+ #: builtin/branch.c:756
+ msgid "move/rename a branch and its reflog"
+ msgstr ""
+
+ #: builtin/branch.c:757
+ msgid "move/rename a branch, even if target exists"
+ msgstr ""
+
+ #: builtin/branch.c:758
+ #, fuzzy
+ msgid "list branch names"
+ msgstr "无效的分支名：'%s'"
+
+ #: builtin/branch.c:759
+ msgid "create the branch's reflog"
+ msgstr ""
+
+ #: builtin/branch.c:761
+ msgid "edit the description for the branch"
+ msgstr ""
+
+ #: builtin/branch.c:762
+ #, fuzzy
+ msgid "force creation (when already exists)"
+ msgstr "远程 %s 已经存在。"
+
+ #: builtin/branch.c:765
+ #, fuzzy
+ msgid "print only not merged branches"
+ msgstr "无法移除分支 %s"
+
+ #: builtin/branch.c:771
+ msgid "print only merged branches"
+ msgstr ""
+
+ #: builtin/branch.c:775
+ msgid "list branches in columns"
+ msgstr ""
+
+ #: builtin/branch.c:788
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
- #: builtin/branch.c:788 builtin/clone.c:561
+ #: builtin/branch.c:793 builtin/clone.c:561
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
- #: builtin/branch.c:808
+ #: builtin/branch.c:813
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
- #: builtin/branch.c:857
+ #: builtin/branch.c:864
+ #, fuzzy, c-format
+ msgid "branch '%s' does not exist"
+ msgstr "版本库 '%s' 不存在"
+
+ #: builtin/branch.c:876
+ #, c-format
+ msgid "Branch '%s' has no upstream information"
+ msgstr ""
+
+ #: builtin/branch.c:891
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
+ #: builtin/branch.c:894
+ #, c-format
+ msgid ""
+ "The --set-upstream flag is deprecated and will be removed. Consider using --"
+ "track or --set-upstream-to\n"
+ msgstr ""
+
+ #: builtin/branch.c:911
+ #, c-format
+ msgid ""
+ "\n"
+ "If you wanted to make '%s' track '%s', do this:\n"
+ "\n"
+ msgstr ""
+
+ #: builtin/branch.c:912
+ #, fuzzy, c-format
+ msgid " git branch -d %s\n"
+ msgstr " HEAD分支：%s"
+
+ #: builtin/branch.c:913
+ #, c-format
+ msgid " git branch --set-upstream-to %s\n"
+ msgstr ""
+
#: builtin/bundle.c:47
#, c-format
msgid "%s is okay\n"
msgid "Need a repository to unbundle."
msgstr "需要一个版本库来解包。"
- #: builtin/checkout.c:114 builtin/checkout.c:147
+ #: builtin/cat-file.c:247
+ msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
+ msgstr ""
+
+ #: builtin/cat-file.c:248
+ msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
+ msgstr ""
+
+ #: builtin/cat-file.c:266
+ msgid "<type> can be one of: blob, tree, commit, tag"
+ msgstr ""
+
+ #: builtin/cat-file.c:267
+ #, fuzzy
+ msgid "show object type"
+ msgstr "坏的对象类型。"
+
+ #: builtin/cat-file.c:268
+ #, fuzzy
+ msgid "show object size"
+ msgstr "坏对象 %s"
+
+ #: builtin/cat-file.c:270
+ msgid "exit with zero when there's no error"
+ msgstr ""
+
+ #: builtin/cat-file.c:271
+ msgid "pretty-print object's content"
+ msgstr ""
+
+ #: builtin/cat-file.c:273
+ msgid "for blob objects, run textconv on object's content"
+ msgstr ""
+
+ #: builtin/cat-file.c:275
+ msgid "show info and content of objects fed from the standard input"
+ msgstr ""
+
+ #: builtin/cat-file.c:278
+ #, fuzzy
+ msgid "show info about objects fed from the standard input"
+ msgstr "不能从标准输入中读取日志信息"
+
+ #: builtin/check-attr.c:11
+ msgid "git check-attr [-a | --all | attr...] [--] pathname..."
+ msgstr ""
+
+ #: builtin/check-attr.c:12
+ msgid "git check-attr --stdin [-a | --all | attr...] < <list-of-paths>"
+ msgstr ""
+
+ #: builtin/check-attr.c:19
+ msgid "report all attributes set on file"
+ msgstr ""
+
+ #: builtin/check-attr.c:20
+ msgid "use .gitattributes only from the index"
+ msgstr ""
+
+ #: builtin/check-attr.c:21 builtin/hash-object.c:75
+ #, fuzzy
+ msgid "read file names from stdin"
+ msgstr "（正从标准输入中读取日志信息）\n"
+
+ #: builtin/check-attr.c:23
+ #, fuzzy
+ msgid "input paths are terminated by a null character"
+ msgstr "路径以 NUL 字符分隔"
+
+ #: builtin/checkout-index.c:126
+ msgid "git checkout-index [options] [--] [<file>...]"
+ msgstr ""
+
+ #: builtin/checkout-index.c:187
+ msgid "check out all files in the index"
+ msgstr ""
+
+ #: builtin/checkout-index.c:188
+ msgid "force overwrite of existing files"
+ msgstr ""
+
+ #: builtin/checkout-index.c:190
+ msgid "no warning for existing files and files not in index"
+ msgstr ""
+
+ #: builtin/checkout-index.c:192
+ #, fuzzy
+ msgid "don't checkout new files"
+ msgstr "不能检出 %s"
+
+ #: builtin/checkout-index.c:194
+ #, fuzzy
+ msgid "update stat information in the index file"
+ msgstr "无法写新的索引文件"
+
+ #: builtin/checkout-index.c:200
+ #, fuzzy
+ msgid "read list of paths from the standard input"
+ msgstr "（正从标准输入中读取日志信息）\n"
+
+ #: builtin/checkout-index.c:202
+ msgid "write the content to temporary files"
+ msgstr ""
+
+ #: builtin/checkout-index.c:203 builtin/column.c:30
+ msgid "string"
+ msgstr ""
+
+ #: builtin/checkout-index.c:204
+ msgid "when creating files, prepend <string>"
+ msgstr ""
+
+ #: builtin/checkout-index.c:207
+ msgid "copy out the files from named stage"
+ msgstr ""
+
+ #: builtin/checkout.c:25
+ #, fuzzy
+ msgid "git checkout [options] <branch>"
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/checkout.c:26
+ #, fuzzy
+ msgid "git checkout [options] [<branch>] -- <file>..."
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/checkout.c:116 builtin/checkout.c:149
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
- #: builtin/checkout.c:116 builtin/checkout.c:149
+ #: builtin/checkout.c:118 builtin/checkout.c:151
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
- #: builtin/checkout.c:132
+ #: builtin/checkout.c:134
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必须的版本"
- #: builtin/checkout.c:176
+ #: builtin/checkout.c:178
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必须的版本"
- #: builtin/checkout.c:193
+ #: builtin/checkout.c:195
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s'：无法合并"
- #: builtin/checkout.c:210
+ #: builtin/checkout.c:212
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
- #: builtin/checkout.c:235 builtin/checkout.c:392
+ #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
+ #: builtin/checkout.c:245
+ #, fuzzy, c-format
+ msgid "'%s' cannot be used with updating paths"
+ msgstr "%s：%s 不能和 %s 同时使用"
+
+ #: builtin/checkout.c:248 builtin/checkout.c:251
+ #, fuzzy, c-format
+ msgid "'%s' cannot be used with %s"
+ msgstr "%s：%s 不能和 %s 同时使用"
+
+ #: builtin/checkout.c:254
+ #, c-format
+ msgid "Cannot update paths and switch to branch '%s' at the same time."
+ msgstr ""
+
+ #: builtin/checkout.c:265 builtin/checkout.c:426
msgid "corrupt index file"
msgstr "损坏的索引文件"
- #: builtin/checkout.c:265 builtin/checkout.c:272
+ #: builtin/checkout.c:295 builtin/checkout.c:302
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
- #: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586
+ #: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586
#: builtin/merge.c:811
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
- #: builtin/checkout.c:414
+ #: builtin/checkout.c:448
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
- #: builtin/checkout.c:533
+ #: builtin/checkout.c:569
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr "不能对 '%s' 执行 reflog 操作\n"
- #: builtin/checkout.c:566
+ #: builtin/checkout.c:602
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
- #: builtin/checkout.c:573
+ #: builtin/checkout.c:609
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
- #: builtin/checkout.c:576
+ #: builtin/checkout.c:612
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
- #: builtin/checkout.c:580
+ #: builtin/checkout.c:616
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
- #: builtin/checkout.c:582
+ #: builtin/checkout.c:618
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
- #: builtin/checkout.c:584
+ #: builtin/checkout.c:620
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
- #: builtin/checkout.c:640
+ #: builtin/checkout.c:676
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
#. The singular version
- #: builtin/checkout.c:646
+ #: builtin/checkout.c:682
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
- #: builtin/checkout.c:664
+ #: builtin/checkout.c:700
#, 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:694
+ #: builtin/checkout.c:730
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
- #: builtin/checkout.c:698
+ #: builtin/checkout.c:734
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
- #: builtin/checkout.c:724 builtin/checkout.c:919
+ #: builtin/checkout.c:761 builtin/checkout.c:950
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
#. case (1)
- #: builtin/checkout.c:855
+ #: builtin/checkout.c:886
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
#. case (1): want a tree
- #: builtin/checkout.c:894
+ #: builtin/checkout.c:925
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
- #: builtin/checkout.c:976
- msgid "-B cannot be used with -b"
- msgstr "-B 不能和 -b 同时使用"
+ #: builtin/checkout.c:961
+ #, fuzzy
+ msgid "paths cannot be used with switching branches"
+ msgstr "--ours/--theirs 和切换分支不兼容。"
+
+ #: builtin/checkout.c:964 builtin/checkout.c:968
+ #, fuzzy, c-format
+ msgid "'%s' cannot be used with switching branches"
+ msgstr "%s：%s 不能和 %s 同时使用"
- #: builtin/checkout.c:985
- msgid "--patch is incompatible with all other options"
- msgstr "--patch 选项和其他选项不兼容"
+ #: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980
+ #: builtin/checkout.c:983
+ #, fuzzy, c-format
+ msgid "'%s' cannot be used with '%s'"
+ msgstr "%s：%s 不能和 %s 同时使用"
#: builtin/checkout.c:988
- msgid "--detach cannot be used with -b/-B/--orphan"
- msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
+ #, fuzzy, c-format
+ msgid "Cannot switch branch to a non-commit '%s'"
+ msgstr "无法切换分支到一个非提交。"
- #: builtin/checkout.c:990
- msgid "--detach cannot be used with -t"
- msgstr "--detach 不能和 -t 同时使用"
+ #: builtin/checkout.c:1009 builtin/gc.c:177
+ msgid "suppress progress reporting"
+ msgstr ""
- #: builtin/checkout.c:996
- msgid "--track needs a branch name"
- msgstr "--track 需要一个分支名"
+ #: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89
+ #: builtin/remote.c:169 builtin/remote.c:171
+ #, fuzzy
+ msgid "branch"
+ msgstr "位于分支 "
- #: builtin/checkout.c:1003
- msgid "Missing branch name; try -b"
- msgstr "缺少分支名；尝试 -b"
+ #: builtin/checkout.c:1011
+ msgid "create and checkout a new branch"
+ msgstr ""
- #: builtin/checkout.c:1009
- msgid "--orphan and -b|-B are mutually exclusive"
- msgstr "--orphan 和 -b|-B 互斥"
+ #: builtin/checkout.c:1013
+ msgid "create/reset and checkout a branch"
+ msgstr ""
- #: builtin/checkout.c:1011
- msgid "--orphan cannot be used with -t"
- msgstr "--orphan 不能和 -t 同时使用"
+ #: builtin/checkout.c:1014
+ #, fuzzy
+ msgid "create reflog for new branch"
+ msgstr "列出、创建或删除分支"
+
+ #: builtin/checkout.c:1015
+ msgid "detach the HEAD at named commit"
+ msgstr ""
+
+ #: builtin/checkout.c:1016
+ #, fuzzy
+ msgid "set upstream info for new branch"
+ msgstr "尚未给分支 '%s' 设置上游"
+
+ #: builtin/checkout.c:1018
+ #, fuzzy
+ msgid "new branch"
+ msgstr "[新分支]"
+
+ #: builtin/checkout.c:1018
+ #, fuzzy
+ msgid "new unparented branch"
+ msgstr "没有当前分支。"
+
+ #: builtin/checkout.c:1019
+ msgid "checkout our version for unmerged files"
+ msgstr ""
#: builtin/checkout.c:1021
- msgid "git checkout: -f and -m are incompatible"
- msgstr "git checkout：-f 和 -m 不兼容"
+ msgid "checkout their version for unmerged files"
+ msgstr ""
+
+ #: builtin/checkout.c:1023
+ msgid "force checkout (throw away local modifications)"
+ msgstr ""
- #: builtin/checkout.c:1055
+ #: builtin/checkout.c:1024
+ msgid "perform a 3-way merge with the new branch"
+ msgstr ""
+
+ #: builtin/checkout.c:1025 builtin/merge.c:215
+ #, fuzzy
+ msgid "update ignored files (default)"
+ msgstr "更新文件失败"
+
+ #: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241
+ msgid "style"
+ msgstr ""
+
+ #: builtin/checkout.c:1027
+ msgid "conflict style (merge or diff3)"
+ msgstr ""
+
+ #: builtin/checkout.c:1030
+ msgid "second guess 'git checkout no-such-branch'"
+ msgstr ""
+
+ #: builtin/checkout.c:1054
+ #, fuzzy
+ msgid "-b, -B and --orphan are mutually exclusive"
+ msgstr "-n 和 -k 互斥。"
+
+ #: builtin/checkout.c:1071
+ msgid "--track needs a branch name"
+ msgstr "--track 需要一个分支名"
+
+ #: builtin/checkout.c:1078
+ msgid "Missing branch name; try -b"
+ msgstr "缺少分支名；尝试 -b"
+
+ #: builtin/checkout.c:1113
msgid "invalid path specification"
msgstr "无效的路径规格"
- #: builtin/checkout.c:1063
- #, c-format
+ #: builtin/checkout.c:1120
+ #, fuzzy, c-format
msgid ""
- "git checkout: updating paths is incompatible with switching branches.\n"
+ "Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
"git checkout：更新路径和切换分支不兼容。\n"
"您是想要检出 '%s' 但未能将其解析为提交么？"
- #: builtin/checkout.c:1065
- msgid "git checkout: updating paths is incompatible with switching branches."
- msgstr "git checkout：更新路径和切换分支不兼容。"
-
- #: builtin/checkout.c:1070
- msgid "git checkout: --detach does not take a path argument"
+ #: builtin/checkout.c:1125
+ #, fuzzy, c-format
+ msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不跟路径参数"
- #: builtin/checkout.c:1073
+ #: builtin/checkout.c:1129
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:1092
- msgid "Cannot switch branch to a non-commit."
- msgstr "无法切换分支到一个非提交。"
+ #: builtin/clean.c:19
+ msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+ msgstr ""
- #: builtin/checkout.c:1095
- msgid "--ours/--theirs is incompatible with switching branches."
- msgstr "--ours/--theirs 和切换分支不兼容。"
+ #: builtin/clean.c:51
+ msgid "do not print names of files removed"
+ msgstr ""
+
+ #: builtin/clean.c:53
+ msgid "force"
+ msgstr ""
+
+ #: builtin/clean.c:55
+ #, fuzzy
+ msgid "remove whole directories"
+ msgstr "两个输出目录？"
+
+ #: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:802
+ #: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199
+ msgid "pattern"
+ msgstr ""
+
+ #: builtin/clean.c:57
+ msgid "add <pattern> to ignore rules"
+ msgstr ""
+
+ #: builtin/clean.c:58
+ msgid "remove ignored files, too"
+ msgstr ""
+
+ #: builtin/clean.c:60
+ msgid "remove only ignored files"
+ msgstr ""
#: builtin/clean.c:78
msgid "-x and -X cannot be used together"
msgid "Not removing %s\n"
msgstr "未删除 %s\n"
+ #: builtin/clone.c:36
+ msgid "git clone [options] [--] <repo> [<dir>]"
+ msgstr ""
+
+ #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
+ #: builtin/push.c:399
+ msgid "force progress reporting"
+ msgstr ""
+
+ #: builtin/clone.c:66
+ msgid "don't create a checkout"
+ msgstr ""
+
+ #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
+ #, fuzzy
+ msgid "create a bare repository"
+ msgstr "不是一个 git 版本库"
+
+ #: builtin/clone.c:72
+ msgid "create a mirror repository (implies bare)"
+ msgstr ""
+
+ #: builtin/clone.c:74
+ msgid "to clone from a local repository"
+ msgstr ""
+
+ #: builtin/clone.c:76
+ msgid "don't use local hardlinks, always copy"
+ msgstr ""
+
+ #: builtin/clone.c:78
+ #, fuzzy
+ msgid "setup as shared repository"
+ msgstr "不是一个 git 版本库"
+
+ #: builtin/clone.c:80 builtin/clone.c:82
+ msgid "initialize submodules in the clone"
+ msgstr ""
+
+ #: builtin/clone.c:83 builtin/init-db.c:485
+ #, fuzzy
+ msgid "template-directory"
+ msgstr "文件/目录"
+
+ #: builtin/clone.c:84 builtin/init-db.c:486
+ msgid "directory from which templates will be used"
+ msgstr ""
+
+ #: builtin/clone.c:86
+ msgid "reference repository"
+ msgstr ""
+
+ #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
+ #, fuzzy
+ msgid "name"
+ msgstr "重命名"
+
+ #: builtin/clone.c:88
+ msgid "use <name> instead of 'origin' to track upstream"
+ msgstr ""
+
+ #: builtin/clone.c:90
+ msgid "checkout <branch> instead of the remote's HEAD"
+ msgstr ""
+
+ #: builtin/clone.c:92
+ msgid "path to git-upload-pack on the remote"
+ msgstr ""
+
+ #: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:747
+ msgid "depth"
+ msgstr ""
+
+ #: builtin/clone.c:94
+ msgid "create a shallow clone of that depth"
+ msgstr ""
+
+ #: builtin/clone.c:96
+ msgid "clone only one branch, HEAD or --branch"
+ msgstr ""
+
+ #: builtin/clone.c:97 builtin/init-db.c:494
+ msgid "gitdir"
+ msgstr ""
+
+ #: builtin/clone.c:98 builtin/init-db.c:495
+ msgid "separate git dir from working tree"
+ msgstr ""
+
+ #: builtin/clone.c:99
+ msgid "key=value"
+ msgstr ""
+
+ #: builtin/clone.c:100
+ #, fuzzy
+ msgid "set config inside the new repository"
+ msgstr "记录变更到版本库"
+
#: builtin/clone.c:243
#, c-format
msgid "reference repository '%s' is not a local directory."
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空版本库。"
+ #: builtin/column.c:9
+ msgid "git column [options]"
+ msgstr ""
+
+ #: builtin/column.c:26
+ msgid "lookup config vars"
+ msgstr ""
+
+ #: builtin/column.c:27 builtin/column.c:28
+ #, fuzzy
+ msgid "layout to use"
+ msgstr "本地已过时"
+
+ #: builtin/column.c:29
+ msgid "Maximum width"
+ msgstr ""
+
+ #: builtin/column.c:30
+ msgid "Padding space on left border"
+ msgstr ""
+
+ #: builtin/column.c:31
+ msgid "Padding space on right border"
+ msgstr ""
+
+ #: builtin/column.c:32
+ msgid "Padding space between columns"
+ msgstr ""
+
#: builtin/column.c:51
msgid "--command must be the first argument"
msgstr "--command 必须是第一个参数"
+ #: builtin/commit.c:33
+ #, fuzzy
+ msgid "git commit [options] [--] <filepattern>..."
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/commit.c:38
+ #, fuzzy
+ msgid "git status [options] [--] <filepattern>..."
+ msgstr "git apply [选项] [<补丁>...]"
+
#: builtin/commit.c:43
msgid ""
"Your name and email address were configured automatically based\n"
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
- #: builtin/commit.c:496 builtin/commit.c:502
+ #: builtin/commit.c:510 builtin/commit.c:516
#, c-format
msgid "invalid commit: %s"
msgstr "无效的提交：%s"
- #: builtin/commit.c:525
+ #: builtin/commit.c:539
msgid "malformed --author parameter"
msgstr "非法的 --author 参数"
- #: builtin/commit.c:585
+ #: builtin/commit.c:600
#, c-format
msgid "Malformed ident string: '%s'"
msgstr "非法的身份字符串：'%s'"
- #: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970
+ #: builtin/commit.c:638 builtin/commit.c:671 builtin/commit.c:985
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
- #: builtin/commit.c:635 builtin/shortlog.c:296
+ #: builtin/commit.c:650 builtin/shortlog.c:296
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正从标准输入中读取日志信息）\n"
- #: builtin/commit.c:637
+ #: builtin/commit.c:652
msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息"
- #: builtin/commit.c:641
+ #: builtin/commit.c:656
#, c-format
msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'"
- #: builtin/commit.c:647
+ #: builtin/commit.c:662
msgid "commit has empty message"
msgstr "提交说明为空"
- #: builtin/commit.c:663
+ #: builtin/commit.c:678
msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG"
- #: builtin/commit.c:667
+ #: builtin/commit.c:682
msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG"
- #: builtin/commit.c:671
+ #: builtin/commit.c:686
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
- #: builtin/commit.c:723
+ #: builtin/commit.c:738
msgid "could not write commit template"
msgstr "不能写提交模版"
- #: builtin/commit.c:734
+ #: builtin/commit.c:749
#, c-format
msgid ""
"\n"
"\t%s\n"
"然后重试。\n"
- #: builtin/commit.c:739
+ #: builtin/commit.c:754
#, c-format
msgid ""
"\n"
"\t%s\n"
"然后重试。\n"
- #: builtin/commit.c:751
+ #: builtin/commit.c:766
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n"
"请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交\n"
"说明将会终止提交。\n"
- #: builtin/commit.c:756
+ #: builtin/commit.c:771
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"
"如果您想这样做的话。而一个空的提交说明将会终止提交。\n"
# 译者：为保证在输出中对齐，注意调整句中空格！
- #: builtin/commit.c:769
+ #: builtin/commit.c:784
#, c-format
msgid "%sAuthor: %s"
msgstr "%s作者： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
- #: builtin/commit.c:776
+ #: builtin/commit.c:791
#, c-format
msgid "%sCommitter: %s"
msgstr "%s提交者： %s"
- #: builtin/commit.c:796
+ #: builtin/commit.c:811
msgid "Cannot read index"
msgstr "无法读取索引"
- #: builtin/commit.c:833
+ #: builtin/commit.c:848
msgid "Error building trees"
msgstr "无法创建树对象"
- #: builtin/commit.c:848 builtin/tag.c:361
+ #: builtin/commit.c:863 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:945
+ #: builtin/commit.c:960
#, c-format
msgid "No existing author found with '%s'"
msgstr "没有找到匹配 '%s' 的作者"
- #: builtin/commit.c:960 builtin/commit.c:1160
+ #: builtin/commit.c:975 builtin/commit.c:1175
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
- #: builtin/commit.c:1000
+ #: builtin/commit.c:1015
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
- #: builtin/commit.c:1011
+ #: builtin/commit.c:1026
msgid "You have nothing to amend."
msgstr "您没有可修补的提交。"
- #: builtin/commit.c:1014
+ #: builtin/commit.c:1029
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
- #: builtin/commit.c:1016
+ #: builtin/commit.c:1031
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
- #: builtin/commit.c:1019
+ #: builtin/commit.c:1034
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能同时使用"
- #: builtin/commit.c:1029
+ #: builtin/commit.c:1044
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
- #: builtin/commit.c:1031
+ #: builtin/commit.c:1046
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
- #: builtin/commit.c:1039
+ #: builtin/commit.c:1054
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
- #: builtin/commit.c:1056
+ #: builtin/commit.c:1071
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
- #: builtin/commit.c:1058
+ #: builtin/commit.c:1073
msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。"
- #: builtin/commit.c:1060
+ #: builtin/commit.c:1075
msgid "Clever... amending the last one with dirty index."
msgstr "聪明... 在索引不干净下修补最后的提交。"
- #: builtin/commit.c:1062
+ #: builtin/commit.c:1077
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."
- #: builtin/commit.c:1072 builtin/tag.c:577
+ #: builtin/commit.c:1087 builtin/tag.c:577
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
- #: builtin/commit.c:1077
+ #: builtin/commit.c:1092
msgid "Paths with -a does not make sense."
msgstr "路径和 -a 选项同时使用没有意义。"
- #: builtin/commit.c:1260
+ #: builtin/commit.c:1189 builtin/commit.c:1417
+ msgid "show status concisely"
+ msgstr ""
+
+ #: builtin/commit.c:1191 builtin/commit.c:1419
+ msgid "show branch information"
+ msgstr ""
+
+ #: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389
+ msgid "machine-readable output"
+ msgstr ""
+
+ #: builtin/commit.c:1196 builtin/commit.c:1423
+ msgid "terminate entries with NUL"
+ msgstr ""
+
+ #: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636
+ #: builtin/fast-export.c:639 builtin/tag.c:461
+ msgid "mode"
+ msgstr ""
+
+ #: builtin/commit.c:1199 builtin/commit.c:1426
+ msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+ msgstr ""
+
+ #: builtin/commit.c:1202
+ msgid "show ignored files"
+ msgstr ""
+
+ #: builtin/commit.c:1203 parse-options.h:151
+ msgid "when"
+ msgstr "何时"
+
+ #: builtin/commit.c:1204
+ msgid ""
+ "ignore changes to submodules, optional when: all, dirty, untracked. "
+ "(Default: all)"
+ msgstr ""
+
+ #: builtin/commit.c:1206
+ #, fuzzy
+ msgid "list untracked files in columns"
+ msgstr "无效的未追踪文件参数 '%s'"
+
+ #: builtin/commit.c:1275
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
- #: builtin/commit.c:1262
+ #: builtin/commit.c:1277
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
- #: builtin/commit.c:1303
+ #: builtin/commit.c:1318
msgid "detached HEAD"
msgstr "分离头指针"
# 译者：中文字符串拼接，可删除前导空格
- #: builtin/commit.c:1305
+ #: builtin/commit.c:1320
msgid " (root-commit)"
msgstr "（根提交）"
- #: builtin/commit.c:1449
- msgid "could not parse HEAD commit"
- msgstr "不能解析 HEAD 提交"
+ #: builtin/commit.c:1387
+ msgid "suppress summary after successful commit"
+ msgstr ""
- #: builtin/commit.c:1487 builtin/merge.c:508
- #, c-format
- msgid "could not open '%s' for reading"
- msgstr "不能为读入打开 '%s'"
+ #: builtin/commit.c:1388
+ msgid "show diff in commit message template"
+ msgstr ""
- #: builtin/commit.c:1494
- #, c-format
- msgid "Corrupt MERGE_HEAD file (%s)"
- msgstr "损坏的 MERGE_HEAD 文件（%s）"
+ #: builtin/commit.c:1390
+ #, fuzzy
+ msgid "Commit message options"
+ msgstr "不能得到 %s 的提交说明"
- #: builtin/commit.c:1501
- msgid "could not read MERGE_MODE"
- msgstr "不能读取 MERGE_MODE"
+ #: builtin/commit.c:1391 builtin/tag.c:459
+ msgid "read message from file"
+ msgstr ""
- #: builtin/commit.c:1520
- #, c-format
- msgid "could not read commit message: %s"
- msgstr "不能读取提交说明：%s"
+ #: builtin/commit.c:1392
+ msgid "author"
+ msgstr ""
- #: builtin/commit.c:1534
- #, c-format
- msgid "Aborting commit; you did not edit the message.\n"
- msgstr "终止提交；您未更改来自模版的提交说明。\n"
+ #: builtin/commit.c:1392
+ #, fuzzy
+ msgid "override author for commit"
+ msgstr "合并未返回提交"
- #: builtin/commit.c:1539
- #, c-format
- msgid "Aborting commit due to empty commit message.\n"
- msgstr "终止提交因为提交说明为空。\n"
+ #: builtin/commit.c:1393 builtin/gc.c:178
+ msgid "date"
+ msgstr ""
- #: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960
- msgid "failed to write commit object"
- msgstr "无法写提交对象"
+ #: builtin/commit.c:1393
+ #, fuzzy
+ msgid "override date for commit"
+ msgstr "合并未返回提交"
- #: builtin/commit.c:1575
- msgid "cannot lock HEAD ref"
- msgstr "无法锁定 HEAD 引用"
+ #: builtin/commit.c:1394 builtin/merge.c:206 builtin/notes.c:534
+ #: builtin/notes.c:691 builtin/tag.c:457
+ #, fuzzy
+ msgid "message"
+ msgstr "无 tag 说明？"
- #: builtin/commit.c:1579
+ #: builtin/commit.c:1394
+ #, fuzzy
+ msgid "commit message"
+ msgstr "空提交信息。"
+
+ #: builtin/commit.c:1395
+ msgid "reuse and edit message from specified commit"
+ msgstr ""
+
+ #: builtin/commit.c:1396
+ msgid "reuse message from specified commit"
+ msgstr ""
+
+ #: builtin/commit.c:1397
+ msgid "use autosquash formatted message to fixup specified commit"
+ msgstr ""
+
+ #: builtin/commit.c:1398
+ msgid "use autosquash formatted message to squash specified commit"
+ msgstr ""
+
+ #: builtin/commit.c:1399
+ msgid "the commit is authored by me now (used with -C/-c/--amend)"
+ msgstr ""
+
+ #: builtin/commit.c:1400 builtin/log.c:1068 builtin/revert.c:109
+ msgid "add Signed-off-by:"
+ msgstr ""
+
+ #: builtin/commit.c:1401
+ msgid "use specified template file"
+ msgstr ""
+
+ #: builtin/commit.c:1402
+ #, fuzzy
+ msgid "force edit of commit"
+ msgstr "合并未返回提交"
+
+ #: builtin/commit.c:1403
+ msgid "default"
+ msgstr ""
+
+ #: builtin/commit.c:1403 builtin/tag.c:462
+ msgid "how to strip spaces and #comments from message"
+ msgstr ""
+
+ #: builtin/commit.c:1404
+ #, fuzzy
+ msgid "include status in commit message template"
+ msgstr "不能写提交模版"
+
+ #: builtin/commit.c:1405 builtin/merge.c:213 builtin/tag.c:463
+ msgid "key id"
+ msgstr ""
+
+ #: builtin/commit.c:1406 builtin/merge.c:214
+ msgid "GPG sign commit"
+ msgstr ""
+
+ #. end commit message options
+ #: builtin/commit.c:1409
+ msgid "Commit contents options"
+ msgstr ""
+
+ #: builtin/commit.c:1410
+ msgid "commit all changed files"
+ msgstr ""
+
+ #: builtin/commit.c:1411
+ msgid "add specified files to index for commit"
+ msgstr ""
+
+ #: builtin/commit.c:1412
+ #, fuzzy
+ msgid "interactively add files"
+ msgstr "交互式添加失败"
+
+ #: builtin/commit.c:1413
+ #, fuzzy
+ msgid "interactively add changes"
+ msgstr "交互式添加失败"
+
+ #: builtin/commit.c:1414
+ #, fuzzy
+ msgid "commit only specified files"
+ msgstr "无法还原修改的文件"
+
+ #: builtin/commit.c:1415
+ msgid "bypass pre-commit hook"
+ msgstr ""
+
+ #: builtin/commit.c:1416
+ #, fuzzy
+ msgid "show what would be committed"
+ msgstr "要提交的变更："
+
+ #: builtin/commit.c:1424
+ msgid "amend previous commit"
+ msgstr ""
+
+ #: builtin/commit.c:1425
+ msgid "bypass post-rewrite hook"
+ msgstr ""
+
+ #: builtin/commit.c:1430
+ msgid "ok to record an empty change"
+ msgstr ""
+
+ #: builtin/commit.c:1433
+ msgid "ok to record a change with an empty message"
+ msgstr ""
+
+ #: builtin/commit.c:1464
+ msgid "could not parse HEAD commit"
+ msgstr "不能解析 HEAD 提交"
+
+ #: builtin/commit.c:1502 builtin/merge.c:508
+ #, c-format
+ msgid "could not open '%s' for reading"
+ msgstr "不能为读入打开 '%s'"
+
+ #: builtin/commit.c:1509
+ #, c-format
+ msgid "Corrupt MERGE_HEAD file (%s)"
+ msgstr "损坏的 MERGE_HEAD 文件（%s）"
+
+ #: builtin/commit.c:1516
+ msgid "could not read MERGE_MODE"
+ msgstr "不能读取 MERGE_MODE"
+
+ #: builtin/commit.c:1535
+ #, c-format
+ msgid "could not read commit message: %s"
+ msgstr "不能读取提交说明：%s"
+
+ #: builtin/commit.c:1549
+ #, c-format
+ msgid "Aborting commit; you did not edit the message.\n"
+ msgstr "终止提交；您未更改来自模版的提交说明。\n"
+
+ #: builtin/commit.c:1554
+ #, c-format
+ msgid "Aborting commit due to empty commit message.\n"
+ msgstr "终止提交因为提交说明为空。\n"
+
+ #: builtin/commit.c:1569 builtin/merge.c:935 builtin/merge.c:960
+ msgid "failed to write commit object"
+ msgstr "无法写提交对象"
+
+ #: builtin/commit.c:1590
+ msgid "cannot lock HEAD ref"
+ msgstr "无法锁定 HEAD 引用"
+
+ #: builtin/commit.c:1594
msgid "cannot update HEAD ref"
msgstr "无法更新 HEAD 引用"
- #: builtin/commit.c:1590
+ #: builtin/commit.c:1605
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
"版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
"或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
+ #: builtin/config.c:7
+ msgid "git config [options]"
+ msgstr ""
+
+ #: builtin/config.c:52
+ msgid "Config file location"
+ msgstr ""
+
+ #: builtin/config.c:53
+ #, fuzzy
+ msgid "use global config file"
+ msgstr "无法更新 config 文件"
+
+ #: builtin/config.c:54
+ msgid "use system config file"
+ msgstr ""
+
+ #: builtin/config.c:55
+ #, fuzzy
+ msgid "use repository config file"
+ msgstr "需要一个版本库来解包。"
+
+ #: builtin/config.c:56
+ #, fuzzy
+ msgid "use given config file"
+ msgstr "未预期的文件结束"
+
+ #: builtin/config.c:57
+ #, fuzzy
+ msgid "Action"
+ msgstr "动作"
+
+ #: builtin/config.c:58
+ msgid "get value: name [value-regex]"
+ msgstr ""
+
+ #: builtin/config.c:59
+ msgid "get all values: key [value-regex]"
+ msgstr ""
+
+ #: builtin/config.c:60
+ msgid "get values for regexp: name-regex [value-regex]"
+ msgstr ""
+
+ #: builtin/config.c:61
+ msgid "replace all matching variables: name value [value_regex]"
+ msgstr ""
+
+ #: builtin/config.c:62
+ msgid "add a new variable: name value"
+ msgstr ""
+
+ #: builtin/config.c:63
+ msgid "remove a variable: name [value-regex]"
+ msgstr ""
+
+ #: builtin/config.c:64
+ msgid "remove all matches: name [value-regex]"
+ msgstr ""
+
+ #: builtin/config.c:65
+ msgid "rename section: old-name new-name"
+ msgstr ""
+
+ #: builtin/config.c:66
+ msgid "remove a section: name"
+ msgstr ""
+
+ #: builtin/config.c:67
+ msgid "list all"
+ msgstr ""
+
+ #: builtin/config.c:68
+ msgid "open an editor"
+ msgstr ""
+
+ #: builtin/config.c:69 builtin/config.c:70
+ msgid "slot"
+ msgstr ""
+
+ #: builtin/config.c:69
+ msgid "find the color configured: [default]"
+ msgstr ""
+
+ #: builtin/config.c:70
+ msgid "find the color setting: [stdout-is-tty]"
+ msgstr ""
+
+ #: builtin/config.c:71
+ msgid "Type"
+ msgstr ""
+
+ #: builtin/config.c:72
+ msgid "value is \"true\" or \"false\""
+ msgstr ""
+
+ #: builtin/config.c:73
+ msgid "value is decimal number"
+ msgstr ""
+
+ #: builtin/config.c:74
+ msgid "value is --bool or --int"
+ msgstr ""
+
+ #: builtin/config.c:75
+ msgid "value is a path (file or directory name)"
+ msgstr ""
+
+ #: builtin/config.c:76
+ msgid "Other"
+ msgstr ""
+
+ #: builtin/config.c:77
+ msgid "terminate values with NUL byte"
+ msgstr ""
+
+ #: builtin/config.c:78
+ msgid "respect include directives on lookup"
+ msgstr ""
+
+ #: builtin/count-objects.c:69
+ msgid "git count-objects [-v]"
+ msgstr ""
+
+ #: builtin/describe.c:15
+ msgid "git describe [options] <committish>*"
+ msgstr ""
+
+ #: builtin/describe.c:16
+ msgid "git describe [options] --dirty"
+ msgstr ""
+
#: builtin/describe.c:234
#, c-format
msgid "annotated tag %s not available"
"发现多于 %i 个 tag，列出最近的 %i 个\n"
"在 %s 放弃搜索\n"
+ #: builtin/describe.c:403
+ msgid "find the tag that comes after the commit"
+ msgstr ""
+
+ #: builtin/describe.c:404
+ msgid "debug search strategy on stderr"
+ msgstr ""
+
+ #: builtin/describe.c:405
+ msgid "use any ref in .git/refs"
+ msgstr ""
+
+ #: builtin/describe.c:406
+ msgid "use any tag in .git/refs/tags"
+ msgstr ""
+
+ #: builtin/describe.c:407
+ msgid "always use long format"
+ msgstr ""
+
+ #: builtin/describe.c:410
+ #, fuzzy
+ msgid "only output exact matches"
+ msgstr "没有 tag 准确匹配 '%s'"
+
+ #: builtin/describe.c:412
+ msgid "consider <n> most recent tags (default: 10)"
+ msgstr ""
+
+ #: builtin/describe.c:414
+ #, fuzzy
+ msgid "only consider tags matching <pattern>"
+ msgstr "输出和模式匹配的行"
+
+ #: builtin/describe.c:416 builtin/name-rev.c:238
+ msgid "show abbreviated commit object as fallback"
+ msgstr ""
+
+ #: builtin/describe.c:417
+ msgid "mark"
+ msgstr ""
+
+ #: builtin/describe.c:418
+ msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+ msgstr ""
+
#: builtin/describe.c:436
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 与 --abbrev=0 不兼容"
msgid "unhandled object '%s' given."
msgstr "提供了无法处理的对象 '%s'。"
- #: builtin/fetch.c:200
+ #: builtin/fast-export.c:22
+ msgid "git fast-export [rev-list-opts]"
+ msgstr ""
+
+ #: builtin/fast-export.c:635
+ #, fuzzy
+ msgid "show progress after <n> objects"
+ msgstr "显示各种类型的对象"
+
+ #: builtin/fast-export.c:637
+ msgid "select handling of signed tags"
+ msgstr ""
+
+ #: builtin/fast-export.c:640
+ msgid "select handling of tags that tag filtered objects"
+ msgstr ""
+
+ #: builtin/fast-export.c:643
+ msgid "Dump marks to this file"
+ msgstr ""
+
+ #: builtin/fast-export.c:645
+ msgid "Import marks from this file"
+ msgstr ""
+
+ #: builtin/fast-export.c:647
+ msgid "Fake a tagger when tags lack one"
+ msgstr ""
+
+ #: builtin/fast-export.c:649
+ msgid "Output full tree for each commit"
+ msgstr ""
+
+ #: builtin/fast-export.c:651
+ msgid "Use the done feature to terminate the stream"
+ msgstr ""
+
+ #: builtin/fast-export.c:652
+ msgid "Skip output of blob data"
+ msgstr ""
+
+ #: builtin/fetch.c:20
+ #, fuzzy
+ msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/fetch.c:21
+ msgid "git fetch [<options>] <group>"
+ msgstr ""
+
+ #: builtin/fetch.c:22
+ msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+ msgstr ""
+
+ #: builtin/fetch.c:23
+ msgid "git fetch --all [<options>]"
+ msgstr ""
+
+ #: builtin/fetch.c:60
+ msgid "fetch from all remotes"
+ msgstr ""
+
+ #: builtin/fetch.c:62
+ msgid "append to .git/FETCH_HEAD instead of overwriting"
+ msgstr ""
+
+ #: builtin/fetch.c:64
+ msgid "path to upload pack on remote end"
+ msgstr ""
+
+ #: builtin/fetch.c:65
+ msgid "force overwrite of local branch"
+ msgstr ""
+
+ #: builtin/fetch.c:67
+ msgid "fetch from multiple remotes"
+ msgstr ""
+
+ #: builtin/fetch.c:69
+ #, fuzzy
+ msgid "fetch all tags and associated objects"
+ msgstr "更新远程引用和相关的对象"
+
+ #: builtin/fetch.c:71
+ msgid "do not fetch all tags (--no-tags)"
+ msgstr ""
+
+ #: builtin/fetch.c:73
+ #, fuzzy
+ msgid "prune remote-tracking branches no longer on remote"
+ msgstr "%s 没有来自 %s 的远程跟踪分支"
+
+ #: builtin/fetch.c:74
+ msgid "on-demand"
+ msgstr ""
+
+ #: builtin/fetch.c:75
+ msgid "control recursive fetching of submodules"
+ msgstr ""
+
+ #: builtin/fetch.c:79
+ msgid "keep downloaded pack"
+ msgstr ""
+
+ #: builtin/fetch.c:81
+ #, fuzzy
+ msgid "allow updating of HEAD ref"
+ msgstr "无法更新 HEAD 引用"
+
+ #: builtin/fetch.c:84
+ msgid "deepen history of shallow clone"
+ msgstr ""
+
+ #: builtin/fetch.c:85 builtin/log.c:1083
+ msgid "dir"
+ msgstr ""
+
+ #: builtin/fetch.c:86
+ #, fuzzy
+ msgid "prepend this to submodule path output"
+ msgstr "无法递归进子模组路径 '$sm_path'"
+
+ #: builtin/fetch.c:89
+ msgid "default mode for recursion"
+ msgstr ""
+
+ #: builtin/fetch.c:201
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
- #: builtin/fetch.c:253
+ #: builtin/fetch.c:254
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"
- #: builtin/fetch.c:259
+ #: builtin/fetch.c:260
msgid "[up to date]"
msgstr "[最新]"
- #: builtin/fetch.c:273
+ #: builtin/fetch.c:274
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"
- #: builtin/fetch.c:274 builtin/fetch.c:360
+ #: builtin/fetch.c:275 builtin/fetch.c:361
msgid "[rejected]"
msgstr "[已拒绝]"
- #: builtin/fetch.c:285
+ #: builtin/fetch.c:286
msgid "[tag update]"
msgstr "[tag更新]"
# 译者：注意保持前导空格
- #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
+ #: builtin/fetch.c:288 builtin/fetch.c:323 builtin/fetch.c:341
msgid " (unable to update local ref)"
msgstr " （不能更新本地引用）"
- #: builtin/fetch.c:305
+ #: builtin/fetch.c:306
msgid "[new tag]"
msgstr "[新tag]"
- #: builtin/fetch.c:308
+ #: builtin/fetch.c:309
msgid "[new branch]"
msgstr "[新分支]"
- #: builtin/fetch.c:311
+ #: builtin/fetch.c:312
msgid "[new ref]"
msgstr "[新引用]"
- #: builtin/fetch.c:356
+ #: builtin/fetch.c:357
msgid "unable to update local ref"
msgstr "不能更新本地引用"
- #: builtin/fetch.c:356
+ #: builtin/fetch.c:357
msgid "forced update"
msgstr "强制更新"
- #: builtin/fetch.c:362
+ #: builtin/fetch.c:363
msgid "(non-fast-forward)"
msgstr "（非快进式）"
- #: builtin/fetch.c:393 builtin/fetch.c:685
+ #: builtin/fetch.c:394 builtin/fetch.c:686
#, c-format
msgid "cannot open %s: %s\n"
msgstr "无法打开 %s：%s\n"
- #: builtin/fetch.c:402
+ #: builtin/fetch.c:403
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必须的对象\n"
- #: builtin/fetch.c:488
+ #: builtin/fetch.c:489
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
- #: builtin/fetch.c:499
+ #: builtin/fetch.c:500
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者：注意保持前导空格
- #: builtin/fetch.c:549
+ #: builtin/fetch.c:550
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 将成为悬空状态）"
# 译者：注意保持前导空格
- #: builtin/fetch.c:550
+ #: builtin/fetch.c:551
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成为悬空状态）"
- #: builtin/fetch.c:557
+ #: builtin/fetch.c:558
msgid "[deleted]"
msgstr "[已删除]"
- #: builtin/fetch.c:558 builtin/remote.c:1055
+ #: builtin/fetch.c:559 builtin/remote.c:1055
msgid "(none)"
msgstr "（无）"
- #: builtin/fetch.c:675
+ #: builtin/fetch.c:676
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非裸版本库的当前分支 %s"
- #: builtin/fetch.c:709
+ #: builtin/fetch.c:710
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "不知道如何从 %s 获取"
- #: builtin/fetch.c:786
+ #: builtin/fetch.c:787
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
- #: builtin/fetch.c:789
+ #: builtin/fetch.c:790
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
- #: builtin/fetch.c:888
+ #: builtin/fetch.c:892
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
- #: builtin/fetch.c:890 builtin/remote.c:100
+ #: builtin/fetch.c:894 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
- #: builtin/fetch.c:907
+ #: builtin/fetch.c:913
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"
- #: builtin/fetch.c:927
+ #: builtin/fetch.c:933
msgid "You need to specify a tag name."
msgstr "您需要指定一个 tag 名称。"
- #: builtin/fetch.c:979
+ #: builtin/fetch.c:985
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个版本库参数"
- #: builtin/fetch.c:981
+ #: builtin/fetch.c:987
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用表达式没有任何意义"
- #: builtin/fetch.c:992
+ #: builtin/fetch.c:998
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组：%s"
- #: builtin/fetch.c:1000
+ #: builtin/fetch.c:1006
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用表达式没有意义"
- #: builtin/gc.c:63
- #, c-format
- msgid "Invalid %s: '%s'"
- msgstr "无效的 %s：'%s'"
+ #: builtin/fmt-merge-msg.c:13
+ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
+ msgstr ""
- #: builtin/gc.c:90
- #, c-format
- msgid "insanely long object directory %.*s"
- msgstr "不正常的长对象目录 %.*s"
+ #: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786
+ #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192
+ #: builtin/tag.c:448 parse-options.h:133 parse-options.h:235
+ msgid "n"
+ msgstr "数字"
- #: builtin/gc.c:221
- #, c-format
- msgid "Auto packing the repository for optimum performance.\n"
- msgstr "自动打包版本库以求最佳性能。\n"
+ #: builtin/fmt-merge-msg.c:654
+ msgid "populate log with at most <n> entries from shortlog"
+ msgstr ""
- #: builtin/gc.c:224
- #, c-format
- msgid ""
- "Auto packing the repository for optimum performance. You may also\n"
- "run \"git gc\" manually. See \"git help gc\" for more information.\n"
+ #: builtin/fmt-merge-msg.c:657
+ msgid "alias for --log (deprecated)"
msgstr ""
- "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
- "参见 \"git help gc\" 以获取更多信息。\n"
+
+ #: builtin/fmt-merge-msg.c:660
+ msgid "text"
+ msgstr ""
+
+ #: builtin/fmt-merge-msg.c:661
+ msgid "use <text> as start of message"
+ msgstr ""
+
+ #: builtin/fmt-merge-msg.c:662
+ #, fuzzy
+ msgid "file to read from"
+ msgstr "不能读 %s"
+
+ #: builtin/for-each-ref.c:979
+ #, fuzzy
+ msgid "git for-each-ref [options] [<pattern>]"
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/for-each-ref.c:994
+ msgid "quote placeholders suitably for shells"
+ msgstr ""
+
+ #: builtin/for-each-ref.c:996
+ msgid "quote placeholders suitably for perl"
+ msgstr ""
+
+ #: builtin/for-each-ref.c:998
+ msgid "quote placeholders suitably for python"
+ msgstr ""
+
+ #: builtin/for-each-ref.c:1000
+ msgid "quote placeholders suitably for tcl"
+ msgstr ""
+
+ #: builtin/for-each-ref.c:1003
+ msgid "show only <n> matched refs"
+ msgstr ""
+
+ #: builtin/for-each-ref.c:1004
+ msgid "format"
+ msgstr ""
+
+ #: builtin/for-each-ref.c:1004
+ msgid "format to use for the output"
+ msgstr ""
+
+ #: builtin/for-each-ref.c:1005
+ msgid "key"
+ msgstr ""
+
+ #: builtin/for-each-ref.c:1006
+ msgid "field name to sort on"
+ msgstr ""
+
+ #: builtin/fsck.c:608
+ #, fuzzy
+ msgid "git fsck [options] [<object>...]"
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/fsck.c:614
+ msgid "show unreachable objects"
+ msgstr ""
+
+ #: builtin/fsck.c:615
+ #, fuzzy
+ msgid "show dangling objects"
+ msgstr "索引对象中"
+
+ #: builtin/fsck.c:616
+ msgid "report tags"
+ msgstr ""
+
+ #: builtin/fsck.c:617
+ msgid "report root nodes"
+ msgstr ""
+
+ #: builtin/fsck.c:618
+ msgid "make index objects head nodes"
+ msgstr ""
+
+ #: builtin/fsck.c:619
+ msgid "make reflogs head nodes (default)"
+ msgstr ""
+
+ #: builtin/fsck.c:620
+ msgid "also consider packs and alternate objects"
+ msgstr ""
+
+ #: builtin/fsck.c:621
+ msgid "enable more strict checking"
+ msgstr ""
+
+ #: builtin/fsck.c:623
+ msgid "write dangling objects in .git/lost-found"
+ msgstr ""
+
+ #: builtin/fsck.c:624 builtin/prune.c:134
+ msgid "show progress"
+ msgstr ""
+
+ #: builtin/gc.c:22
+ msgid "git gc [options]"
+ msgstr ""
+
+ #: builtin/gc.c:63
+ #, c-format
+ msgid "Invalid %s: '%s'"
+ msgstr "无效的 %s：'%s'"
+
+ #: builtin/gc.c:90
+ #, c-format
+ msgid "insanely long object directory %.*s"
+ msgstr "不正常的长对象目录 %.*s"
+
+ #: builtin/gc.c:179
+ msgid "prune unreferenced objects"
+ msgstr ""
+
+ #: builtin/gc.c:181
+ msgid "be more thorough (increased runtime)"
+ msgstr ""
+
+ #: builtin/gc.c:182
+ msgid "enable auto-gc mode"
+ msgstr ""
+
+ #: builtin/gc.c:221
+ #, c-format
+ msgid "Auto packing the repository for optimum performance.\n"
+ msgstr "自动打包版本库以求最佳性能。\n"
+
+ #: builtin/gc.c:224
+ #, c-format
+ msgid ""
+ "Auto packing the repository for optimum performance. You may also\n"
+ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
+ msgstr ""
+ "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
+ "参见 \"git help gc\" 以获取更多信息。\n"
#: builtin/gc.c:251
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
+ #: builtin/grep.c:22
+ msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
+ msgstr ""
+
#: builtin/grep.c:216
#, c-format
msgid "grep: failed to create thread: %s"
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
+ #: builtin/grep.c:728
+ msgid "search in index instead of in the work tree"
+ msgstr ""
+
+ #: builtin/grep.c:730
+ msgid "find in contents not managed by git"
+ msgstr ""
+
+ # 译者：中文字符串拼接，可删除前导空格
+ #: builtin/grep.c:732
+ #, fuzzy
+ msgid "search in both tracked and untracked files"
+ msgstr "（使用 -u 参数显示未跟踪的文件）"
+
+ #: builtin/grep.c:734
+ msgid "search also in ignored files"
+ msgstr ""
+
+ #: builtin/grep.c:737
+ msgid "show non-matching lines"
+ msgstr ""
+
+ #: builtin/grep.c:739
+ msgid "case insensitive matching"
+ msgstr ""
+
+ #: builtin/grep.c:741
+ msgid "match patterns only at word boundaries"
+ msgstr ""
+
+ #: builtin/grep.c:743
+ msgid "process binary files as text"
+ msgstr ""
+
+ #: builtin/grep.c:745
+ msgid "don't match patterns in binary files"
+ msgstr ""
+
+ #: builtin/grep.c:748
+ msgid "descend at most <depth> levels"
+ msgstr ""
+
+ #: builtin/grep.c:752
+ msgid "use extended POSIX regular expressions"
+ msgstr ""
+
+ #: builtin/grep.c:755
+ msgid "use basic POSIX regular expressions (default)"
+ msgstr ""
+
+ #: builtin/grep.c:758
+ msgid "interpret patterns as fixed strings"
+ msgstr ""
+
+ #: builtin/grep.c:761
+ msgid "use Perl-compatible regular expressions"
+ msgstr ""
+
+ #: builtin/grep.c:764
+ msgid "show line numbers"
+ msgstr ""
+
+ #: builtin/grep.c:765
+ msgid "don't show filenames"
+ msgstr ""
+
+ #: builtin/grep.c:766
+ #, fuzzy
+ msgid "show filenames"
+ msgstr "%s文件："
+
+ #: builtin/grep.c:768
+ msgid "show filenames relative to top directory"
+ msgstr ""
+
+ #: builtin/grep.c:770
+ msgid "show only filenames instead of matching lines"
+ msgstr ""
+
+ #: builtin/grep.c:772
+ msgid "synonym for --files-with-matches"
+ msgstr ""
+
+ #: builtin/grep.c:775
+ msgid "show only the names of files without match"
+ msgstr ""
+
+ #: builtin/grep.c:777
+ #, fuzzy
+ msgid "print NUL after filenames"
+ msgstr "为所有文件名前添加 <根目录>"
+
+ #: builtin/grep.c:779
+ msgid "show the number of matches instead of matching lines"
+ msgstr ""
+
+ #: builtin/grep.c:780
+ msgid "highlight matches"
+ msgstr ""
+
+ #: builtin/grep.c:782
+ msgid "print empty line between matches from different files"
+ msgstr ""
+
+ #: builtin/grep.c:784
+ msgid "show filename only once above matches from same file"
+ msgstr ""
+
+ #: builtin/grep.c:787
+ msgid "show <n> context lines before and after matches"
+ msgstr ""
+
+ #: builtin/grep.c:790
+ msgid "show <n> context lines before matches"
+ msgstr ""
+
+ #: builtin/grep.c:792
+ msgid "show <n> context lines after matches"
+ msgstr ""
+
+ #: builtin/grep.c:793
+ msgid "shortcut for -C NUM"
+ msgstr ""
+
+ #: builtin/grep.c:796
+ msgid "show a line with the function name before matches"
+ msgstr ""
+
+ #: builtin/grep.c:798
+ msgid "show the surrounding function"
+ msgstr ""
+
+ #: builtin/grep.c:801
+ msgid "read patterns from file"
+ msgstr ""
+
+ #: builtin/grep.c:803
+ msgid "match <pattern>"
+ msgstr ""
+
+ #: builtin/grep.c:805
+ msgid "combine patterns specified with -e"
+ msgstr ""
+
+ #: builtin/grep.c:817
+ msgid "indicate hit with exit status without output"
+ msgstr ""
+
+ #: builtin/grep.c:819
+ msgid "show only matches from files that match all patterns"
+ msgstr ""
+
+ #: builtin/grep.c:822
+ msgid "pager"
+ msgstr ""
+
+ #: builtin/grep.c:822
+ msgid "show matching files in the pager"
+ msgstr ""
+
+ #: builtin/grep.c:825
+ msgid "allow calling of grep(1) (ignored by this build)"
+ msgstr ""
+
+ #: builtin/grep.c:826 builtin/show-ref.c:201
+ msgid "show usage"
+ msgstr ""
+
#: builtin/grep.c:917
msgid "no pattern given."
msgstr "未提供模式匹配。"
msgid "both --cached and trees are given."
msgstr "同时给出了 --cached 和树对象。"
+ #: builtin/hash-object.c:60
+ msgid ""
+ "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
+ "<file>..."
+ msgstr ""
+
+ #: builtin/hash-object.c:61
+ msgid "git hash-object --stdin-paths < <list-of-paths>"
+ msgstr ""
+
+ #: builtin/hash-object.c:72
+ msgid "type"
+ msgstr ""
+
+ #: builtin/hash-object.c:72
+ #, fuzzy
+ msgid "object type"
+ msgstr "坏的对象类型。"
+
+ #: builtin/hash-object.c:73
+ msgid "write the object into the object database"
+ msgstr ""
+
+ #: builtin/hash-object.c:74
+ msgid "read the object from stdin"
+ msgstr ""
+
+ #: builtin/hash-object.c:76
+ msgid "store file as is without filters"
+ msgstr ""
+
+ #: builtin/hash-object.c:77
+ msgid "process file as it were from this path"
+ msgstr ""
+
+ #: builtin/help.c:43
+ #, fuzzy
+ msgid "print all available commands"
+ msgstr "在 '%s' 下可用的 git 命令"
+
+ #: builtin/help.c:44
+ msgid "show man page"
+ msgstr ""
+
+ #: builtin/help.c:45
+ msgid "show manual in web browser"
+ msgstr ""
+
+ #: builtin/help.c:47
+ msgid "show info page"
+ msgstr ""
+
+ #: builtin/help.c:53
+ msgid "git help [--all] [--man|--web|--info] [command]"
+ msgstr ""
+
#: builtin/help.c:65
#, c-format
msgid "unrecognized help format '%s'"
msgid "pack signature mismatch"
msgstr "包签名不匹配"
+ #: builtin/index-pack.c:294
+ #, c-format
+ msgid "pack version %<PRIu32> unsupported"
+ msgstr ""
+
#: builtin/index-pack.c:312
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgid "Resolving deltas"
msgstr "处理 delta 中"
- #: builtin/index-pack.c:1105
+ #: builtin/index-pack.c:1064
+ #, fuzzy, c-format
+ msgid "unable to create thread: %s"
+ msgstr "grep：无法创建线程：%s"
+
+ #: builtin/index-pack.c:1106
msgid "confusion beyond insanity"
msgstr "不可理喻"
- #: builtin/index-pack.c:1124
+ #: builtin/index-pack.c:1112
+ #, c-format
+ msgid "completed with %d local objects"
+ msgstr ""
+
+ #: builtin/index-pack.c:1121
+ #, c-format
+ msgid "Unexpected tail checksum for %s (disk corruption?)"
+ msgstr ""
+
+ #: builtin/index-pack.c:1125
#, 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:1149
+ #: builtin/index-pack.c:1150
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能缩小附加对象（%d）"
- #: builtin/index-pack.c:1228
+ #: builtin/index-pack.c:1229
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
- #: builtin/index-pack.c:1252
+ #: builtin/index-pack.c:1253
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
- #: builtin/index-pack.c:1265
+ #: builtin/index-pack.c:1266
#, c-format
msgid "cannot write keep file '%s'"
msgstr "无法写保留文件 '%s'"
- #: builtin/index-pack.c:1273
+ #: builtin/index-pack.c:1274
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "无法关闭保留文件 '%s'"
- #: builtin/index-pack.c:1286
+ #: builtin/index-pack.c:1287
msgid "cannot store pack file"
msgstr "无法存储包文件"
- #: builtin/index-pack.c:1297
+ #: builtin/index-pack.c:1298
msgid "cannot store index file"
msgstr "无法存储索引文件"
- #: builtin/index-pack.c:1398
+ #: builtin/index-pack.c:1331
+ #, fuzzy, c-format
+ msgid "bad pack.indexversion=%<PRIu32>"
+ msgstr "坏的索引版本 '%s'"
+
+ #: builtin/index-pack.c:1337
+ #, c-format
+ msgid "invalid number of threads specified (%d)"
+ msgstr ""
+
+ #: builtin/index-pack.c:1341 builtin/index-pack.c:1514
+ #, c-format
+ msgid "no threads support, ignoring %s"
+ msgstr ""
+
+ #: builtin/index-pack.c:1399
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
- #: builtin/index-pack.c:1400
+ #: builtin/index-pack.c:1401
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
- #: builtin/index-pack.c:1447
+ #: builtin/index-pack.c:1448
#, 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:1454
+ #: builtin/index-pack.c:1455
#, 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:1481
+ #: builtin/index-pack.c:1482
msgid "Cannot come back to cwd"
msgstr "无法返回当前工作目录"
- #: builtin/index-pack.c:1525 builtin/index-pack.c:1528
- #: builtin/index-pack.c:1540 builtin/index-pack.c:1544
+ #: builtin/index-pack.c:1526 builtin/index-pack.c:1529
+ #: builtin/index-pack.c:1541 builtin/index-pack.c:1545
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
- #: builtin/index-pack.c:1558
+ #: builtin/index-pack.c:1559
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同时使用"
- #: builtin/index-pack.c:1562 builtin/index-pack.c:1572
+ #: builtin/index-pack.c:1563 builtin/index-pack.c:1573
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "包名 '%s' 没有以 '.pack' 结尾"
- #: builtin/index-pack.c:1581
+ #: builtin/index-pack.c:1582
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包名参数"
msgid "cannot tell cwd"
msgstr "无法获知当前路径"
+ #: builtin/init-db.c:467
+ msgid ""
+ "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"
+ "[=<permissions>]] [directory]"
+ msgstr ""
+
+ #: builtin/init-db.c:490
+ msgid "permissions"
+ msgstr ""
+
+ #: builtin/init-db.c:491
+ msgid "specify that the git repository is to be shared amongst several users"
+ msgstr ""
+
+ #: builtin/init-db.c:493 builtin/prune-packed.c:77
+ #, fuzzy
+ msgid "be quiet"
+ msgstr "更加安静"
+
#: builtin/init-db.c:522 builtin/init-db.c:529
#, c-format
msgid "cannot mkdir %s"
msgid "Cannot access work tree '%s'"
msgstr "不能访问工作区 '%s'"
+ #: builtin/log.c:37
+ #, fuzzy
+ msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/log.c:38
+ #, fuzzy
+ msgid " or: git show [options] <object>..."
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/log.c:100
+ msgid "suppress diff output"
+ msgstr ""
+
+ #: builtin/log.c:101
+ #, fuzzy
+ msgid "show source"
+ msgstr "坏的源"
+
+ #: builtin/log.c:102
+ msgid "decorate options"
+ msgstr ""
+
#: builtin/log.c:189
#, c-format
msgid "Final output: %d %s\n"
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
+ #: builtin/log.c:890
+ msgid "git format-patch [options] [<since> | <revision range>]"
+ msgstr ""
+
#: builtin/log.c:935
msgid "Two output directories?"
msgstr "两个输出目录？"
- #: builtin/log.c:1157
- #, c-format
- msgid "bogus committer info %s"
- msgstr "虚假的提交者信息 %s"
+ #: builtin/log.c:1063
+ msgid "use [PATCH n/m] even with a single patch"
+ msgstr ""
- #: builtin/log.c:1202
- msgid "-n and -k are mutually exclusive."
- msgstr "-n 和 -k 互斥。"
+ #: builtin/log.c:1066
+ msgid "use [PATCH] even with multiple patches"
+ msgstr ""
- #: builtin/log.c:1204
- msgid "--subject-prefix and -k are mutually exclusive."
- msgstr "--subject-prefix 和 -k 互斥。"
+ #: builtin/log.c:1070
+ msgid "print patches to standard out"
+ msgstr ""
- #: builtin/log.c:1212
- msgid "--name-only does not make sense"
- msgstr "--name-only 无意义"
+ #: builtin/log.c:1072
+ msgid "generate a cover letter"
+ msgstr ""
- #: builtin/log.c:1214
- msgid "--name-status does not make sense"
- msgstr "--name-status 无意义"
+ #: builtin/log.c:1074
+ msgid "use simple number sequence for output file names"
+ msgstr ""
- #: builtin/log.c:1216
- msgid "--check does not make sense"
- msgstr "--check 无意义"
+ #: builtin/log.c:1075
+ msgid "sfx"
+ msgstr ""
+
+ #: builtin/log.c:1076
+ msgid "use <sfx> instead of '.patch'"
+ msgstr ""
+
+ #: builtin/log.c:1078
+ msgid "start numbering patches at <n> instead of 1"
+ msgstr ""
+
+ #: builtin/log.c:1080
+ msgid "Use [<prefix>] instead of [PATCH]"
+ msgstr ""
+
+ #: builtin/log.c:1083
+ msgid "store resulting files in <dir>"
+ msgstr ""
+
+ #: builtin/log.c:1086
+ msgid "don't strip/add [PATCH]"
+ msgstr ""
+
+ #: builtin/log.c:1089
+ msgid "don't output binary diffs"
+ msgstr ""
+
+ #: builtin/log.c:1091
+ msgid "don't include a patch matching a commit upstream"
+ msgstr ""
+
+ #: builtin/log.c:1093
+ msgid "show patch format instead of default (patch + stat)"
+ msgstr ""
+
+ #: builtin/log.c:1095
+ #, fuzzy
+ msgid "Messaging"
+ msgstr "合并："
+
+ # 译者：注意保持句尾空格
+ #: builtin/log.c:1096
+ #, fuzzy
+ msgid "header"
+ msgstr "领先 "
+
+ #: builtin/log.c:1097
+ msgid "add email header"
+ msgstr ""
+
+ #: builtin/log.c:1098 builtin/log.c:1100
+ msgid "email"
+ msgstr ""
+
+ #: builtin/log.c:1098
+ msgid "add To: header"
+ msgstr ""
+
+ #: builtin/log.c:1100
+ msgid "add Cc: header"
+ msgstr ""
+
+ #: builtin/log.c:1102
+ msgid "message-id"
+ msgstr ""
+
+ #: builtin/log.c:1103
+ msgid "make first mail a reply to <message-id>"
+ msgstr ""
+
+ #: builtin/log.c:1104 builtin/log.c:1107
+ msgid "boundary"
+ msgstr ""
+
+ #: builtin/log.c:1105
+ msgid "attach the patch"
+ msgstr ""
+
+ #: builtin/log.c:1108
+ #, fuzzy
+ msgid "inline the patch"
+ msgstr "忽略补丁中的添加的文件"
+
+ #: builtin/log.c:1112
+ msgid "enable message threading, styles: shallow, deep"
+ msgstr ""
+
+ #: builtin/log.c:1114
+ msgid "signature"
+ msgstr ""
+
+ #: builtin/log.c:1115
+ msgid "add a signature"
+ msgstr ""
+
+ #: builtin/log.c:1117
+ #, fuzzy
+ msgid "don't print the patch filenames"
+ msgstr "无法打开补丁文件 %s"
+
+ #: builtin/log.c:1157
+ #, c-format
+ msgid "bogus committer info %s"
+ msgstr "虚假的提交者信息 %s"
+
+ #: builtin/log.c:1202
+ msgid "-n and -k are mutually exclusive."
+ msgstr "-n 和 -k 互斥。"
+
+ #: builtin/log.c:1204
+ msgid "--subject-prefix and -k are mutually exclusive."
+ msgstr "--subject-prefix 和 -k 互斥。"
+
+ #: builtin/log.c:1212
+ msgid "--name-only does not make sense"
+ msgstr "--name-only 无意义"
+
+ #: builtin/log.c:1214
+ msgid "--name-status does not make sense"
+ msgstr "--name-status 无意义"
+
+ #: builtin/log.c:1216
+ msgid "--check does not make sense"
+ msgstr "--check 无意义"
#: builtin/log.c:1239
msgid "standard output, or directory, which one?"
msgid "Failed to create output files"
msgstr "无法创建输出文件"
+ #: builtin/log.c:1443
+ msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+ msgstr ""
+
#: builtin/log.c:1498
#, c-format
msgid ""
msgid "Unknown commit %s"
msgstr "未知提交 %s"
+ #: builtin/ls-files.c:408
+ #, fuzzy
+ msgid "git ls-files [options] [<file>...]"
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/ls-files.c:463
+ msgid "identify the file status with tags"
+ msgstr ""
+
+ #: builtin/ls-files.c:465
+ msgid "use lowercase letters for 'assume unchanged' files"
+ msgstr ""
+
+ #: builtin/ls-files.c:467
+ msgid "show cached files in the output (default)"
+ msgstr ""
+
+ #: builtin/ls-files.c:469
+ #, fuzzy
+ msgid "show deleted files in the output"
+ msgstr "删除的文件 %s 仍有内容"
+
+ #: builtin/ls-files.c:471
+ msgid "show modified files in the output"
+ msgstr ""
+
+ #: builtin/ls-files.c:473
+ msgid "show other files in the output"
+ msgstr ""
+
+ #: builtin/ls-files.c:475
+ msgid "show ignored files in the output"
+ msgstr ""
+
+ #: builtin/ls-files.c:478
+ msgid "show staged contents' object name in the output"
+ msgstr ""
+
+ #: builtin/ls-files.c:480
+ msgid "show files on the filesystem that need to be removed"
+ msgstr ""
+
+ #: builtin/ls-files.c:482
+ msgid "show 'other' directories' name only"
+ msgstr ""
+
+ #: builtin/ls-files.c:485
+ #, fuzzy
+ msgid "don't show empty directories"
+ msgstr "两个输出目录？"
+
+ #: builtin/ls-files.c:488
+ msgid "show unmerged files in the output"
+ msgstr ""
+
+ #: builtin/ls-files.c:490
+ msgid "show resolve-undo information"
+ msgstr ""
+
+ #: builtin/ls-files.c:492
+ #, fuzzy
+ msgid "skip files matching pattern"
+ msgstr "输出和模式匹配的行"
+
+ #: builtin/ls-files.c:495
+ msgid "exclude patterns are read from <file>"
+ msgstr ""
+
+ #: builtin/ls-files.c:498
+ msgid "read additional per-directory exclude patterns in <file>"
+ msgstr ""
+
+ #: builtin/ls-files.c:500
+ msgid "add the standard git exclusions"
+ msgstr ""
+
+ #: builtin/ls-files.c:503
+ msgid "make the output relative to the project top directory"
+ msgstr ""
+
+ #: builtin/ls-files.c:506
+ msgid "if any <file> is not in the index, treat this as an error"
+ msgstr ""
+
+ #: builtin/ls-files.c:507
+ msgid "tree-ish"
+ msgstr ""
+
+ #: builtin/ls-files.c:508
+ msgid "pretend that paths removed since <tree-ish> are still present"
+ msgstr ""
+
+ #: builtin/ls-files.c:510
+ msgid "show debugging data"
+ msgstr ""
+
+ #: builtin/ls-tree.c:27
+ #, fuzzy
+ msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/ls-tree.c:125
+ msgid "only show trees"
+ msgstr ""
+
+ #: builtin/ls-tree.c:127
+ #, fuzzy
+ msgid "recurse into subtrees"
+ msgstr "变基到远程 %s"
+
+ #: builtin/ls-tree.c:129
+ msgid "show trees when recursing"
+ msgstr ""
+
+ #: builtin/ls-tree.c:132
+ msgid "terminate entries with NUL byte"
+ msgstr ""
+
+ #: builtin/ls-tree.c:133
+ #, fuzzy
+ msgid "include object size"
+ msgstr "提供了无效对象 '%s'。"
+
+ #: builtin/ls-tree.c:135 builtin/ls-tree.c:137
+ msgid "list only filenames"
+ msgstr ""
+
+ #: builtin/ls-tree.c:140
+ msgid "use full path names"
+ msgstr ""
+
+ #: builtin/ls-tree.c:142
+ msgid "list entire tree; not just current directory (implies --full-name)"
+ msgstr ""
+
+ #: builtin/merge.c:43
+ #, fuzzy
+ msgid "git merge [options] [<commit>...]"
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/merge.c:44
+ msgid "git merge [options] <msg> HEAD <commit>"
+ msgstr ""
+
+ #: builtin/merge.c:45
+ msgid "git merge --abort"
+ msgstr ""
+
#: builtin/merge.c:90
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有："
+ #: builtin/merge.c:183
+ msgid "do not show a diffstat at the end of the merge"
+ msgstr ""
+
+ #: builtin/merge.c:186
+ msgid "show a diffstat at the end of the merge"
+ msgstr ""
+
+ #: builtin/merge.c:187
+ msgid "(synonym to --stat)"
+ msgstr ""
+
+ #: builtin/merge.c:189
+ msgid "add (at most <n>) entries from shortlog to merge commit message"
+ msgstr ""
+
+ #: builtin/merge.c:192
+ #, fuzzy
+ msgid "create a single commit instead of doing a merge"
+ msgstr "在合并过程中不能做部分提交。"
+
+ #: builtin/merge.c:194
+ msgid "perform a commit if the merge succeeds (default)"
+ msgstr ""
+
+ #: builtin/merge.c:196
+ #, fuzzy
+ msgid "edit message before committing"
+ msgstr "尚未暂存以备提交的变更："
+
+ #: builtin/merge.c:198
+ #, fuzzy
+ msgid "allow fast-forward (default)"
+ msgstr "可快进"
+
+ #: builtin/merge.c:200
+ msgid "abort if fast-forward is not possible"
+ msgstr ""
+
+ #: builtin/merge.c:202 builtin/notes.c:867 builtin/revert.c:112
+ msgid "strategy"
+ msgstr ""
+
+ #: builtin/merge.c:203
+ #, fuzzy
+ msgid "merge strategy to use"
+ msgstr "尝试合并策略 %s...\n"
+
+ #: builtin/merge.c:204
+ msgid "option=value"
+ msgstr ""
+
+ #: builtin/merge.c:205
+ msgid "option for selected merge strategy"
+ msgstr ""
+
+ #: builtin/merge.c:207
+ msgid "merge commit message (for a non-fast-forward merge)"
+ msgstr ""
+
+ #: builtin/merge.c:211
+ #, fuzzy
+ msgid "abort the current in-progress merge"
+ msgstr "无法保存当前索引状态"
+
#: builtin/merge.c:240
msgid "could not run stash."
msgstr "不能进行进度保存。"
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n"
+ #: builtin/merge-base.c:26
+ msgid "git merge-base [-a|--all] <commit> <commit>..."
+ msgstr ""
+
+ #: builtin/merge-base.c:27
+ msgid "git merge-base [-a|--all] --octopus <commit>..."
+ msgstr ""
+
+ #: builtin/merge-base.c:28
+ msgid "git merge-base --independent <commit>..."
+ msgstr ""
+
+ #: builtin/merge-base.c:29
+ msgid "git merge-base --is-ancestor <commit> <commit>"
+ msgstr ""
+
+ #: builtin/merge-base.c:98
+ #, fuzzy
+ msgid "output all common ancestors"
+ msgstr "发现 %u 个共同祖先："
+
+ #: builtin/merge-base.c:99
+ msgid "find ancestors for a single n-way merge"
+ msgstr ""
+
+ #: builtin/merge-base.c:100
+ msgid "list revs not reachable from others"
+ msgstr ""
+
+ #: builtin/merge-base.c:102
+ msgid "is the first one ancestor of the other?"
+ msgstr ""
+
+ #: builtin/merge-file.c:8
+ msgid ""
+ "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
+ "file2"
+ msgstr ""
+
+ #: builtin/merge-file.c:33
+ msgid "send results to standard output"
+ msgstr ""
+
+ #: builtin/merge-file.c:34
+ msgid "use a diff3 based merge"
+ msgstr ""
+
+ #: builtin/merge-file.c:35
+ msgid "for conflicts, use our version"
+ msgstr ""
+
+ #: builtin/merge-file.c:37
+ msgid "for conflicts, use their version"
+ msgstr ""
+
+ #: builtin/merge-file.c:39
+ msgid "for conflicts, use a union version"
+ msgstr ""
+
+ #: builtin/merge-file.c:42
+ msgid "for conflicts, use this marker size"
+ msgstr ""
+
+ #: builtin/merge-file.c:43
+ msgid "do not warn about conflicts"
+ msgstr ""
+
+ #: builtin/merge-file.c:45
+ msgid "set labels for file1/orig_file/file2"
+ msgstr ""
+
+ #: builtin/mktree.c:67
+ msgid "git mktree [-z] [--missing] [--batch]"
+ msgstr ""
+
+ #: builtin/mktree.c:153
+ msgid "input is NUL terminated"
+ msgstr ""
+
+ #: builtin/mktree.c:154 builtin/write-tree.c:24
+ #, fuzzy
+ msgid "allow missing objects"
+ msgstr "接收对象中"
+
+ #: builtin/mktree.c:155
+ msgid "allow creation of more than one tree"
+ msgstr ""
+
+ #: builtin/mv.c:14
+ msgid "git mv [options] <source>... <destination>"
+ msgstr ""
+
+ #: builtin/mv.c:64
+ msgid "force move/rename even if target exists"
+ msgstr ""
+
+ #: builtin/mv.c:65
+ #, fuzzy
+ msgid "skip move/rename errors"
+ msgstr "程序错误"
+
#: builtin/mv.c:108
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
+ #: builtin/name-rev.c:175
+ #, fuzzy
+ msgid "git name-rev [options] <commit>..."
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/name-rev.c:176
+ msgid "git name-rev [options] --all"
+ msgstr ""
+
+ #: builtin/name-rev.c:177
+ msgid "git name-rev [options] --stdin"
+ msgstr ""
+
+ #: builtin/name-rev.c:229
+ msgid "print only names (no SHA-1)"
+ msgstr ""
+
+ #: builtin/name-rev.c:230
+ msgid "only use tags to name the commits"
+ msgstr ""
+
+ #: builtin/name-rev.c:232
+ #, fuzzy
+ msgid "only use refs matching <pattern>"
+ msgstr "输出和模式匹配的行"
+
+ #: builtin/name-rev.c:234
+ msgid "list all commits reachable from all refs"
+ msgstr ""
+
+ #: builtin/name-rev.c:235
+ msgid "read from stdin"
+ msgstr ""
+
+ #: builtin/name-rev.c:236
+ msgid "allow to print `undefined` names"
+ msgstr ""
+
+ #: builtin/notes.c:23
+ msgid "git notes [--ref <notes_ref>] [list [<object>]]"
+ msgstr ""
+
+ #: builtin/notes.c:24
+ msgid ""
+ "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
+ "<object>] [<object>]"
+ msgstr ""
+
+ #: builtin/notes.c:25
+ msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
+ msgstr ""
+
+ #: builtin/notes.c:26
+ msgid ""
+ "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
+ "<object>] [<object>]"
+ msgstr ""
+
+ #: builtin/notes.c:27
+ msgid "git notes [--ref <notes_ref>] edit [<object>]"
+ msgstr ""
+
+ #: builtin/notes.c:28
+ msgid "git notes [--ref <notes_ref>] show [<object>]"
+ msgstr ""
+
+ #: builtin/notes.c:29
+ msgid ""
+ "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
+ msgstr ""
+
+ #: builtin/notes.c:30
+ msgid "git notes merge --commit [-v | -q]"
+ msgstr ""
+
+ #: builtin/notes.c:31
+ msgid "git notes merge --abort [-v | -q]"
+ msgstr ""
+
+ #: builtin/notes.c:32
+ msgid "git notes [--ref <notes_ref>] remove [<object>...]"
+ msgstr ""
+
+ #: builtin/notes.c:33
+ msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
+ msgstr ""
+
+ #: builtin/notes.c:34
+ msgid "git notes [--ref <notes_ref>] get-ref"
+ msgstr ""
+
+ #: builtin/notes.c:39
+ msgid "git notes [list [<object>]]"
+ msgstr ""
+
+ #: builtin/notes.c:44
+ #, fuzzy
+ msgid "git notes add [<options>] [<object>]"
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/notes.c:49
+ msgid "git notes copy [<options>] <from-object> <to-object>"
+ msgstr ""
+
+ #: builtin/notes.c:50
+ msgid "git notes copy --stdin [<from-object> <to-object>]..."
+ msgstr ""
+
+ #: builtin/notes.c:55
+ #, fuzzy
+ msgid "git notes append [<options>] [<object>]"
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/notes.c:60
+ msgid "git notes edit [<object>]"
+ msgstr ""
+
+ #: builtin/notes.c:65
+ msgid "git notes show [<object>]"
+ msgstr ""
+
+ #: builtin/notes.c:70
+ msgid "git notes merge [<options>] <notes_ref>"
+ msgstr ""
+
+ #: builtin/notes.c:71
+ msgid "git notes merge --commit [<options>]"
+ msgstr ""
+
+ #: builtin/notes.c:72
+ msgid "git notes merge --abort [<options>]"
+ msgstr ""
+
+ #: builtin/notes.c:77
+ msgid "git notes remove [<object>]"
+ msgstr ""
+
+ #: builtin/notes.c:82
+ msgid "git notes prune [<options>]"
+ msgstr ""
+
+ #: builtin/notes.c:87
+ msgid "git notes get-ref"
+ msgstr ""
+
#: builtin/notes.c:139
#, c-format
msgid "unable to start 'show' for object '%s'"
msgid "No note found for object %s."
msgstr "未发现对象 %s 的注解。"
+ #: builtin/notes.c:535 builtin/notes.c:692
+ #, fuzzy
+ msgid "note contents as a string"
+ msgstr "注解内容被留在文件 %s 中"
+
+ #: builtin/notes.c:538 builtin/notes.c:695
+ #, fuzzy
+ msgid "note contents in a file"
+ msgstr "无法存储索引文件"
+
+ #: builtin/notes.c:540 builtin/notes.c:543 builtin/notes.c:697
+ #: builtin/notes.c:700 builtin/tag.c:476
+ #, fuzzy
+ msgid "object"
+ msgstr "坏对象 %s"
+
+ #: builtin/notes.c:541 builtin/notes.c:698
+ #, fuzzy
+ msgid "reuse and edit specified note object"
+ msgstr "不能写注解对象"
+
+ #: builtin/notes.c:544 builtin/notes.c:701
+ #, fuzzy
+ msgid "reuse specified note object"
+ msgstr "不能写注解对象"
+
+ #: builtin/notes.c:546 builtin/notes.c:614
+ #, fuzzy
+ msgid "replace existing notes"
+ msgstr "不能读取现存对象 %s"
+
#: builtin/notes.c:580
#, c-format
msgid ""
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"
+ #: builtin/notes.c:615
+ #, fuzzy
+ msgid "read objects from stdin"
+ msgstr "坏对象 %s"
+
+ #: builtin/notes.c:617
+ msgid "load rewriting config for <command> (implies --stdin)"
+ msgstr ""
+
#: builtin/notes.c:635
msgid "too few parameters"
msgstr "参数太少"
msgid "Missing notes on source object %s. Cannot copy."
msgstr "源对象 %s 缺少注解。不能拷贝。"
- #: builtin/notes.c:717
- #, c-format
- msgid ""
- "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
- "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+ #: builtin/notes.c:717
+ #, c-format
+ msgid ""
+ "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
+ "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+ msgstr ""
+ "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
+ "请换用 'git notes add -f -m/-F/-c/-C'。\n"
+
+ #: builtin/notes.c:864
+ #, fuzzy
+ msgid "General options"
+ msgstr "无效选项：%s"
+
+ #: builtin/notes.c:866
+ msgid "Merge options"
+ msgstr ""
+
+ #: builtin/notes.c:868
+ msgid ""
+ "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+ "cat_sort_uniq)"
+ msgstr ""
+
+ #: builtin/notes.c:870
+ msgid "Committing unmerged notes"
+ msgstr ""
+
+ #: builtin/notes.c:872
+ msgid "finalize notes merge by committing unmerged notes"
+ msgstr ""
+
+ #: builtin/notes.c:874
+ msgid "Aborting notes merge resolution"
+ msgstr ""
+
+ #: builtin/notes.c:876
+ #, fuzzy
+ msgid "abort notes merge"
+ msgstr "path '%s'：无法合并"
+
+ #: builtin/notes.c:971
+ #, c-format
+ msgid "Object %s has no note\n"
+ msgstr "对象 %s 没有注解\n"
+
+ #: builtin/notes.c:983
+ msgid "attempt to remove non-existent note is not an error"
+ msgstr ""
+
+ #: builtin/notes.c:986
+ #, fuzzy
+ msgid "read object names from the standard input"
+ msgstr "（正从标准输入中读取日志信息）\n"
+
+ #: builtin/notes.c:1067
+ msgid "notes_ref"
+ msgstr ""
+
+ #: builtin/notes.c:1068
+ msgid "use notes from <notes_ref>"
+ msgstr ""
+
+ #: builtin/notes.c:1103 builtin/remote.c:1598
+ #, c-format
+ msgid "Unknown subcommand: %s"
+ msgstr "未知子命令：%s"
+
+ #: builtin/pack-objects.c:23
+ msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
+ msgstr ""
+
+ #: builtin/pack-objects.c:24
+ msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
+ msgstr ""
+
+ #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
+ #, c-format
+ msgid "deflate error (%d)"
+ msgstr "压缩错误 (%d)"
+
+ #: builtin/pack-objects.c:2398
+ #, c-format
+ msgid "unsupported index version %s"
+ msgstr "不支持的索引版本 %s"
+
+ #: builtin/pack-objects.c:2402
+ #, c-format
+ msgid "bad index version '%s'"
+ msgstr "坏的索引版本 '%s'"
+
+ #: builtin/pack-objects.c:2425
+ #, c-format
+ msgid "option %s does not accept negative form"
+ msgstr "选项 %s 不接受否定格式"
+
+ #: builtin/pack-objects.c:2429
+ #, c-format
+ msgid "unable to parse value '%s' for option %s"
+ msgstr "不能解析选项 %1$s 的值 '%2$s'"
+
+ #: builtin/pack-objects.c:2448
+ msgid "do not show progress meter"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2450
+ msgid "show progress meter"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2452
+ msgid "show progress meter during object writing phase"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2455
+ msgid "similar to --all-progress when progress meter is shown"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2456
+ msgid "version[,offset]"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2457
+ msgid "write the pack index file in the specified idx format version"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2460
+ #, fuzzy
+ msgid "maximum size of each output pack file"
+ msgstr "无法创建输出文件"
+
+ #: builtin/pack-objects.c:2462
+ msgid "ignore borrowed objects from alternate object store"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2464
+ #, fuzzy
+ msgid "ignore packed objects"
+ msgstr "不能读取对象 %s"
+
+ #: builtin/pack-objects.c:2466
+ msgid "limit pack window by objects"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2468
+ msgid "limit pack window by memory in addition to object limit"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2470
+ msgid "maximum length of delta chain allowed in the resulting pack"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2472
+ #, fuzzy
+ msgid "reuse existing deltas"
+ msgstr "处理 delta 中"
+
+ #: builtin/pack-objects.c:2474
+ #, fuzzy
+ msgid "reuse existing objects"
+ msgstr "不能读取现存对象 %s"
+
+ #: builtin/pack-objects.c:2476
+ msgid "use OFS_DELTA objects"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2478
+ msgid "use threads when searching for best delta matches"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2480
+ msgid "do not create an empty pack output"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2482
+ #, fuzzy
+ msgid "read revision arguments from standard input"
+ msgstr "（正从标准输入中读取日志信息）\n"
+
+ #: builtin/pack-objects.c:2484
+ msgid "limit the objects to those that are not yet packed"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2487
+ msgid "include objects reachable from any reference"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2490
+ msgid "include objects referred by reflog entries"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2493
+ msgid "output pack to stdout"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2495
+ msgid "include tag objects that refer to objects to be packed"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2497
+ msgid "keep unreachable objects"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2498 parse-options.h:141
+ msgid "time"
+ msgstr "时间"
+
+ #: builtin/pack-objects.c:2499
+ msgid "unpack unreachable objects newer than <time>"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2502
+ msgid "create thin packs"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2504
+ msgid "ignore packs that have companion .keep file"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2506
+ msgid "pack compression level"
+ msgstr ""
+
+ #: builtin/pack-objects.c:2508
+ #, fuzzy
+ msgid "do not hide commits by grafts"
+ msgstr "不能写提交模版"
+
+ #: builtin/pack-refs.c:6
+ msgid "git pack-refs [options]"
msgstr ""
- "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
- "请换用 'git notes add -f -m/-F/-c/-C'。\n"
- #: builtin/notes.c:971
- #, c-format
- msgid "Object %s has no note\n"
- msgstr "对象 %s 没有注解\n"
+ #: builtin/pack-refs.c:14
+ msgid "pack everything"
+ msgstr ""
- #: builtin/notes.c:1103 builtin/remote.c:1598
- #, c-format
- msgid "Unknown subcommand: %s"
- msgstr "未知子命令：%s"
+ #: builtin/pack-refs.c:15
+ msgid "prune loose refs (default)"
+ msgstr ""
- #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
- #, c-format
- msgid "deflate error (%d)"
- msgstr "压缩错误 (%d)"
+ #: builtin/prune-packed.c:7
+ msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
+ msgstr ""
- #: builtin/pack-objects.c:2398
- #, c-format
- msgid "unsupported index version %s"
- msgstr "不支持的索引版本 %s"
+ #: builtin/prune.c:12
+ msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+ msgstr ""
- #: builtin/pack-objects.c:2402
- #, c-format
- msgid "bad index version '%s'"
- msgstr "坏的索引版本 '%s'"
+ #: builtin/prune.c:132
+ #, fuzzy
+ msgid "do not remove, show only"
+ msgstr "不会删除 %s\n"
- #: builtin/pack-objects.c:2425
- #, c-format
- msgid "option %s does not accept negative form"
- msgstr "选项 %s 不接受否定格式"
+ #: builtin/prune.c:133
+ #, fuzzy
+ msgid "report pruned objects"
+ msgstr "不能读取对象 %s"
- #: builtin/pack-objects.c:2429
- #, c-format
- msgid "unable to parse value '%s' for option %s"
- msgstr "不能解析选项 %1$s 的值 '%2$s'"
+ #: builtin/prune.c:136
+ msgid "expire objects older than <time>"
+ msgstr ""
+
+ #: builtin/push.c:14
+ #, fuzzy
+ msgid "git push [<options>] [<repository> [<refspec>...]]"
+ msgstr "git apply [选项] [<补丁>...]"
#: builtin/push.c:45
msgid "tag shorthand without <tag>"
msgid "--all and --mirror are incompatible"
msgstr "--all 和 --mirror 不兼容"
+ #: builtin/push.c:382
+ #, fuzzy
+ msgid "repository"
+ msgstr "坏的版本库 '%s'"
+
+ #: builtin/push.c:383
+ msgid "push all refs"
+ msgstr ""
+
+ #: builtin/push.c:384
+ msgid "mirror all refs"
+ msgstr ""
+
+ #: builtin/push.c:386
+ #, fuzzy
+ msgid "delete refs"
+ msgstr "删除"
+
+ #: builtin/push.c:387
+ msgid "push tags (can't be used with --all or --mirror)"
+ msgstr ""
+
+ #: builtin/push.c:390
+ #, fuzzy
+ msgid "force updates"
+ msgstr "强制更新"
+
+ #: builtin/push.c:391
+ msgid "check"
+ msgstr ""
+
+ #: builtin/push.c:392
+ msgid "control recursive pushing of submodules"
+ msgstr ""
+
+ #: builtin/push.c:394
+ msgid "use thin pack"
+ msgstr ""
+
+ #: builtin/push.c:395 builtin/push.c:396
+ msgid "receive pack program"
+ msgstr ""
+
+ #: builtin/push.c:397
+ msgid "set upstream for git pull/status"
+ msgstr ""
+
+ #: builtin/push.c:400
+ msgid "prune locally removed refs"
+ msgstr ""
+
#: builtin/push.c:410
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有意义"
+ #: builtin/read-tree.c:36
+ msgid ""
+ "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
+ "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+ "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+ msgstr ""
+
+ #: builtin/read-tree.c:108
+ #, fuzzy
+ msgid "write resulting index to <file>"
+ msgstr "损坏的索引文件"
+
+ #: builtin/read-tree.c:111
+ #, fuzzy
+ msgid "only empty the index"
+ msgstr "不能读取索引"
+
+ #: builtin/read-tree.c:113
+ #, fuzzy
+ msgid "Merging"
+ msgstr "合并："
+
+ #: builtin/read-tree.c:115
+ msgid "perform a merge in addition to a read"
+ msgstr ""
+
+ #: builtin/read-tree.c:117
+ msgid "3-way merge if no file level merging required"
+ msgstr ""
+
+ #: builtin/read-tree.c:119
+ msgid "3-way merge in presence of adds and removes"
+ msgstr ""
+
+ #: builtin/read-tree.c:121
+ msgid "same as -m, but discard unmerged entries"
+ msgstr ""
+
+ #: builtin/read-tree.c:122
+ #, fuzzy
+ msgid "<subdirectory>/"
+ msgstr "目录/文件"
+
+ #: builtin/read-tree.c:123
+ msgid "read the tree into the index under <subdirectory>/"
+ msgstr ""
+
+ #: builtin/read-tree.c:126
+ msgid "update working tree with merge result"
+ msgstr ""
+
+ #: builtin/read-tree.c:128
+ #, fuzzy
+ msgid "gitignore"
+ msgstr "忽略的"
+
+ #: builtin/read-tree.c:129
+ msgid "allow explicitly ignored files to be overwritten"
+ msgstr ""
+
+ #: builtin/read-tree.c:132
+ #, fuzzy
+ msgid "don't check the working tree after merging"
+ msgstr "显示工作区状态"
+
+ #: builtin/read-tree.c:133
+ msgid "don't update the index or the work tree"
+ msgstr ""
+
+ #: builtin/read-tree.c:135
+ msgid "skip applying sparse checkout filter"
+ msgstr ""
+
+ #: builtin/read-tree.c:137
+ msgid "debug unpack-trees"
+ msgstr ""
+
+ #: builtin/remote.c:11
+ msgid "git remote [-v | --verbose]"
+ msgstr ""
+
+ #: builtin/remote.c:12
+ msgid ""
+ "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
+ "mirror=<fetch|push>] <name> <url>"
+ msgstr ""
+
+ #: builtin/remote.c:13 builtin/remote.c:32
+ msgid "git remote rename <old> <new>"
+ msgstr ""
+
+ #: builtin/remote.c:14 builtin/remote.c:37
+ msgid "git remote remove <name>"
+ msgstr ""
+
+ #: builtin/remote.c:15
+ msgid "git remote set-head <name> (-a | -d | <branch>)"
+ msgstr ""
+
+ #: builtin/remote.c:16
+ msgid "git remote [-v | --verbose] show [-n] <name>"
+ msgstr ""
+
+ #: builtin/remote.c:17
+ msgid "git remote prune [-n | --dry-run] <name>"
+ msgstr ""
+
+ #: builtin/remote.c:18
+ msgid ""
+ "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+ msgstr ""
+
+ #: builtin/remote.c:19
+ msgid "git remote set-branches [--add] <name> <branch>..."
+ msgstr ""
+
+ #: builtin/remote.c:20 builtin/remote.c:68
+ msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+ msgstr ""
+
+ #: builtin/remote.c:21 builtin/remote.c:69
+ msgid "git remote set-url --add <name> <newurl>"
+ msgstr ""
+
+ #: builtin/remote.c:22 builtin/remote.c:70
+ msgid "git remote set-url --delete <name> <url>"
+ msgstr ""
+
+ #: builtin/remote.c:27
+ msgid "git remote add [<options>] <name> <url>"
+ msgstr ""
+
+ #: builtin/remote.c:42
+ msgid "git remote set-head <name> (-a | -d | <branch>])"
+ msgstr ""
+
+ #: builtin/remote.c:47
+ msgid "git remote set-branches <name> <branch>..."
+ msgstr ""
+
+ #: builtin/remote.c:48
+ msgid "git remote set-branches --add <name> <branch>..."
+ msgstr ""
+
+ #: builtin/remote.c:53
+ msgid "git remote show [<options>] <name>"
+ msgstr ""
+
+ #: builtin/remote.c:58
+ msgid "git remote prune [<options>] <name>"
+ msgstr ""
+
+ #: builtin/remote.c:63
+ msgid "git remote update [<options>] [<group> | <remote>]..."
+ msgstr ""
+
#: builtin/remote.c:98
#, c-format
msgid "Updating %s"
msgid "unknown mirror argument: %s"
msgstr "未知的镜像参数：%s"
+ #: builtin/remote.c:163
+ #, fuzzy
+ msgid "fetch the remote branches"
+ msgstr " 远程分支：%s"
+
+ #: builtin/remote.c:165
+ msgid "import all tags and associated objects when fetching"
+ msgstr ""
+
+ #: builtin/remote.c:168
+ msgid "or do not fetch any tag at all (--no-tags)"
+ msgstr ""
+
+ #: builtin/remote.c:170
+ msgid "branch(es) to track"
+ msgstr ""
+
+ #: builtin/remote.c:171
+ #, fuzzy
+ msgid "master branch"
+ msgstr " 远程分支：%s"
+
+ #: builtin/remote.c:172
+ msgid "push|fetch"
+ msgstr ""
+
+ #: builtin/remote.c:173
+ msgid "set up remote as a mirror to push to or fetch from"
+ msgstr ""
+
#: builtin/remote.c:185
msgid "specifying a master branch makes no sense with --mirror"
msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
+ #: builtin/remote.c:1091
+ #, fuzzy
+ msgid "do not query remotes"
+ msgstr "不会删除 %s\n"
+
#: builtin/remote.c:1118
#, c-format
msgid "* remote %s"
msgstr[0] " 为 'git push' 配置的本地引用%s："
msgstr[1] " 为 'git push' 配置的本地引用%s："
+ #: builtin/remote.c:1199
+ msgid "set refs/remotes/<name>/HEAD according to remote"
+ msgstr ""
+
+ #: builtin/remote.c:1201
+ msgid "delete refs/remotes/<name>/HEAD"
+ msgstr ""
+
#: builtin/remote.c:1216
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
+ #: builtin/remote.c:1321
+ msgid "prune remotes after fetching"
+ msgstr ""
+
#: builtin/remote.c:1387 builtin/remote.c:1461
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
+ #: builtin/remote.c:1407
+ #, fuzzy
+ msgid "add branch"
+ msgstr "位于分支 "
+
#: builtin/remote.c:1414
msgid "no remote specified"
msgstr "未指定远程"
+ #: builtin/remote.c:1436
+ msgid "manipulate push URLs"
+ msgstr ""
+
+ #: builtin/remote.c:1438
+ msgid "add URL"
+ msgstr ""
+
+ #: builtin/remote.c:1440
+ #, fuzzy
+ msgid "delete URLs"
+ msgstr "删除"
+
#: builtin/remote.c:1447
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 无意义"
msgid "Will not delete all non-push URLs"
msgstr "将不会删除所有非推送URL地址"
+ #: builtin/remote.c:1569
+ msgid "be verbose; must be placed before a subcommand"
+ msgstr ""
+
+ #: builtin/replace.c:17
+ msgid "git replace [-f] <object> <replacement>"
+ msgstr ""
+
+ #: builtin/replace.c:18
+ msgid "git replace -d <object>..."
+ msgstr ""
+
+ #: builtin/replace.c:19
+ msgid "git replace -l [<pattern>]"
+ msgstr ""
+
+ #: builtin/replace.c:118
+ msgid "list replace refs"
+ msgstr ""
+
+ #: builtin/replace.c:119
+ msgid "delete replace refs"
+ msgstr ""
+
+ #: builtin/replace.c:120
+ msgid "replace the ref if it exists"
+ msgstr ""
+
+ #: builtin/rerere.c:11
+ msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
+ msgstr ""
+
+ #: builtin/rerere.c:56
+ #, fuzzy
+ msgid "register clean resolutions in index"
+ msgstr "%s：已经存在于索引中"
+
+ #: builtin/reset.c:25
+ msgid ""
+ "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+ msgstr ""
+
+ #: builtin/reset.c:26
+ msgid "git reset [-q] <commit> [--] <paths>..."
+ msgstr ""
+
+ #: builtin/reset.c:27
+ msgid "git reset --patch [<commit>] [--] [<paths>...]"
+ msgstr ""
+
#: builtin/reset.c:33
msgid "mixed"
msgstr "混杂"
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
+ #: builtin/reset.c:238
+ msgid "be quiet, only report errors"
+ msgstr ""
+
+ #: builtin/reset.c:240
+ msgid "reset HEAD and index"
+ msgstr ""
+
+ #: builtin/reset.c:241
+ msgid "reset only HEAD"
+ msgstr ""
+
+ #: builtin/reset.c:243 builtin/reset.c:245
+ msgid "reset HEAD, index and working tree"
+ msgstr ""
+
+ #: builtin/reset.c:247
+ msgid "reset HEAD but keep local changes"
+ msgstr ""
+
#: builtin/reset.c:303
#, c-format
msgid "Could not parse object '%s'."
msgid "%s reset is not allowed in a bare repository"
msgstr "不能对裸版本库进行%s重置"
- #: builtin/reset.c:347
- #, c-format
- msgid "Could not reset index file to revision '%s'."
- msgstr "不能重置索引文件至版本 '%s'。"
+ #: builtin/reset.c:347
+ #, c-format
+ msgid "Could not reset index file to revision '%s'."
+ msgstr "不能重置索引文件至版本 '%s'。"
+
+ #: builtin/rev-parse.c:339
+ #, fuzzy
+ msgid "git rev-parse --parseopt [options] -- [<args>...]"
+ msgstr "git apply [选项] [<补丁>...]"
+
+ #: builtin/rev-parse.c:344
+ msgid "keep the `--` passed as an arg"
+ msgstr ""
+
+ #: builtin/rev-parse.c:346
+ msgid "stop parsing after the first non-option argument"
+ msgstr ""
+
+ #: builtin/rev-parse.c:464
+ msgid ""
+ "git rev-parse --parseopt [options] -- [<args>...]\n"
+ " or: git rev-parse --sq-quote [<arg>...]\n"
+ " or: git rev-parse [options] [<arg>...]\n"
+ "\n"
+ "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+ msgstr ""
+
+ #: builtin/revert.c:22
+ msgid "git revert [options] <commit-ish>"
+ msgstr ""
+
+ #: builtin/revert.c:23
+ msgid "git revert <subcommand>"
+ msgstr ""
+
+ #: builtin/revert.c:28
+ msgid "git cherry-pick [options] <commit-ish>"
+ msgstr ""
+
+ #: builtin/revert.c:29
+ #, fuzzy
+ msgid "git cherry-pick <subcommand>"
+ msgstr "拣选失败"
+
+ #: builtin/revert.c:70 builtin/revert.c:92
+ #, c-format
+ msgid "%s: %s cannot be used with %s"
+ msgstr "%s：%s 不能和 %s 同时使用"
+
+ #: builtin/revert.c:103
+ msgid "end revert or cherry-pick sequence"
+ msgstr ""
+
+ #: builtin/revert.c:104
+ msgid "resume revert or cherry-pick sequence"
+ msgstr ""
+
+ #: builtin/revert.c:105
+ msgid "cancel revert or cherry-pick sequence"
+ msgstr ""
+
+ #: builtin/revert.c:106
+ #, fuzzy
+ msgid "don't automatically commit"
+ msgstr "不能作为初始提交还原"
+
+ #: builtin/revert.c:107
+ #, fuzzy
+ msgid "edit the commit message"
+ msgstr "空提交信息。"
+
+ #: builtin/revert.c:110
+ msgid "parent number"
+ msgstr ""
+
+ #: builtin/revert.c:112
+ #, fuzzy
+ msgid "merge strategy"
+ msgstr "尝试合并策略 %s...\n"
+
+ #: builtin/revert.c:113
+ #, fuzzy
+ msgid "option"
+ msgstr "动作"
+
+ #: builtin/revert.c:114
+ #, fuzzy
+ msgid "option for merge strategy"
+ msgstr "尝试合并策略 %s...\n"
+
+ #: builtin/revert.c:125
+ msgid "append commit name"
+ msgstr ""
+
+ #: builtin/revert.c:126
+ #, fuzzy
+ msgid "allow fast-forward"
+ msgstr "（非快进式）"
- #: builtin/revert.c:70 builtin/revert.c:92
- #, c-format
- msgid "%s: %s cannot be used with %s"
- msgstr "%s：%s 不能和 %s 同时使用"
+ #: builtin/revert.c:127
+ #, fuzzy
+ msgid "preserve initially empty commits"
+ msgstr "不能作为初始提交还原"
+
+ #: builtin/revert.c:128
+ #, fuzzy
+ msgid "allow commits with empty messages"
+ msgstr "提交说明为空"
- #: builtin/revert.c:131
+ #: builtin/revert.c:129
+ #, fuzzy
+ msgid "keep redundant, empty commits"
+ msgstr "合并未返回提交"
+
+ #: builtin/revert.c:133
msgid "program error"
msgstr "程序错误"
- #: builtin/revert.c:221
+ #: builtin/revert.c:223
msgid "revert failed"
msgstr "还原失败"
- #: builtin/revert.c:236
+ #: builtin/revert.c:238
msgid "cherry-pick failed"
msgstr "拣选失败"
+ #: builtin/rm.c:14
+ #, fuzzy
+ msgid "git rm [options] [--] <file>..."
+ msgstr "git apply [选项] [<补丁>...]"
+
#: builtin/rm.c:109
#, c-format
msgid ""
"'%s' 有本地修改\n"
"（使用 --cached 保存文件，或用 -f 强制删除）"
+ #: builtin/rm.c:134
+ #, fuzzy
+ msgid "do not list removed files"
+ msgstr "无法还原修改的文件"
+
+ #: builtin/rm.c:135
+ #, fuzzy
+ msgid "only remove from the index"
+ msgstr "不能从索引中移除 %s"
+
+ #: builtin/rm.c:136
+ msgid "override the up-to-date check"
+ msgstr ""
+
+ #: builtin/rm.c:137
+ msgid "allow recursive removal"
+ msgstr ""
+
+ #: builtin/rm.c:139
+ msgid "exit with a zero status even if nothing matched"
+ msgstr ""
+
#: builtin/rm.c:194
#, c-format
msgid "not removing '%s' recursively without -r"
msgid "git rm: unable to remove %s"
msgstr "git rm：不能删除 %s"
+ #: builtin/shortlog.c:13
+ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
+ msgstr ""
+
#: builtin/shortlog.c:157
#, c-format
msgid "Missing author: %s"
msgstr "缺少作者：%s"
+ #: builtin/shortlog.c:253
+ msgid "sort output according to the number of commits per author"
+ msgstr ""
+
+ #: builtin/shortlog.c:255
+ msgid "Suppress commit descriptions, only provides commit count"
+ msgstr ""
+
+ #: builtin/shortlog.c:257
+ msgid "Show the email address of each author"
+ msgstr ""
+
+ #: builtin/shortlog.c:258
+ msgid "w[,i1[,i2]]"
+ msgstr ""
+
+ #: builtin/shortlog.c:259
+ msgid "Linewrap output"
+ msgstr ""
+
+ #: builtin/show-branch.c:9
+ msgid ""
+ "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
+ "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
+ "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
+ "<glob>)...]"
+ msgstr ""
+
+ #: builtin/show-branch.c:10
+ msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
+ msgstr ""
+
+ #: builtin/show-branch.c:651
+ #, fuzzy
+ msgid "show remote-tracking and local branches"
+ msgstr "%s 没有来自 %s 的远程跟踪分支"
+
+ #: builtin/show-branch.c:653
+ #, fuzzy
+ msgid "show remote-tracking branches"
+ msgstr "%s 没有来自 %s 的远程跟踪分支"
+
+ #: builtin/show-branch.c:655
+ msgid "color '*!+-' corresponding to the branch"
+ msgstr ""
+
+ #: builtin/show-branch.c:657
+ msgid "show <n> more commits after the common ancestor"
+ msgstr ""
+
+ #: builtin/show-branch.c:659
+ msgid "synonym to more=-1"
+ msgstr ""
+
+ #: builtin/show-branch.c:660
+ msgid "suppress naming strings"
+ msgstr ""
+
+ #: builtin/show-branch.c:662
+ #, fuzzy
+ msgid "include the current branch"
+ msgstr "没有当前分支。"
+
+ #: builtin/show-branch.c:664
+ #, fuzzy
+ msgid "name commits with their object names"
+ msgstr "不能写注解对象"
+
+ #: builtin/show-branch.c:666
+ msgid "show possible merge bases"
+ msgstr ""
+
+ #: builtin/show-branch.c:668
+ msgid "show refs unreachable from any other ref"
+ msgstr ""
+
+ #: builtin/show-branch.c:670
+ msgid "show commits in topological order"
+ msgstr ""
+
+ #: builtin/show-branch.c:672
+ msgid "show only commits not on the first branch"
+ msgstr ""
+
+ #: builtin/show-branch.c:674
+ msgid "show merges reachable from only one tip"
+ msgstr ""
+
+ #: builtin/show-branch.c:676
+ msgid "show commits where no parent comes before its children"
+ msgstr ""
+
+ #: builtin/show-branch.c:678
+ msgid "<n>[,<base>]"
+ msgstr ""
+
+ #: builtin/show-branch.c:679
+ msgid "show <n> most recent ref-log entries starting at base"
+ msgstr ""
+
+ #: builtin/show-ref.c:10
+ msgid ""
+ "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
+ "[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
+ msgstr ""
+
+ #: builtin/show-ref.c:11
+ msgid "git show-ref --exclude-existing[=pattern] < ref-list"
+ msgstr ""
+
+ #: builtin/show-ref.c:182
+ #, fuzzy
+ msgid "only show tags (can be combined with heads)"
+ msgstr "--all 不能和引用表达式同时使用"
+
+ #: builtin/show-ref.c:183
+ #, fuzzy
+ msgid "only show heads (can be combined with tags)"
+ msgstr "--all 不能和引用表达式同时使用"
+
+ #: builtin/show-ref.c:184
+ msgid "stricter reference checking, requires exact ref path"
+ msgstr ""
+
+ #: builtin/show-ref.c:187 builtin/show-ref.c:189
+ msgid "show the HEAD reference"
+ msgstr ""
+
+ #: builtin/show-ref.c:191
+ #, fuzzy
+ msgid "dereference tags into object IDs"
+ msgstr "引用不是一个树：%s"
+
+ #: builtin/show-ref.c:193
+ msgid "only show SHA1 hash using <n> digits"
+ msgstr ""
+
+ #: builtin/show-ref.c:197
+ msgid "do not print results to stdout (useful with --verify)"
+ msgstr ""
+
+ #: builtin/show-ref.c:199
+ msgid "show refs from stdin that aren't in local repository"
+ msgstr ""
+
+ #: builtin/symbolic-ref.c:7
+ msgid "git symbolic-ref [options] name [ref]"
+ msgstr ""
+
+ #: builtin/symbolic-ref.c:38
+ msgid "suppress error message for non-symbolic (detached) refs"
+ msgstr ""
+
+ #: builtin/symbolic-ref.c:39
+ msgid "shorten ref output"
+ msgstr ""
+
+ #: builtin/symbolic-ref.c:40 builtin/update-ref.c:18
+ msgid "reason"
+ msgstr ""
+
+ #: builtin/symbolic-ref.c:40 builtin/update-ref.c:18
+ msgid "reason of the update"
+ msgstr ""
+
+ #: builtin/tag.c:22
+ msgid ""
+ "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
+ msgstr ""
+
+ #: builtin/tag.c:23
+ msgid "git tag -d <tagname>..."
+ msgstr ""
+
+ #: builtin/tag.c:24
+ msgid ""
+ "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
+ "\t\t[<pattern>...]"
+ msgstr ""
+
+ #: builtin/tag.c:26
+ msgid "git tag -v <tagname>..."
+ msgstr ""
+
#: builtin/tag.c:60
#, c-format
msgid "malformed object at '%s'"
msgid "malformed object name '%s'"
msgstr "非法的对象名 '%s'"
+ #: builtin/tag.c:447
+ msgid "list tag names"
+ msgstr ""
+
+ #: builtin/tag.c:449
+ msgid "print <n> lines of each tag message"
+ msgstr ""
+
+ #: builtin/tag.c:451
+ #, fuzzy
+ msgid "delete tags"
+ msgstr "删除"
+
+ #: builtin/tag.c:452
+ msgid "verify tags"
+ msgstr ""
+
+ #: builtin/tag.c:454
+ msgid "Tag creation options"
+ msgstr ""
+
+ #: builtin/tag.c:456
+ #, fuzzy
+ msgid "annotated tag, needs a message"
+ msgstr "注释 tag %s 没有嵌入名称"
+
+ #: builtin/tag.c:458
+ #, fuzzy
+ msgid "tag message"
+ msgstr "无 tag 说明？"
+
+ #: builtin/tag.c:460
+ msgid "annotated and GPG-signed tag"
+ msgstr ""
+
+ #: builtin/tag.c:464
+ #, fuzzy
+ msgid "use another key to sign the tag"
+ msgstr "无法签署 tag"
+
+ #: builtin/tag.c:465
+ msgid "replace the tag if exists"
+ msgstr ""
+
+ #: builtin/tag.c:466
+ msgid "show tag list in columns"
+ msgstr ""
+
+ #: builtin/tag.c:468
+ msgid "Tag listing options"
+ msgstr ""
+
+ #: builtin/tag.c:471
+ msgid "print only tags that contain the commit"
+ msgstr ""
+
+ #: builtin/tag.c:477
+ msgid "print only tags of the object"
+ msgstr ""
+
#: builtin/tag.c:506
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不兼容"
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新tag '%s'（曾为 %s）\n"
- #: git.c:16
- msgid "See 'git help <command>' for more information on a specific command."
- msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
+ #: builtin/update-index.c:401
+ #, fuzzy
+ msgid "git update-index [options] [--] [<file>...]"
+ msgstr "git apply [选项] [<补丁>...]"
- #: parse-options.h:133 parse-options.h:235
- msgid "n"
- msgstr "数字"
+ #: builtin/update-index.c:717
+ msgid "continue refresh even when index needs update"
+ msgstr ""
- #: parse-options.h:141
- msgid "time"
- msgstr "时间"
+ #: builtin/update-index.c:720
+ msgid "refresh: ignore submodules"
+ msgstr ""
- #: parse-options.h:149
- msgid "file"
- msgstr "文件"
+ #: builtin/update-index.c:723
+ #, fuzzy
+ msgid "do not ignore new files"
+ msgstr "无法存储索引文件"
- #: parse-options.h:151
- msgid "when"
- msgstr "何时"
+ #: builtin/update-index.c:725
+ msgid "let files replace directories and vice-versa"
+ msgstr ""
+
+ #: builtin/update-index.c:727
+ msgid "notice files missing from worktree"
+ msgstr ""
+
+ #: builtin/update-index.c:729
+ msgid "refresh even if index contains unmerged entries"
+ msgstr ""
+
+ #: builtin/update-index.c:732
+ msgid "refresh stat information"
+ msgstr ""
+
+ #: builtin/update-index.c:736
+ msgid "like --refresh, but ignore assume-unchanged setting"
+ msgstr ""
+
+ #: builtin/update-index.c:740
+ msgid "<mode> <object> <path>"
+ msgstr ""
+
+ #: builtin/update-index.c:741
+ #, fuzzy
+ msgid "add the specified entry to the index"
+ msgstr "添加文件内容至索引"
+
+ #: builtin/update-index.c:745
+ msgid "(+/-)x"
+ msgstr ""
+
+ #: builtin/update-index.c:746
+ msgid "override the executable bit of the listed files"
+ msgstr ""
+
+ #: builtin/update-index.c:750
+ msgid "mark files as \"not changing\""
+ msgstr ""
+
+ #: builtin/update-index.c:753
+ msgid "clear assumed-unchanged bit"
+ msgstr ""
+
+ #: builtin/update-index.c:756
+ msgid "mark files as \"index-only\""
+ msgstr ""
+
+ #: builtin/update-index.c:759
+ msgid "clear skip-worktree bit"
+ msgstr ""
+
+ #: builtin/update-index.c:762
+ msgid "add to index only; do not add content to object database"
+ msgstr ""
+
+ #: builtin/update-index.c:764
+ msgid "remove named paths even if present in worktree"
+ msgstr ""
+
+ #: builtin/update-index.c:766
+ msgid "with --stdin: input lines are terminated by null bytes"
+ msgstr ""
+
+ #: builtin/update-index.c:768
+ #, fuzzy
+ msgid "read list of paths to be updated from standard input"
+ msgstr "（正从标准输入中读取日志信息）\n"
+
+ #: builtin/update-index.c:772
+ #, fuzzy
+ msgid "add entries from standard input to the index"
+ msgstr "不能从标准输入中读取日志信息"
+
+ #: builtin/update-index.c:776
+ msgid "repopulate stages #2 and #3 for the listed paths"
+ msgstr ""
+
+ #: builtin/update-index.c:780
+ msgid "only update entries that differ from HEAD"
+ msgstr ""
+
+ #: builtin/update-index.c:784
+ msgid "ignore files missing from worktree"
+ msgstr ""
+
+ #: builtin/update-index.c:787
+ msgid "report actions to standard output"
+ msgstr ""
+
+ #: builtin/update-index.c:789
+ msgid "(for porcelains) forget saved unresolved conflicts"
+ msgstr ""
+
+ #: builtin/update-index.c:793
+ msgid "write index in this format"
+ msgstr ""
+
+ #: builtin/update-ref.c:7
+ msgid "git update-ref [options] -d <refname> [<oldval>]"
+ msgstr ""
+
+ #: builtin/update-ref.c:8
+ msgid "git update-ref [options] <refname> <newval> [<oldval>]"
+ msgstr ""
+
+ #: builtin/update-ref.c:19
+ msgid "delete the reference"
+ msgstr ""
+
+ #: builtin/update-ref.c:21
+ msgid "update <refname> not the one it points to"
+ msgstr ""
+
+ #: builtin/update-server-info.c:6
+ msgid "git update-server-info [--force]"
+ msgstr ""
+
+ #: builtin/update-server-info.c:14
+ msgid "update the info files from scratch"
+ msgstr ""
+
+ #: builtin/verify-pack.c:56
+ msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
+ msgstr ""
+
+ #: builtin/verify-pack.c:66
+ #, fuzzy
+ msgid "verbose"
+ msgstr "冗长输出"
+
+ #: builtin/verify-pack.c:68
+ msgid "show statistics only"
+ msgstr ""
+
+ #: builtin/verify-tag.c:17
+ msgid "git verify-tag [-v|--verbose] <tag>..."
+ msgstr ""
+
+ #: builtin/verify-tag.c:73
+ msgid "print tag contents"
+ msgstr ""
+
+ #: builtin/write-tree.c:13
+ msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+ msgstr ""
+
+ #: builtin/write-tree.c:26
+ msgid "<prefix>/"
+ msgstr ""
+
+ #: builtin/write-tree.c:27
+ msgid "write tree object for a subdirectory <prefix>"
+ msgstr ""
+
+ #: builtin/write-tree.c:30
+ msgid "only useful for debugging"
+ msgstr ""
+
+ #: git.c:16
+ msgid "See 'git help <command>' for more information on a specific command."
+ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
#: parse-options.h:156
msgid "no-op (backward compatibility)"
msgid "Patch failed at $msgnum $FIRSTLINE"
msgstr "补丁失败于 $msgnum $FIRSTLINE"
+ #: git-am.sh:858
+ #, sh-format
+ msgid ""
+ "The copy of the patch that failed is found in:\n"
+ " $dotest/patch"
+ msgstr ""
+
#: git-am.sh:876
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
msgid "Cannot unstage modified files"
msgstr "无法还原修改的文件"
- #: git-stash.sh:474
+ #: git-stash.sh:475
msgid "Index was not unstashed."
msgstr "索引的进度没有被恢复。"
- #: git-stash.sh:491
+ #: git-stash.sh:492
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"
- #: git-stash.sh:492
+ #: git-stash.sh:493
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}：不能丢弃进度条目"
- #: git-stash.sh:499
+ #: git-stash.sh:500
msgid "No branch name specified"
msgstr "未指定分支名"
- #: git-stash.sh:570
+ #: git-stash.sh:571
msgid "(To restore them type \"git stash apply\")"
msgstr "（为恢复数据输入 \"git stash apply\"）"
msgid "Synchronizing submodule url for '$name'"
msgstr "为 '$name' 同步子模组 url"
+ # 译者：中文字符串拼接，可删除前导空格
+ #~ msgid " (use \"git add\" to track)"
+ #~ msgstr "（使用 \"git add\" 建立跟踪）"
+
+ #~ msgid "-B cannot be used with -b"
+ #~ msgstr "-B 不能和 -b 同时使用"
+
+ #~ msgid "--patch is incompatible with all other options"
+ #~ msgstr "--patch 选项和其他选项不兼容"
+
+ #~ msgid "--detach cannot be used with -b/-B/--orphan"
+ #~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
+
+ #~ msgid "--detach cannot be used with -t"
+ #~ msgstr "--detach 不能和 -t 同时使用"
+
+ #~ msgid "--orphan and -b|-B are mutually exclusive"
+ #~ msgstr "--orphan 和 -b|-B 互斥"
+
+ #~ msgid "--orphan cannot be used with -t"
+ #~ msgstr "--orphan 不能和 -t 同时使用"
+
+ #~ msgid "git checkout: -f and -m are incompatible"
+ #~ msgstr "git checkout：-f 和 -m 不兼容"
+
+ #~ msgid ""
+ #~ "git checkout: updating paths is incompatible with switching branches."
+ #~ msgstr "git checkout：更新路径和切换分支不兼容。"
+
#~ msgid "diff setup failed"
#~ msgstr "diff 设置失败"