From: Jiang Xin <worldhello.net@gmail.com>
Date: Thu, 27 Sep 2012 23:03:43 +0000 (+0800)
Subject: Merge git://github.com/gotgit/git-po-zh_CN
X-Git-Tag: v1.8.0-rc0~8^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b2f4b6cec2c5c1e2f802ac4b4bd12d5b26461069;p=git.git

Merge git://github.com/gotgit/git-po-zh_CN

* git://github.com/gotgit/git-po-zh_CN:
  l10n: zh.CN.po: msgmerge git.pot (1142t195f630u)
---

b2f4b6cec2c5c1e2f802ac4b4bd12d5b26461069
diff --cc po/zh_CN.po
index 8fc595948,fe239e279..46d158ffd
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -854,11 -943,11 +943,11 @@@ msgstr "不能创建序列目录 %s
  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 "没有拣选或还原操作在进行"
 +msgstr "拣选或还原操作并未进行"
  
- #: sequencer.c:781
+ #: sequencer.c:788
  msgid "cannot resolve HEAD"
  msgstr "不能解析 HEAD"
  
@@@ -876,11 -965,11 +965,11 @@@ msgstr "不能打开 %s：%s
  msgid "cannot read %s: %s"
  msgstr "不能读取 %s：%s"
  
- #: sequencer.c:809
+ #: sequencer.c:816
  msgid "unexpected end of file"
 -msgstr "未预期的文件结束"
 +msgstr "意外的文件结束"
  
- #: sequencer.c:815
+ #: sequencer.c:822
  #, c-format
  msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
  msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
@@@ -917,12 -1006,17 +1006,17 @@@ msgstr "尚未给分支 '%s' 设置上æ
  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 "无此用户"
  
@@@ -1366,11 -1468,66 +1468,66 @@@ msgstr "空补丁。异常终止。
  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"
@@@ -1457,9 -1614,9 +1614,9 @@@ msgstr "git apply：错误的 git-diff 
  #: 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"
@@@ -1488,12 -1645,12 +1645,12 @@@ msgstr "新文件依赖旧内容
  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 依赖旧内容"
@@@ -1574,12 -1731,12 +1731,12 @@@ msgstr "缺失 '%s' 的二进制补丁æ
  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"
@@@ -1623,12 -1780,12 +1780,12 @@@ msgstr "移除补丁仍留下了文件å
  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：已经存在于索引中"
@@@ -1712,10 -1869,10 +1869,10 @@@ msgstr "内部错误
  #, 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"
@@@ -1786,11 -1945,11 +1945,11 @@@ msgstr "确认补丁可以应用到当å
  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 "还应用此补丁（使用 --stat/--summary/--check 参数）"
 +msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
  
- #: builtin/apply.c:4311
+ #: builtin/apply.c:4329
  msgid "attempt three-way merge if a patch does not apply"
  msgstr "如果一个补丁不能应用则尝试三路合并"
  
@@@ -1834,15 -1993,11 +1993,11 @@@ msgstr "将拒绝的补丁片段保存å
  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 "允许不正确的文件末尾换行符"
  
- #: builtin/apply.c:4341
+ #: builtin/apply.c:4359
  msgid "do not trust the line counts in the hunk headers"
  msgstr "不信任补丁片段的头信息中的行号"
  
@@@ -1918,10 -2073,142 +2073,142 @@@ msgstr "git archive：协议错误
  
  #: 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"