msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2013-04-10 15:16+0800\n"
+"POT-Creation-Date: 2013-04-30 08:25+0800\n"
"PO-Revision-Date: 2013-04-12 09:23+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
msgid "archive format"
msgstr "归档格式"
-#: archive.c:324 builtin/log.c:1117
+#: archive.c:324 builtin/log.c:1126
msgid "prefix"
msgstr "前缀"
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
-#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2366
-#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:659
-#: builtin/fast-export.c:661 builtin/grep.c:715 builtin/hash-object.c:77
-#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536
+#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371
+#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665
+#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77
+#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536
#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149
msgid "file"
msgstr "文件"
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时，使用 '\\!'。"
+#: branch.c:60
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr "未设置分支 %s 作为它自己的上游。"
+
+#: branch.c:82
+#, c-format
+msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
+
+#: branch.c:83
+#, c-format
+msgid "Branch %s set up to track remote branch %s from %s."
+msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
+
+#: branch.c:87
+#, c-format
+msgid "Branch %s set up to track local branch %s by rebasing."
+msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
+
+#: branch.c:88
+#, c-format
+msgid "Branch %s set up to track local branch %s."
+msgstr "分支 %s 设置为跟踪本地分支 %s。"
+
+#: branch.c:92
+#, c-format
+msgid "Branch %s set up to track remote ref %s by rebasing."
+msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
+
+#: branch.c:93
+#, c-format
+msgid "Branch %s set up to track remote ref %s."
+msgstr "分支 %s 设置为跟踪远程引用 %s。"
+
+#: branch.c:97
+#, c-format
+msgid "Branch %s set up to track local ref %s by rebasing."
+msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
+
+#: branch.c:98
+#, c-format
+msgid "Branch %s set up to track local ref %s."
+msgstr "分支 %s 设置为跟踪本地引用 %s。"
+
+#: branch.c:118
+#, c-format
+msgid "Tracking not set up: name too long: %s"
+msgstr "跟踪未设置：名字太长：%s"
+
+#: branch.c:137
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "未跟踪：引用 %s 有歧义"
+
+#: branch.c:182
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr "'%s' 不是一个有效的分支名称。"
+
+#: branch.c:187
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "一个分支名 '%s' 已经存在。"
+
+#: branch.c:195
+msgid "Cannot force update the current branch."
+msgstr "无法强制更新当前分支。"
+
#: branch.c:201
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
+#: branch.c:250
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "不是一个有效的对象名：'%s'。"
+
+#: branch.c:270
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "歧义的对象名：'%s'。"
+
+#: branch.c:275
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "无效的分支点：'%s'。"
+
+#: branch.c:281
+msgid "Failed to lock ref for update"
+msgstr "无法为更新锁定引用"
+
+#: branch.c:299
+msgid "Failed to write ref"
+msgstr "不能写引用"
+
#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgid "Repository lacks these prerequisite commits:"
msgstr "版本库缺少这些必备的提交："
-#: bundle.c:164 sequencer.c:651 sequencer.c:1083 builtin/log.c:300
-#: builtin/log.c:754 builtin/log.c:1350 builtin/log.c:1566 builtin/merge.c:349
-#: builtin/shortlog.c:157
+#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300
+#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349
+#: builtin/shortlog.c:155
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
msgid "rev-list died"
msgstr "rev-list 终止"
-#: bundle.c:300 builtin/log.c:1246 builtin/shortlog.c:260
+#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:3480
+#: diff.c:3481
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: diff.c:3494
+#: diff.c:3495
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数：'%s'"
msgid "failed to read the cache"
msgstr "无法读取缓存"
-#: merge.c:110 builtin/checkout.c:362 builtin/checkout.c:563
-#: builtin/clone.c:635
+#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
+#: builtin/clone.c:645
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据（blob）对象"
-#: merge-recursive.c:773 builtin/clone.c:303
+#: merge-recursive.c:773 builtin/clone.c:313
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
msgid "Could not format %s."
msgstr "不能格式化 %s。"
-#: sequencer.c:1101
+#: sequencer.c:1083
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s：不能拣选一个%s"
+
+#: sequencer.c:1085
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s：错误的版本"
+
+#: sequencer.c:1119
msgid "Can't revert as initial commit"
msgstr "不能作为初始提交还原"
-#: sequencer.c:1102
+#: sequencer.c:1120
msgid "Can't cherry-pick into empty head"
msgstr "不能拣选到空分支"
msgid "bug: unhandled diff status %c"
msgstr "bug：未处理的差异状态 %c"
-#: wt-status.c:805
+#: wt-status.c:803
msgid "You have unmerged paths."
msgstr "您有尚未合并的路径。"
# 译者：注意保持前导空格
-#: wt-status.c:808 wt-status.c:960
+#: wt-status.c:806 wt-status.c:958
msgid " (fix conflicts and run \"git commit\")"
msgstr " （解决冲突并运行 \"git commit\"）"
-#: wt-status.c:811
+#: wt-status.c:809
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲突已解决但您仍处于合并中。"
# 译者：注意保持前导空格
-#: wt-status.c:814
+#: wt-status.c:812
msgid " (use \"git commit\" to conclude merge)"
msgstr " （使用 \"git commit\" 结束合并）"
-#: wt-status.c:824
+#: wt-status.c:822
msgid "You are in the middle of an am session."
msgstr "您正处于一个 am 过程中。"
-#: wt-status.c:827
+#: wt-status.c:825
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
# 译者：注意保持前导空格
-#: wt-status.c:831
+#: wt-status.c:829
msgid " (fix conflicts and then run \"git am --resolved\")"
msgstr " （解决冲突，然后运行 \"git am --resolved\"）"
# 译者：注意保持前导空格
-#: wt-status.c:833
+#: wt-status.c:831
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " （使用 \"git am --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:835
+#: wt-status.c:833
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " （使用 \"git am --abort\" 恢复原有分支）"
-#: wt-status.c:895 wt-status.c:912
+#: wt-status.c:893 wt-status.c:910
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您正在将分支 '%s' 变基到 '%s'。"
-#: wt-status.c:900 wt-status.c:917
+#: wt-status.c:898 wt-status.c:915
msgid "You are currently rebasing."
msgstr "您正在变基。"
# 译者：注意保持前导空格
-#: wt-status.c:903
+#: wt-status.c:901
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:905
+#: wt-status.c:903
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:907
+#: wt-status.c:905
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
# 译者：注意保持前导空格
-#: wt-status.c:920
+#: wt-status.c:918
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
-#: wt-status.c:924
+#: wt-status.c:922
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"
-#: wt-status.c:929
+#: wt-status.c:927
msgid "You are currently splitting a commit during a rebase."
msgstr "您正在变基过程中拆分一个提交。"
# 译者：注意保持前导空格
-#: wt-status.c:932
+#: wt-status.c:930
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
-#: wt-status.c:936
+#: wt-status.c:934
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"
-#: wt-status.c:941
+#: wt-status.c:939
msgid "You are currently editing a commit during a rebase."
msgstr "您正在变基过程中编辑一个提交。"
# 译者：注意保持前导空格
-#: wt-status.c:944
+#: wt-status.c:942
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " （使用 \"git commit --amend\" 修补当前提交）"
# 译者：注意保持前导空格
-#: wt-status.c:946
+#: wt-status.c:944
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
-#: wt-status.c:956
+#: wt-status.c:954
msgid "You are currently cherry-picking."
msgstr "您正在做拣选操作。"
# 译者：注意保持前导空格
-#: wt-status.c:963
+#: wt-status.c:961
msgid " (all conflicts fixed: run \"git commit\")"
msgstr " （解决所有冲突后，执行 \"git commit\"）"
-#: wt-status.c:972
+#: wt-status.c:970
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您正在反转提交 %s 。"
# 译者：注意保持前导空格
-#: wt-status.c:977
+#: wt-status.c:975
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " （解决冲突并运行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:980
+#: wt-status.c:978
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:982
+#: wt-status.c:980
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
-#: wt-status.c:993
+#: wt-status.c:991
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您正在从分支 '%s' 开始做二分查找。"
-#: wt-status.c:997
+#: wt-status.c:995
msgid "You are currently bisecting."
msgstr "您正在做二分查找。"
# 译者：注意保持前导空格
-#: wt-status.c:1000
+#: wt-status.c:998
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
-#: wt-status.c:1175
+#: wt-status.c:1173
msgid "On branch "
msgstr "位于分支 "
-#: wt-status.c:1186
+#: wt-status.c:1184
msgid "HEAD detached at "
msgstr "头指针分离于 "
-#: wt-status.c:1188
+#: wt-status.c:1186
msgid "HEAD detached from "
msgstr "头指针分离自 "
-#: wt-status.c:1191
+#: wt-status.c:1189
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
-#: wt-status.c:1208
+#: wt-status.c:1206
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1222
+#: wt-status.c:1220
msgid "Untracked files"
msgstr "未跟踪的文件"
-#: wt-status.c:1224
+#: wt-status.c:1222
msgid "Ignored files"
msgstr "忽略的文件"
-# 译者：以下三条实际为一个段落
-#: wt-status.c:1228
+#: wt-status.c:1226
#, c-format
-msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
-msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
+"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
-# 译者：为对齐，下面两句内容有调整
#: wt-status.c:1232
-msgid "may speed it up, but you have to be careful not to forget to add"
-msgstr "也许能提高速度，但您需要小心不要忘了添加新文件"
-
-#: wt-status.c:1235
-msgid "new files yourself (see 'git help status')."
-msgstr "（参见 'git help status'）。"
-
-#: wt-status.c:1238
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1240
+#: wt-status.c:1234
msgid " (use -u option to show untracked files)"
msgstr "（使用 -u 参数显示未跟踪的文件）"
-#: wt-status.c:1246
+#: wt-status.c:1240
msgid "No changes"
msgstr "没有修改"
-#: wt-status.c:1251
+#: wt-status.c:1245
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
-#: wt-status.c:1254
+#: wt-status.c:1248
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1257
+#: wt-status.c:1251
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1260
+#: wt-status.c:1254
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交为空，但是存在尚未跟踪的文件\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1263
+#: wt-status.c:1257
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1266 wt-status.c:1271
+#: wt-status.c:1260 wt-status.c:1265
#, c-format
msgid "nothing to commit\n"
msgstr "无文件要提交\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1269
+#: wt-status.c:1263
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1273
+#: wt-status.c:1267
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "无文件要提交，干净的工作区\n"
-#: wt-status.c:1381
+#: wt-status.c:1375
msgid "HEAD (no branch)"
msgstr "HEAD（非分支）"
# 译者：注意保持句尾空格
-#: wt-status.c:1387
+#: wt-status.c:1381
msgid "Initial commit on "
msgstr "初始提交于 "
# 译者：注意保持句尾空格
-#: wt-status.c:1402
+#: wt-status.c:1396
msgid "behind "
msgstr "落后 "
# 译者：注意保持句尾空格
-#: wt-status.c:1405 wt-status.c:1408
+#: wt-status.c:1399 wt-status.c:1402
msgid "ahead "
msgstr "领先 "
# 译者：注意保持句尾空格
-#: wt-status.c:1410
+#: wt-status.c:1404
msgid ", behind "
msgstr "，落后 "
-#: compat/precompose_utf8.c:58 builtin/clone.c:342
+#: compat/precompose_utf8.c:58 builtin/clone.c:352
#, c-format
msgid "failed to unlink '%s'"
msgstr "无法删除 '%s'"
msgid "git add [options] [--] <pathspec>..."
msgstr "git add [选项] [--] <路径匹配>..."
-#: builtin/add.c:63
+# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
+#.
+#. * To be consistent with "git add -p" and most Git
+#. * commands, we should default to being tree-wide, but
+#. * this is not the original behavior and can't be
+#. * changed until users trained themselves not to type
+#. * "git add -u" or "git add -A". For now, we warn and
+#. * keep the old behavior. Later, the behavior can be changed
+#. * to tree-wide, keeping the warning for a while, and
+#. * eventually we can drop the warning.
+#.
+#: builtin/add.c:58
+#, c-format
+msgid ""
+"The behavior of 'git add %s (or %s)' with no path argument from a\n"
+"subdirectory of the tree will change in Git 2.0 and should not be used "
+"anymore.\n"
+"To add content for the whole tree, run:\n"
+"\n"
+" git add %s :/\n"
+" (or git add %s :/)\n"
+"\n"
+"To restrict the command to the current directory, run:\n"
+"\n"
+" git add %s .\n"
+" (or git add %s .)\n"
+"\n"
+"With the current Git version, the command is restricted to the current "
+"directory.\n"
+msgstr ""
+"在 Git 2.0 版本，位于一个子目录下不带任何路径参数地执行命令\n"
+"'git add %s (或 %s)' 的行为将被改变，不要再继续使用了。\n"
+"如果要添加整个目录树的内容，执行：\n"
+"\n"
+" git add %s :/\n"
+" (或 git add %s :/)\n"
+"\n"
+"如果要限制该命令只作用于当前目录，执行：\n"
+"\n"
+" git add %s .\n"
+" (或 git add %s .)\n"
+"\n"
+"对于当前版本的 Git，这条命令只作用于当前目录。\n"
+
+#: builtin/add.c:100
+#, c-format
+msgid ""
+"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
+"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
+"Paths like '%s' that are\n"
+"removed from your working tree are ignored with this version of Git.\n"
+"\n"
+"* 'git add --ignore-removal <pathspec>', which is the current default,\n"
+" ignores paths you removed from your working tree.\n"
+"\n"
+"* 'git add --all <pathspec>' will let you also record the removals.\n"
+"\n"
+"Run 'git status' to check the paths you removed from your working tree.\n"
+msgstr ""
+"您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal'，\n"
+"针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
+"像本地工作区移除的路径 '%s'\n"
+"在此版本的 Git 中被忽略。\n"
+"\n"
+"* 'git add --ignore-removal <pathspec>'，是当前版本的默认操作，\n"
+" 忽略您本地工作区中移除的文件。\n"
+"\n"
+"* 'git add --all <pathspec>' 将让您同时对删除操作进行记录。\n"
+"\n"
+"运行 'git status' 来检查您本地工作区中移除的路径。\n"
+
+#: builtin/add.c:144
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"
-#: builtin/add.c:68 builtin/commit.c:233
+#: builtin/add.c:149 builtin/commit.c:233
msgid "updating files failed"
msgstr "更新文件失败"
-#: builtin/add.c:78
+#: builtin/add.c:163
#, c-format
msgid "remove '%s'\n"
msgstr "删除 '%s'\n"
-#: builtin/add.c:148
+#: builtin/add.c:253
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更："
-#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275
+#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径 '%s' 未匹配任何文件"
-#: builtin/add.c:234
+#: builtin/add.c:339
msgid "Could not read the index"
msgstr "不能读取索引"
-#: builtin/add.c:244
+#: builtin/add.c:349
#, c-format
msgid "Could not open '%s' for writing."
msgstr "不能打开 '%s' 以写入。"
-#: builtin/add.c:248
+#: builtin/add.c:353
msgid "Could not write patch"
msgstr "不能生成补丁"
-#: builtin/add.c:253
+#: builtin/add.c:358
#, c-format
msgid "Could not stat '%s'"
msgstr "不能查看文件状态 '%s'"
-#: builtin/add.c:255
+#: builtin/add.c:360
msgid "Empty patch. Aborted."
msgstr "空补丁。异常终止。"
-#: builtin/add.c:261
+#: builtin/add.c:366
#, c-format
msgid "Could not apply '%s'"
msgstr "不能应用 '%s'"
-#: builtin/add.c:271
+#: builtin/add.c:376
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
-#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
+#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
#: builtin/rm.c:206
msgid "dry run"
msgstr "演习"
-#: builtin/add.c:278 builtin/apply.c:4409 builtin/check-ignore.c:19
+#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19
#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613
-#: builtin/log.c:1514 builtin/mv.c:62 builtin/read-tree.c:112
+#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112
msgid "be verbose"
msgstr "冗长输出"
-#: builtin/add.c:280
+#: builtin/add.c:396
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:281 builtin/checkout.c:1060 builtin/reset.c:258
+#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
-#: builtin/add.c:282
+#: builtin/add.c:398
msgid "edit current diff and apply"
msgstr "编辑当前差异并应用"
-#: builtin/add.c:283
+#: builtin/add.c:399
msgid "allow adding otherwise ignored files"
msgstr "允许添加忽略的文件"
-#: builtin/add.c:284
+#: builtin/add.c:400
msgid "update tracked files"
msgstr "更新已跟踪的文件"
-#: builtin/add.c:285
+#: builtin/add.c:401
msgid "record only the fact that the path will be added later"
msgstr "只记录，该路径稍后再添加"
-#: builtin/add.c:286
+#: builtin/add.c:402
msgid "add changes from all tracked and untracked files"
msgstr "添加所有改变的已跟踪文件和未跟踪文件"
-#: builtin/add.c:287
+#. takes no arguments
+#: builtin/add.c:405
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
+
+#: builtin/add.c:407
msgid "don't add, only refresh the index"
msgstr "不添加，只刷新索引"
-#: builtin/add.c:288
+#: builtin/add.c:408
msgid "just skip files which cannot be added because of errors"
msgstr "跳过因出错不能添加的文件"
-#: builtin/add.c:289
+#: builtin/add.c:409
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
-#: builtin/add.c:311
+#: builtin/add.c:431
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "使用 -f 参数如果您确实要添加它们。\n"
-#: builtin/add.c:312
+#: builtin/add.c:432
msgid "no files added"
msgstr "没有文件被添加"
-#: builtin/add.c:318
+#: builtin/add.c:438
msgid "adding files failed"
msgstr "添加文件失败"
-# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
-#.
-#. * To be consistent with "git add -p" and most Git
-#. * commands, we should default to being tree-wide, but
-#. * this is not the original behavior and can't be
-#. * changed until users trained themselves not to type
-#. * "git add -u" or "git add -A". For now, we warn and
-#. * keep the old behavior. Later, the behavior can be changed
-#. * to tree-wide, keeping the warning for a while, and
-#. * eventually we can drop the warning.
-#.
-#: builtin/add.c:335
-#, c-format
-msgid ""
-"The behavior of 'git add %s (or %s)' with no path argument from a\n"
-"subdirectory of the tree will change in Git 2.0 and should not be used "
-"anymore.\n"
-"To add content for the whole tree, run:\n"
-"\n"
-" git add %s :/\n"
-" (or git add %s :/)\n"
-"\n"
-"To restrict the command to the current directory, run:\n"
-"\n"
-" git add %s .\n"
-" (or git add %s .)\n"
-"\n"
-"With the current Git version, the command is restricted to the current "
-"directory."
-msgstr ""
-"在 Git 2.0 版本，将不再允许在一个子目录下不带任何路径参数地执行\n"
-"命令 'git add %s (或 %s)'。所以不要再继续使用了。\n"
-"如果要添加整个目录树的内容，执行：\n"
-"\n"
-" git add %s :/\n"
-" (或 git add %s :/)\n"
-"\n"
-"如果要限制该命令只作用于当前目录，执行：\n"
-"\n"
-" git add %s .\n"
-" (或 git add %s .)\n"
-"\n"
-"对于当前版本的 Git，这条命令只作用于当前目录。"
-
-#: builtin/add.c:381
+#: builtin/add.c:477
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 选项互斥"
-#: builtin/add.c:383
+#: builtin/add.c:495
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
-#: builtin/add.c:414
+#: builtin/add.c:525
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件，也没有文件被添加。\n"
-#: builtin/add.c:415
+#: builtin/add.c:526
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想要执行 'git add .'？\n"
-#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204
+#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204
#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: builtin/add.c:481 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370
+#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
msgid "Checking patch %s..."
msgstr "检查补丁 %s..."
-#: builtin/apply.c:3679 builtin/checkout.c:215 builtin/reset.c:124
+#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:463
+#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
msgid "git blame [options] [rev-opts] [rev] [--] file"
msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
-#: builtin/blame.c:30 builtin/shortlog.c:15
+#: builtin/blame.c:30
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
-#: builtin/blame.c:2350
+#: builtin/blame.c:2355
msgid "Show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
-#: builtin/blame.c:2351
+#: builtin/blame.c:2356
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "边界提交显示空的 SHA-1（默认：关闭）"
-#: builtin/blame.c:2352
+#: builtin/blame.c:2357
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界（默认：关闭）"
-#: builtin/blame.c:2353
+#: builtin/blame.c:2358
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
-#: builtin/blame.c:2354
+#: builtin/blame.c:2359
msgid "Show output score for blame entries"
msgstr "显示判断 blame 条目位移的得分诊断信息"
-#: builtin/blame.c:2355
+#: builtin/blame.c:2360
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件名（默认：自动）"
-#: builtin/blame.c:2356
+#: builtin/blame.c:2361
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行号（默认：关闭）"
-#: builtin/blame.c:2357
+#: builtin/blame.c:2362
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
-#: builtin/blame.c:2358
+#: builtin/blame.c:2363
msgid "Show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
-#: builtin/blame.c:2359
+#: builtin/blame.c:2364
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
-#: builtin/blame.c:2360
+#: builtin/blame.c:2365
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳（默认：关闭）"
-#: builtin/blame.c:2361
+#: builtin/blame.c:2366
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的SHA1提交号（默认：关闭）"
-#: builtin/blame.c:2362
+#: builtin/blame.c:2367
msgid "Suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳（默认：关闭）"
-#: builtin/blame.c:2363
+#: builtin/blame.c:2368
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字（默认：关闭）"
-#: builtin/blame.c:2364
+#: builtin/blame.c:2369
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:2365
+#: builtin/blame.c:2370
msgid "Spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
-#: builtin/blame.c:2366
+#: builtin/blame.c:2371
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
-#: builtin/blame.c:2367
+#: builtin/blame.c:2372
msgid "Use <file>'s contents as the final image"
msgstr "使用 <file> 的内容作为最终的图片"
-#: builtin/blame.c:2368 builtin/blame.c:2369
+#: builtin/blame.c:2373 builtin/blame.c:2374
msgid "score"
msgstr "得分"
-#: builtin/blame.c:2368
+#: builtin/blame.c:2373
msgid "Find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
-#: builtin/blame.c:2369
+#: builtin/blame.c:2374
msgid "Find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
-#: builtin/blame.c:2370
+#: builtin/blame.c:2375
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2370
+#: builtin/blame.c:2375
msgid "Process only line range n,m, counting from 1"
msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:146
+#: builtin/branch.c:150
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s'，但未合并到 HEAD。"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:150
+#: builtin/branch.c:154
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
" 然而却尚未被合并到分支 '%s' 。"
-#: builtin/branch.c:164
+#: builtin/branch.c:168
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"
-#: builtin/branch.c:168
+#: builtin/branch.c:172
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"分支 '%s' 没有完全合并。\n"
"如果您确认要删除它，执行 'git branch -D %s'。"
-#: builtin/branch.c:181
+#: builtin/branch.c:185
msgid "Update of config-file failed"
msgstr "无法更新 config 文件"
-#: builtin/branch.c:209
+#: builtin/branch.c:213
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 同时使用"
-#: builtin/branch.c:215
+#: builtin/branch.c:219
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
-#: builtin/branch.c:223
+#: builtin/branch.c:227
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "无法删除您当前所在的分支 '%s'。"
-#: builtin/branch.c:236
+#: builtin/branch.c:240
#, c-format
msgid "remote branch '%s' not found."
msgstr "远程分支 '%s' 未发现。"
-#: builtin/branch.c:237
+#: builtin/branch.c:241
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未发现。"
-#: builtin/branch.c:251
+#: builtin/branch.c:255
#, c-format
msgid "Error deleting remote branch '%s'"
msgstr "删除远程分支 '%s' 时出错"
-#: builtin/branch.c:252
+#: builtin/branch.c:256
#, c-format
msgid "Error deleting branch '%s'"
msgstr "删除分支 '%s' 时出错"
-#: builtin/branch.c:259
+#: builtin/branch.c:263
#, c-format
msgid "Deleted remote branch %s (was %s).\n"
msgstr "已删除远程分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:260
+#: builtin/branch.c:264
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:362
+#: builtin/branch.c:366
#, c-format
msgid "branch '%s' does not point at a commit"
msgstr "分支 '%s' 未指向一个提交"
-#: builtin/branch.c:434
+#: builtin/branch.c:453
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s：落后 %d]"
-#: builtin/branch.c:436
+#: builtin/branch.c:455
#, c-format
msgid "[behind %d]"
msgstr "[落后 %d]"
-#: builtin/branch.c:440
+#: builtin/branch.c:459
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s：领先 %d]"
-#: builtin/branch.c:442
+#: builtin/branch.c:461
#, c-format
msgid "[ahead %d]"
msgstr "[领先 %d]"
-#: builtin/branch.c:445
+#: builtin/branch.c:464
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s：领先 %d，落后 %d]"
-#: builtin/branch.c:448
+#: builtin/branch.c:467
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[领先 %d，落后 %d]"
-#: builtin/branch.c:470
+#: builtin/branch.c:490
msgid " **** invalid ref ****"
msgstr " **** 无效引用 ****"
-#: builtin/branch.c:562
+#: builtin/branch.c:582
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "（非分支，正变基 %s）"
-#: builtin/branch.c:565
+#: builtin/branch.c:585
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "（非分支，二分查找开始于 %s）"
-#: builtin/branch.c:568
+#: builtin/branch.c:588
#, c-format
msgid "(detached from %s)"
msgstr "（分离自 %s）"
-#: builtin/branch.c:571
+#: builtin/branch.c:591
msgid "(no branch)"
msgstr "（非分支）"
-#: builtin/branch.c:617
+#: builtin/branch.c:637
#, c-format
msgid "object '%s' does not point to a commit"
msgstr "对象 '%s' 没有指向一个提交"
-#: builtin/branch.c:649
+#: builtin/branch.c:669
msgid "some refs could not be read"
msgstr "一些引用不能读取"
-#: builtin/branch.c:662
+#: builtin/branch.c:682
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
-#: builtin/branch.c:672
+#: builtin/branch.c:692
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名：'%s'"
-#: builtin/branch.c:687
+#: builtin/branch.c:707
msgid "Branch rename failed"
msgstr "分支重命名失败"
-#: builtin/branch.c:691
+#: builtin/branch.c:711
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "重命名掉一个错误命名的旧分支 '%s'"
-#: builtin/branch.c:695
+#: builtin/branch.c:715
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s，但 HEAD 没有更新！"
-#: builtin/branch.c:702
+#: builtin/branch.c:722
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名，但更新 config 文件失败"
-#: builtin/branch.c:717
+#: builtin/branch.c:737
#, c-format
msgid "malformed object name %s"
msgstr "非法的对象名 %s"
-#: builtin/branch.c:741
+#: builtin/branch.c:761
#, c-format
msgid "could not write branch description template: %s"
msgstr "不能写分支描述模版：%s"
-#: builtin/branch.c:771
+#: builtin/branch.c:791
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:773
+#: builtin/branch.c:793
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
-#: builtin/branch.c:774
+#: builtin/branch.c:794
msgid "suppress informational messages"
msgstr "不显示信息"
-#: builtin/branch.c:775
+#: builtin/branch.c:795
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模式（参见 git-pull(1)）"
-#: builtin/branch.c:777
+#: builtin/branch.c:797
msgid "change upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:781
+#: builtin/branch.c:801
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:782
+#: builtin/branch.c:802
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:785 builtin/branch.c:791 builtin/branch.c:812
-#: builtin/branch.c:818 builtin/commit.c:1368 builtin/commit.c:1369
+#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
+#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369
#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468
msgid "commit"
msgstr "提交"
-#: builtin/branch.c:786 builtin/branch.c:792
+#: builtin/branch.c:806 builtin/branch.c:812
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
-#: builtin/branch.c:798
+#: builtin/branch.c:818
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作："
-#: builtin/branch.c:799
+#: builtin/branch.c:819
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
-#: builtin/branch.c:801
+#: builtin/branch.c:821
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
-#: builtin/branch.c:802
+#: builtin/branch.c:822
msgid "delete branch (even if not merged)"
msgstr "删除分支（即使没有合并）"
-#: builtin/branch.c:803
+#: builtin/branch.c:823
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支，以及它的引用日志"
-#: builtin/branch.c:804
+#: builtin/branch.c:824
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支，即使目标已存在"
-#: builtin/branch.c:805
+#: builtin/branch.c:825
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:806
+#: builtin/branch.c:826
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:808
+#: builtin/branch.c:828
msgid "edit the description for the branch"
msgstr "标记分支的描述"
-#: builtin/branch.c:809
+#: builtin/branch.c:829
msgid "force creation (when already exists)"
msgstr "强制创建（当已经存在）"
-#: builtin/branch.c:812
+#: builtin/branch.c:832
msgid "print only not merged branches"
msgstr "只打印没有合并的分支"
-#: builtin/branch.c:818
+#: builtin/branch.c:838
msgid "print only merged branches"
msgstr "只打印合并的分支"
-#: builtin/branch.c:822
+#: builtin/branch.c:842
msgid "list branches in columns"
msgstr "以列的方式显示分支"
-#: builtin/branch.c:835
+#: builtin/branch.c:855
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
-#: builtin/branch.c:840 builtin/clone.c:609
+#: builtin/branch.c:860 builtin/clone.c:619
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
-#: builtin/branch.c:863
+#: builtin/branch.c:883
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
-#: builtin/branch.c:869 builtin/branch.c:908
+#: builtin/branch.c:889 builtin/branch.c:928
msgid "branch name required"
msgstr "必须提供分支名"
-#: builtin/branch.c:884
+#: builtin/branch.c:904
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
-#: builtin/branch.c:889
+#: builtin/branch.c:909
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
-#: builtin/branch.c:896
+#: builtin/branch.c:916
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
-#: builtin/branch.c:899
+#: builtin/branch.c:919
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:914
+#: builtin/branch.c:934
msgid "too many branches for a rename operation"
msgstr "为重命名操作提供了太多的分支名"
-#: builtin/branch.c:919
+#: builtin/branch.c:939
msgid "too many branches to set new upstream"
msgstr "为设置新上游提供了太多的分支名"
-#: builtin/branch.c:923
+#: builtin/branch.c:943
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
-#: builtin/branch.c:926 builtin/branch.c:948 builtin/branch.c:970
+#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:930
+#: builtin/branch.c:950
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:942
+#: builtin/branch.c:962
msgid "too many branches to unset upstream"
msgstr "为取消上游设置操作提供了太多的分支名"
-#: builtin/branch.c:946
+#: builtin/branch.c:966
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/branch.c:952
+#: builtin/branch.c:972
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
-#: builtin/branch.c:967
+#: builtin/branch.c:987
msgid "it does not make sense to create 'HEAD' manually"
msgstr "手工创建 'HEAD' 没有意义"
-#: builtin/branch.c:973
+#: builtin/branch.c:993
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
-#: builtin/branch.c:976
+#: builtin/branch.c:996
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
msgstr ""
"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
-#: builtin/branch.c:993
+#: builtin/branch.c:1013
#, c-format
msgid ""
"\n"
"如果你想用 '%s' 跟踪 '%s', 这么做：\n"
"\n"
-#: builtin/branch.c:994
+#: builtin/branch.c:1014
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:995
+#: builtin/branch.c:1015
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
msgid "Need a repository to unbundle."
msgstr "需要一个版本库来解包。"
-#: builtin/cat-file.c:247
+#: builtin/cat-file.c:176
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
-#: builtin/cat-file.c:248
+#: builtin/cat-file.c:177
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
-#: builtin/cat-file.c:266
+#: builtin/cat-file.c:195
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
-#: builtin/cat-file.c:267
+#: builtin/cat-file.c:196
msgid "show object type"
msgstr "显示对象类型"
-#: builtin/cat-file.c:268
+#: builtin/cat-file.c:197
msgid "show object size"
msgstr "显示对象大小"
-#: builtin/cat-file.c:270
+#: builtin/cat-file.c:199
msgid "exit with zero when there's no error"
msgstr "当没有错误时退出并返回零"
-#: builtin/cat-file.c:271
+#: builtin/cat-file.c:200
msgid "pretty-print object's content"
msgstr "美观地打印对象的内容"
-#: builtin/cat-file.c:273
+#: builtin/cat-file.c:202
msgid "for blob objects, run textconv on object's content"
msgstr "对于数据（blob）对象，对其内容执行 textconv"
-#: builtin/cat-file.c:275
+#: builtin/cat-file.c:204
msgid "show info and content of objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息和内容"
-#: builtin/cat-file.c:278
+#: builtin/cat-file.c:207
msgid "show info about objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息"
msgid "input paths are terminated by a null character"
msgstr "输入路径以null字符终止"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1041 builtin/gc.c:177
+#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177
msgid "suppress progress reporting"
msgstr "不显示进度报告"
-#: builtin/check-ignore.c:151
+#: builtin/check-ignore.c:146
msgid "cannot specify pathnames with --stdin"
msgstr "不能同时提供路径及 --stdin 参数"
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:149
msgid "-z only makes sense with --stdin"
msgstr "-z 需要和 --stdin 参数共用才有意义"
-#: builtin/check-ignore.c:156
+#: builtin/check-ignore.c:151
msgid "no path specified"
msgstr "未指定路径"
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:155
msgid "--quiet is only valid with a single pathname"
msgstr "参数 --quiet 只在提供一个路径名时有效"
-#: builtin/check-ignore.c:162
+#: builtin/check-ignore.c:157
msgid "cannot have both --quiet and --verbose"
msgstr "不能同时提供 --quiet 和 --verbose 参数"
msgid "git checkout [options] [<branch>] -- <file>..."
msgstr "git checkout [选项] [<分支>] -- <文件>..."
-#: builtin/checkout.c:116 builtin/checkout.c:149
+#: builtin/checkout.c:117 builtin/checkout.c:150
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
-#: builtin/checkout.c:118 builtin/checkout.c:151
+#: builtin/checkout.c:119 builtin/checkout.c:152
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
-#: builtin/checkout.c:134
+#: builtin/checkout.c:135
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必须的版本"
-#: builtin/checkout.c:178
+#: builtin/checkout.c:179
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必须的版本"
-#: builtin/checkout.c:195
+#: builtin/checkout.c:196
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s'：无法合并"
-#: builtin/checkout.c:212
+#: builtin/checkout.c:213
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
-#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
-#: builtin/checkout.c:245
+#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
+#: builtin/checkout.c:246
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路径时使用"
-#: builtin/checkout.c:248 builtin/checkout.c:251
+#: builtin/checkout.c:249 builtin/checkout.c:252
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 不能和 %s 同时使用"
-#: builtin/checkout.c:254
+#: builtin/checkout.c:255
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同时更新路径并切换到分支'%s'。"
-#: builtin/checkout.c:265 builtin/checkout.c:455
+#: builtin/checkout.c:266 builtin/checkout.c:458
msgid "corrupt index file"
msgstr "损坏的索引文件"
-#: builtin/checkout.c:326 builtin/checkout.c:333
+#: builtin/checkout.c:329 builtin/checkout.c:336
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:477
+#: builtin/checkout.c:480
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:598
+#: builtin/checkout.c:601
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr "不能对 '%s' 执行 reflog 操作\n"
-#: builtin/checkout.c:631
+#: builtin/checkout.c:634
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:638
+#: builtin/checkout.c:641
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:641
+#: builtin/checkout.c:644
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:645
+#: builtin/checkout.c:648
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:647 builtin/checkout.c:984
+#: builtin/checkout.c:650 builtin/checkout.c:987
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:649
+#: builtin/checkout.c:652
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:705
+#: builtin/checkout.c:708
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
#. The singular version
-#: builtin/checkout.c:711
+#: builtin/checkout.c:714
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:729
+#: builtin/checkout.c:732
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
" git branch new_branch_name %s\n"
"\n"
-#: builtin/checkout.c:759
+#: builtin/checkout.c:762
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:763
+#: builtin/checkout.c:766
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:790 builtin/checkout.c:979
+#: builtin/checkout.c:793 builtin/checkout.c:982
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
#. case (1)
-#: builtin/checkout.c:915
+#: builtin/checkout.c:918
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
#. case (1): want a tree
-#: builtin/checkout.c:954
+#: builtin/checkout.c:957
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:996
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:996 builtin/checkout.c:1000
+#: builtin/checkout.c:999 builtin/checkout.c:1003
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1004 builtin/checkout.c:1007 builtin/checkout.c:1012
-#: builtin/checkout.c:1015
+#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015
+#: builtin/checkout.c:1018
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1020
+#: builtin/checkout.c:1023
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1042 builtin/checkout.c:1044 builtin/clone.c:90
+#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90
#: builtin/remote.c:169 builtin/remote.c:171
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1043
+#: builtin/checkout.c:1046
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1048
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1046
+#: builtin/checkout.c:1049
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1047
+#: builtin/checkout.c:1050
msgid "detach the HEAD at named commit"
msgstr "成为指向该提交的分离头指针"
-#: builtin/checkout.c:1048
+#: builtin/checkout.c:1051
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
-#: builtin/checkout.c:1050
+#: builtin/checkout.c:1053
msgid "new branch"
msgstr "新分支"
-#: builtin/checkout.c:1050
+#: builtin/checkout.c:1053
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1054
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1056
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1058
msgid "force checkout (throw away local modifications)"
msgstr "强制检出（丢弃本地修改）"
-#: builtin/checkout.c:1056
+#: builtin/checkout.c:1059
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三路合并"
-#: builtin/checkout.c:1057 builtin/merge.c:217
+#: builtin/checkout.c:1060 builtin/merge.c:217
msgid "update ignored files (default)"
msgstr "更新忽略的文件（默认）"
-#: builtin/checkout.c:1058 builtin/log.c:1149 parse-options.h:245
+#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1059
+#: builtin/checkout.c:1062
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格（merge 或 diff3）"
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1065
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "对路径不做稀疏检出的限制"
+
+#: builtin/checkout.c:1067
msgid "second guess 'git checkout no-such-branch'"
msgstr "再者猜测'git checkout no-such-branch'"
-#: builtin/checkout.c:1086
+#: builtin/checkout.c:1091
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b、-B 和 --orphan 是互斥的"
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1108
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1110
+#: builtin/checkout.c:1115
msgid "Missing branch name; try -b"
msgstr "缺少分支名；尝试 -b"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1150
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1157
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"不能同时更新路径并切换到分支'%s'。\n"
"您是想要检出 '%s' 但其未能解析为提交么？"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1162
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1166
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr "删除整个目录"
#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717
-#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182
+#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182
msgid "pattern"
msgstr "模式"
msgid "set config inside the new repository"
msgstr "在新版本库中设置配置信息"
-#: builtin/clone.c:244
+#: builtin/clone.c:254
#, c-format
-msgid "reference repository '%s' is not a local directory."
-msgstr "å¼\95ç\94¨ç\89\88æ\9c¬åº\93 '%s' ä¸\8dæ\98¯ä¸\80个æ\9c¬å\9c°ç\9b®å½\95。"
+msgid "reference repository '%s' is not a local repository."
+msgstr "å¼\95ç\94¨ç\89\88æ\9c¬åº\93 '%s' ä¸\8dæ\98¯ä¸\80个æ\9c¬å\9c°ç\89\88æ\9c¬åº\93。"
-#: builtin/clone.c:307
+#: builtin/clone.c:317
#, c-format
msgid "failed to create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: builtin/clone.c:309 builtin/diff.c:77
+#: builtin/clone.c:319 builtin/diff.c:77
#, c-format
msgid "failed to stat '%s'"
msgstr "无法枚举 '%s' 状态"
-#: builtin/clone.c:311
+#: builtin/clone.c:321
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:325
+#: builtin/clone.c:335
#, c-format
msgid "failed to stat %s\n"
msgstr "无法枚举 %s 状态\n"
-#: builtin/clone.c:347
+#: builtin/clone.c:357
#, c-format
msgid "failed to create link '%s'"
msgstr "无法创建链接 '%s'"
-#: builtin/clone.c:351
+#: builtin/clone.c:361
#, c-format
msgid "failed to copy file to '%s'"
msgstr "无法拷贝文件至 '%s'"
-#: builtin/clone.c:374
+#: builtin/clone.c:384
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:387
+#: builtin/clone.c:397
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
"'git checkout -f HEAD' 重试\n"
-#: builtin/clone.c:466
+#: builtin/clone.c:476
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:540
+#: builtin/clone.c:550
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必须的对象"
-#: builtin/clone.c:600
+#: builtin/clone.c:610
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/clone.c:631
+#: builtin/clone.c:641
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:739
+#: builtin/clone.c:749
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:743
+#: builtin/clone.c:753
msgid "You must specify a repository to clone."
msgstr "您必须指定一个版本库来克隆。"
-#: builtin/clone.c:754
+#: builtin/clone.c:764
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:757
+#: builtin/clone.c:767
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:770
+#: builtin/clone.c:780
#, c-format
msgid "repository '%s' does not exist"
msgstr "版本库 '%s' 不存在"
-#: builtin/clone.c:775
+#: builtin/clone.c:785
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
-#: builtin/clone.c:785
+#: builtin/clone.c:795
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:795
+#: builtin/clone.c:805
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:808 builtin/clone.c:820
+#: builtin/clone.c:818 builtin/clone.c:830
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:811
+#: builtin/clone.c:821
#, c-format
msgid "could not create work tree dir '%s'."
msgstr "不能为 '%s' 创建工作区目录。"
-#: builtin/clone.c:830
+#: builtin/clone.c:840
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到裸版本库 '%s'...\n"
-#: builtin/clone.c:832
+#: builtin/clone.c:842
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:867
+#: builtin/clone.c:877
#, c-format
msgid "Don't know how to clone %s"
msgstr "不知道如何克隆 %s"
-#: builtin/clone.c:916
+#: builtin/clone.c:926
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:923
+#: builtin/clone.c:933
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空版本库。"
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
-#: builtin/commit.c:612 builtin/shortlog.c:272
+#: builtin/commit.c:612 builtin/shortlog.c:270
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正从标准输入中读取日志信息）\n"
msgid "terminate entries with NUL"
msgstr "条目以NUL字符结尾"
-#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:653
-#: builtin/fast-export.c:656 builtin/tag.c:459
+#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659
+#: builtin/fast-export.c:662 builtin/tag.c:459
msgid "mode"
msgstr "模式"
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/commit.c:1373 builtin/log.c:1104 builtin/revert.c:109
+#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: 签名"
msgstr "查询时参照 include 指令递归查找"
#: builtin/count-objects.c:82
-msgid "git count-objects [-v]"
-msgstr "git count-objects [-v]"
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#: builtin/count-objects.c:97
+msgid "print sizes in human readable format"
+msgstr "以用户可读的格式显示大小"
#: builtin/describe.c:15
msgid "git describe [options] <committish>*"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:652
+#: builtin/fast-export.c:658
msgid "show progress after <n> objects"
msgstr "在 <n> 个对象之后显示进度"
-#: builtin/fast-export.c:654
+#: builtin/fast-export.c:660
msgid "select handling of signed tags"
msgstr "选择如何处理签名 tags"
-#: builtin/fast-export.c:657
+#: builtin/fast-export.c:663
msgid "select handling of tags that tag filtered objects"
msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
-#: builtin/fast-export.c:660
+#: builtin/fast-export.c:666
msgid "Dump marks to this file"
msgstr "把标记存储到这个文件"
-#: builtin/fast-export.c:662
+#: builtin/fast-export.c:668
msgid "Import marks from this file"
msgstr "从这个文件导入标记"
-#: builtin/fast-export.c:664
+#: builtin/fast-export.c:670
msgid "Fake a tagger when tags lack one"
msgstr "当 tags 缺少标记者字段时，假装提供一个"
-#: builtin/fast-export.c:666
+#: builtin/fast-export.c:672
msgid "Output full tree for each commit"
msgstr "每次提交都输出整个树"
-#: builtin/fast-export.c:668
+#: builtin/fast-export.c:674
msgid "Use the done feature to terminate the stream"
msgstr "使用 done 功能来终止流"
-#: builtin/fast-export.c:669
+#: builtin/fast-export.c:675
msgid "Skip output of blob data"
msgstr "跳过数据对象的输出"
msgid "convert to a complete repository"
msgstr "转换为一个完整的版本库"
-#: builtin/fetch.c:88 builtin/log.c:1121
+#: builtin/fetch.c:88 builtin/log.c:1130
msgid "dir"
msgstr "目录"
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
-#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
-#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
+#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701
+#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175
#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
msgid "n"
msgstr "n"
-#: builtin/fmt-merge-msg.c:660
+#: builtin/fmt-merge-msg.c:664
msgid "populate log with at most <n> entries from shortlog"
msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
-#: builtin/fmt-merge-msg.c:663
+#: builtin/fmt-merge-msg.c:667
msgid "alias for --log (deprecated)"
msgstr "参数 --log 的别名（已弃用）"
-#: builtin/fmt-merge-msg.c:666
+#: builtin/fmt-merge-msg.c:670
msgid "text"
msgstr "文本"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:671
msgid "use <text> as start of message"
msgstr "使用 <文本> 作为提交说明的开始"
-#: builtin/fmt-merge-msg.c:668
+#: builtin/fmt-merge-msg.c:672
msgid "file to read from"
msgstr "从文件中读取"
msgid "process file as it were from this path"
msgstr "处理文件并假设其来自于此路径"
-#: builtin/help.c:42
+#: builtin/help.c:43
msgid "print all available commands"
msgstr "打印所有可用的命令"
-#: builtin/help.c:43
+#: builtin/help.c:44
+msgid "print list of useful guides"
+msgstr "显示有用的指南列表"
+
+#: builtin/help.c:45
msgid "show man page"
msgstr "显示 man 手册"
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "show manual in web browser"
msgstr "在 web 浏览器中显示手册"
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show info page"
msgstr "显示 info 手册"
-#: builtin/help.c:52
-msgid "git help [--all] [--man|--web|--info] [command]"
-msgstr "git help [--all] [--man|--web|--info] [命令]"
+#: builtin/help.c:54
+msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
+msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr "未能识别的帮助格式 '%s'"
-#: builtin/help.c:92
+#: builtin/help.c:94
msgid "Failed to start emacsclient."
msgstr "无法启动 emacsclient。"
-#: builtin/help.c:105
+#: builtin/help.c:107
msgid "Failed to parse emacsclient version."
msgstr "无法解析 emacsclient 版本。"
-#: builtin/help.c:113
+#: builtin/help.c:115
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老（< 22）。"
-#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
+#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178
#, c-format
msgid "failed to exec '%s': %s"
msgstr "无法执行 '%s'：%s"
-#: builtin/help.c:216
+#: builtin/help.c:218
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s'：不支持的 man 手册查看器的路径。\n"
"请使用 'man.<tool>.cmd'。"
-#: builtin/help.c:228
+#: builtin/help.c:230
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s': 支持的 man 手册查看器命令。\n"
"请使用 'man.<tool>.path'。"
-#: builtin/help.c:349
+#: builtin/help.c:351
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s'：未知的 man 查看器。"
-#: builtin/help.c:366
+#: builtin/help.c:368
msgid "no man viewer handled the request"
msgstr "没有 man 查看器处理此请求"
-#: builtin/help.c:374
+#: builtin/help.c:376
msgid "no info viewer handled the request"
msgstr "没有 info 查看器处理此请求"
-#: builtin/help.c:429 builtin/help.c:436
+#: builtin/help.c:422
+msgid "Defining attributes per path"
+msgstr "定义路径的属性"
+
+#: builtin/help.c:423
+msgid "A Git glossary"
+msgstr "Git 词汇表"
+
+#: builtin/help.c:424
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "忽略指定的未跟踪文件"
+
+#: builtin/help.c:425
+msgid "Defining submodule properties"
+msgstr "定义子模组属性"
+
+#: builtin/help.c:426
+msgid "Specifying revisions and ranges for Git"
+msgstr "指定 Git 的版本和版本范围"
+
+#: builtin/help.c:427
+msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"
+
+#: builtin/help.c:428
+msgid "An overview of recommended workflows with Git"
+msgstr "Git 推荐的工作流概览"
+
+#: builtin/help.c:440
+msgid "The common Git guides are:\n"
+msgstr "最常用的 Git 向导有：\n"
+
+#: builtin/help.c:462 builtin/help.c:478
#, c-format
msgid "usage: %s%s"
msgstr "用法：%s%s"
-#: builtin/help.c:452
+#: builtin/help.c:494
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s' 是 `%s' 的别名"
msgstr "不能访问工作区 '%s'"
#: builtin/log.c:40
-msgid "git log [<options>] [<
since>..<until>] [[--] <path>...]\n"
-msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n"
+msgid "git log [<options>] [<
revision range>] [[--] <path>...]\n"
+msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
#: builtin/log.c:41
msgid " or: git show [options] <object>..."
msgid "Unknown type: %d"
msgstr "未知类型：%d"
-#: builtin/log.c:630
+#: builtin/log.c:638
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:704
+#: builtin/log.c:720
msgid "name of output directory is too long"
msgstr "输出目录名太长"
-#: builtin/log.c:720
+#: builtin/log.c:736
#, c-format
msgid "Cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:734
+#: builtin/log.c:750
msgid "Need exactly one range."
msgstr "只需要一个范围。"
-#: builtin/log.c:742
+#: builtin/log.c:758
msgid "Not a range."
msgstr "不是一个范围。"
-#: builtin/log.c:815
+#: builtin/log.c:860
msgid "Cover letter needs email format"
msgstr "信封需要邮件地址格式"
-#: builtin/log.c:888
+#: builtin/log.c:936
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:916
+#: builtin/log.c:964
msgid "git format-patch [options] [<since> | <revision range>]"
msgstr "git format-patch [选项] [<从> | <修订集范围>]"
-#: builtin/log.c:961
+#: builtin/log.c:1009
msgid "Two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1099
+#: builtin/log.c:1108
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一个补丁"
-#: builtin/log.c:1102
+#: builtin/log.c:1111
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多个补丁"
-#: builtin/log.c:1106
+#: builtin/log.c:1115
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1108
+#: builtin/log.c:1117
msgid "generate a cover letter"
msgstr "生成一封附信"
-#: builtin/log.c:1110
+#: builtin/log.c:1119
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1111
+#: builtin/log.c:1120
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1112
+#: builtin/log.c:1121
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1114
+#: builtin/log.c:1123
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号，而不是1"
-#: builtin/log.c:1116
+#: builtin/log.c:1125
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1118
+#: builtin/log.c:1127
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1121
+#: builtin/log.c:1130
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <dir>"
-#: builtin/log.c:1124
+#: builtin/log.c:1133
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1127
+#: builtin/log.c:1136
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1129
+#: builtin/log.c:1138
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1131
+#: builtin/log.c:1140
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的（补丁+状态）"
-#: builtin/log.c:1133
+#: builtin/log.c:1142
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1134
+#: builtin/log.c:1143
msgid "header"
msgstr "header"
-#: builtin/log.c:1135
+#: builtin/log.c:1144
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1136 builtin/log.c:1138
+#: builtin/log.c:1145 builtin/log.c:1147
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1136
+#: builtin/log.c:1145
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1138
+#: builtin/log.c:1147
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1140
+#: builtin/log.c:1149
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1141
+#: builtin/log.c:1150
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <message-id> 的回复"
-#: builtin/log.c:1142 builtin/log.c:1145
+#: builtin/log.c:1151 builtin/log.c:1154
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1143
+#: builtin/log.c:1152
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1146
+#: builtin/log.c:1155
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1150
+#: builtin/log.c:1159
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索，风格：浅，深"
-#: builtin/log.c:1152
+#: builtin/log.c:1161
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1153
+#: builtin/log.c:1162
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1155
+#: builtin/log.c:1164
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1239
+#: builtin/log.c:1248
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
-#: builtin/log.c:1241
+#: builtin/log.c:1250
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix 和 -k 互斥。"
-#: builtin/log.c:1249
+#: builtin/log.c:1258
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1251
+#: builtin/log.c:1260
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1253
+#: builtin/log.c:1262
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1276
+#: builtin/log.c:1285
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录，哪一个？"
-#: builtin/log.c:1278
+#: builtin/log.c:1287
#, c-format
msgid "Could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/log.c:1431
+#: builtin/log.c:1435
msgid "Failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:1480
+#: builtin/log.c:1484
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:1535
+#: builtin/log.c:1539
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"
-#: builtin/log.c:1548 builtin/log.c:1550 builtin/log.c:1562
+#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566
#, c-format
msgid "Unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/ls-files.c:409
+#: builtin/ls-files.c:402
msgid "git ls-files [options] [<file>...]"
msgstr "git ls-files [选项] [<文件>...]"
-#: builtin/ls-files.c:466
+#: builtin/ls-files.c:459
msgid "identify the file status with tags"
msgstr "用标签标识文件的状态"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:461
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小写字母表示 '假设未改变的' 文件"
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:463
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件（默认）"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:465
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
-#: builtin/ls-files.c:474
+#: builtin/ls-files.c:467
msgid "show modified files in the output"
msgstr "显示已修改的文件"
-#: builtin/ls-files.c:476
+#: builtin/ls-files.c:469
msgid "show other files in the output"
msgstr "显示其它文件"
-#: builtin/ls-files.c:478
+#: builtin/ls-files.c:471
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
-#: builtin/ls-files.c:481
+#: builtin/ls-files.c:474
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
-#: builtin/ls-files.c:483
+#: builtin/ls-files.c:476
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
-#: builtin/ls-files.c:485
+#: builtin/ls-files.c:478
msgid "show 'other' directories' name only"
msgstr "只显示“其他”目录的名称"
-#: builtin/ls-files.c:488
+#: builtin/ls-files.c:481
msgid "don't show empty directories"
msgstr "不显示空目录"
-#: builtin/ls-files.c:491
+#: builtin/ls-files.c:484
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
-#: builtin/ls-files.c:493
+#: builtin/ls-files.c:486
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
-#: builtin/ls-files.c:495
+#: builtin/ls-files.c:488
msgid "skip files matching pattern"
msgstr "匹配排除文件的模式"
-#: builtin/ls-files.c:498
+#: builtin/ls-files.c:491
msgid "exclude patterns are read from <file>"
msgstr "从 <文件> 中读取排除模式"
-#: builtin/ls-files.c:501
+#: builtin/ls-files.c:494
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
-#: builtin/ls-files.c:503
+#: builtin/ls-files.c:496
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
-#: builtin/ls-files.c:506
+#: builtin/ls-files.c:499
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:502
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区，视为错误"
-#: builtin/ls-files.c:510
+#: builtin/ls-files.c:503
msgid "tree-ish"
msgstr "树或提交"
-#: builtin/ls-files.c:511
+#: builtin/ls-files.c:504
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
-#: builtin/ls-files.c:513
+#: builtin/ls-files.c:506
msgid "show debugging data"
msgstr "显示调试数据"
"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
#: builtin/revert.c:22
-msgid "git revert [options] <commit-ish>"
-msgstr "git revert [选项] <提交号>"
+msgid "git revert [options] <commit-ish>..."
+msgstr "git revert [选项] <提交号>..."
#: builtin/revert.c:23
msgid "git revert <subcommand>"
msgstr "git revert <子命令>"
#: builtin/revert.c:28
-msgid "git cherry-pick [options] <commit-ish>"
-msgstr "git cherry-pick [选项] <提交号>"
+msgid "git cherry-pick [options] <commit-ish>..."
+msgstr "git cherry-pick [选项] <提交号>..."
#: builtin/revert.c:29
msgid "git cherry-pick <subcommand>"
msgstr "git rm：不能删除 %s"
#: builtin/shortlog.c:13
-msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
-msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
+msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
+msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
-#: builtin/shortlog.c:133
+#: builtin/shortlog.c:131
#, c-format
msgid "Missing author: %s"
msgstr "缺少作者：%s"
-#: builtin/shortlog.c:229
+#: builtin/shortlog.c:227
msgid "sort output according to the number of commits per author"
msgstr "根据每个作者的提交数量排序"
-#: builtin/shortlog.c:231
+#: builtin/shortlog.c:229
msgid "Suppress commit descriptions, only provides commit count"
msgstr "隐藏提交说明，只提供提交数量"
-#: builtin/shortlog.c:233
+#: builtin/shortlog.c:231
msgid "Show the email address of each author"
msgstr "显示每个作者的电子邮件地址"
-#: builtin/shortlog.c:234
+#: builtin/shortlog.c:232
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:235
+#: builtin/shortlog.c:233
msgid "Linewrap output"
msgstr "折行输出"
msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show remote-tracking and local branches"
msgstr "显示远程跟踪的和本地的分支"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "show remote-tracking branches"
msgstr "显示远程跟踪的分支"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "color '*!+-' corresponding to the branch"
msgstr "着色 '*!+-' 到相应的分支"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "show <n> more commits after the common ancestor"
msgstr "显示共同祖先后的 <n> 个提交"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "synonym to more=-1"
msgstr "和 more=-1 同义"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "suppress naming strings"
msgstr "不显示字符串命名"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "include the current branch"
msgstr "包括当前分支"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "name commits with their object names"
msgstr "以对象名字命名提交"
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:665
msgid "show possible merge bases"
msgstr "显示可能合并的基线"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show refs unreachable from any other ref"
msgstr "显示没有任何引用的的引用"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show commits in topological order"
msgstr "以拓扑顺序显示提交"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "show only commits not on the first branch"
msgstr "只显示不在第一个分支上的提交"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "show merges reachable from only one tip"
msgstr "显示仅一个分支可访问的合并提交"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show commits where no parent comes before its children"
msgstr "显示提交时以时间为序且父提交不能领先子提交"
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:677
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:679
+#: builtin/show-branch.c:678
msgid "show <n> most recent ref-log entries starting at base"
msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
msgstr "只对调试有用"
#: git.c:16
-msgid "See 'git help <command>' for more information on a specific command."
-msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
+msgid ""
+"'git help -a' and 'git help -g' lists available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept."
+msgstr ""
+"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n"
+"'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。"
#: parse-options.h:156
msgid "no-op (backward compatibility)"
"然后需要提供我至少一个好版本和一个坏版本。\n"
"（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）"
-#: git-bisect.sh:347 git-bisect.sh:474
+#: git-bisect.sh:363 git-bisect.sh:490
msgid "We are not bisecting."
msgstr "我们没有在二分查找。"
-#: git-bisect.sh:354
+#: git-bisect.sh:370
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "'$invalid' 不是一个有效的提交"
-#: git-bisect.sh:363
+#: git-bisect.sh:379
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"不能检出原始 HEAD '$branch'。\n"
"尝试 'git bisect reset <提交>'。"
-#: git-bisect.sh:390
+#: git-bisect.sh:406
msgid "No logfile given"
msgstr "未提供日志文件"
-#: git-bisect.sh:391
+#: git-bisect.sh:407
#, sh-format
msgid "cannot read $file for replaying"
msgstr "不能读取 $file 来重放"
-#: git-bisect.sh:408
+#: git-bisect.sh:424
msgid "?? what are you talking about?"
msgstr "?? 您在说什么?"
-#: git-bisect.sh:420
+#: git-bisect.sh:436
#, sh-format
msgid "running $command"
msgstr "运行 $command"
-#: git-bisect.sh:427
+#: git-bisect.sh:443
#, sh-format
msgid ""
"bisect run failed:\n"
"二分查找运行失败：\n"
"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
-#: git-bisect.sh:453
+#: git-bisect.sh:469
msgid "bisect run cannot continue any more"
msgstr "二分查找不能继续运行"
-#: git-bisect.sh:459
+#: git-bisect.sh:475
#, sh-format
msgid ""
"bisect run failed:\n"
"二分查找运行失败：\n"
"'bisect_state $state' 退出码为 $res"
-#: git-bisect.sh:466
+#: git-bisect.sh:482
msgid "bisect run success"
msgstr "二分查找运行成功"
msgid "Synchronizing submodule url for '$prefix$sm_path'"
msgstr "为 '$prefix$sm_path' 同步子模组 url"
+#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
+#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
+
+#~ msgid "See 'git help <command>' for more information on a specific command."
+#~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
+
+#~ msgid "BUG: impossible combination of %d and %p"
+#~ msgstr "BUG: 无法组合 %d 和 %p"
+
+# 译者：以下三条实际为一个段落
+#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
+#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
+
+# 译者：为对齐，下面两句内容有调整
+#~ msgid "may speed it up, but you have to be careful not to forget to add"
+#~ msgstr "也许能提高速度，但您需要小心不要忘了添加新文件"
+
+#~ msgid "new files yourself (see 'git help status')."
+#~ msgstr "（参见 'git help status'）。"
+
#, fuzzy
#~ msgid "aaaSynchronizing submodule url for '$prefix$sm_path'"
#~ msgstr "为 '$prefix$sm_path' 同步子模组 url"
projects / thirdparty / git.git / blobdiff