Sync with 1.7.12.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --cc po/de.po
Simple merge

diff --cc po/zh_CN.po
index c9331e95558e638e6e57c3465069a027509e1f02,354bf4dac89537fbf78a14c3c14ce9dc5b64c8f9..8fc59594877c769f0ae91a2062bdda1e4057a185
--- 1/po/zh_CN.po
--- 2/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -653,13 -661,13 +653,13 @@@ msgid_plural "
  "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:865 builtin/merge.c:978
 -#: builtin/merge.c:1088 builtin/merge.c:1098
 +#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977
 +#: builtin/merge.c:1087 builtin/merge.c:1097
  #, c-format
  msgid "Could not open '%s' for writing"
  msgstr "不能为写入打开 '%s'"
@@@ -1439,12 -1442,12 +1439,12 @@@ msgstr "regexec è¿\94å\9b\9e %dï¼\8cè¾\93å\85¥ä¸ºï¼
  msgid "unable to find filename in patch at line %d"
  msgstr "不能在补丁的第 %d 行找到文件名"
  
 -#: builtin/apply.c:946
 +#: builtin/apply.c:945
  #, c-format
  msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
- msgstr "git apply：错误的 git-diff - 期望 /dev/null，但在第 %2$d 行得到 %1$s"
+ msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
  
 -#: builtin/apply.c:950
 +#: builtin/apply.c:949
  #, c-format
  msgid "git apply: bad git-diff - inconsistent new filename on line %d"
  msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
@@@ -1454,12 -1457,12 +1454,12 @@@
  msgid "git apply: bad git-diff - inconsistent old filename on line %d"
  msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
  
 -#: builtin/apply.c:958
 +#: builtin/apply.c:957
  #, c-format
  msgid "git apply: bad git-diff - expected /dev/null on line %d"
- msgstr "git apply：错误的 git-diff - 期望 /dev/null 于第 %d 行"
+ msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
  
 -#: builtin/apply.c:1403
 +#: builtin/apply.c:1402
  #, c-format
  msgid "recount: unexpected line: %.*s"
  msgstr "recount：意外的行：%.*s"
@@@ -1488,12 -1491,12 +1488,12 @@@ msgstr "新文件依赖旧内容
  msgid "deleted file still has contents"
  msgstr "删除的文件仍有内容"
  
 -#: builtin/apply.c:1665
 +#: builtin/apply.c:1664
  #, c-format
  msgid "corrupt patch at line %d"
- msgstr "补丁损坏位于第 %d 行"
+ msgstr "补丁在第 %d 行损坏"
  
 -#: builtin/apply.c:1701
 +#: builtin/apply.c:1700
  #, c-format
  msgid "new file %s depends on old contents"
  msgstr "新文件 %s 依赖旧内容"
@@@ -1574,12 -1577,12 +1574,12 @@@ msgstr "缺失 '%s' ç\9a\84äº\8cè¿\9bå\88¶è¡¥ä¸\81æ
  msgid "binary patch does not apply to '%s'"
  msgstr "二进制补丁未应用到 '%s'"
  
 -#: builtin/apply.c:2918
 +#: builtin/apply.c:2917
  #, c-format
  msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
- msgstr "到 '%s' 的二进制补丁产生了不正确的结果（预期 %s，得到 %s）"
+ msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
  
 -#: builtin/apply.c:2939
 +#: builtin/apply.c:2938
  #, c-format
  msgid "patch failed: %s:%ld"
  msgstr "打补丁失败：%s:%ld"
@@@ -1623,12 -1626,12 +1623,12 @@@ msgstr "移é\99¤è¡¥ä¸\81ä»\8dç\95\99ä¸\8bäº\86æ\96\87件å
  msgid "%s: wrong type"
  msgstr "%s：错误类型"
  
 -#: builtin/apply.c:3402
 +#: builtin/apply.c:3401
  #, c-format
  msgid "%s has type %o, expected %o"
- msgstr "%s 的类型是 %o，预期是 %o"
+ msgstr "%s 的类型是 %o，应为 %o"
  
 -#: builtin/apply.c:3503
 +#: builtin/apply.c:3502
  #, c-format
  msgid "%s: already exists in index"
  msgstr "%s：已经存在于索引中"
@@@ -1712,10 -1715,10 +1712,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:3980
 +#: builtin/apply.c:3979
  #, c-format
  msgid "truncating .rej filename to %.*s.rej"
  msgstr "截短 .rej 文件名为 %.*s.rej"
@@@ -1786,11 -1789,11 +1786,11 @@@ msgstr "确认补ä¸\81å\8f¯ä»¥åº\94ç\94¨å\88°å½\93å
  msgid "apply a patch without touching the working tree"
  msgstr "应用补丁而不修改工作区"
  
 -#: builtin/apply.c:4310
 +#: builtin/apply.c:4309
  msgid "also apply the patch (use with --stat/--summary/--check)"
- msgstr "è¿\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:4312
 +#: builtin/apply.c:4311
  msgid "attempt three-way merge if a patch does not apply"
  msgstr "如果一个补丁不能应用则尝试三路合并"
  
@@@ -1838,11 -1841,11 +1838,11 @@@ msgstr "允许重叠的补丁片段
  msgid "be verbose"
  msgstr "冗长输出"
  
 -#: builtin/apply.c:4339
 +#: builtin/apply.c:4338
  msgid "tolerate incorrectly detected missing new-line at the end of file"
- msgstr "宽容不正确的文件末尾换行符"
+ msgstr "å\85\81许不正确的文件末尾换行符"
  
 -#: builtin/apply.c:4342
 +#: builtin/apply.c:4341
  msgid "do not trust the line counts in the hunk headers"
  msgstr "不信任补丁片段的头信息中的行号"