Merge branch 'master' of https://github.com/git-l10n/git-po into l10n

* 'master' of https://github.com/git-l10n/git-po:
  l10n: leave leading space unchanged for zh_CN.po
This commit is contained in:
Junio C Hamano 2012-03-01 20:51:37 -08:00
commit 11ec817fed

View File

@ -99,7 +99,7 @@ msgstr "0 个文件被修改\n"
#, c-format #, c-format
msgid " %d file changed" msgid " %d file changed"
msgid_plural " %d files changed" msgid_plural " %d files changed"
msgstr[0] "%d 个文件被修改" msgstr[0] " %d 个文件被修改"
#: diff.c:1352 #: diff.c:1352
#, c-format #, c-format
@ -187,7 +187,7 @@ msgstr[0] ""
#: builtin/merge.c:1093 builtin/merge.c:1103 #: builtin/merge.c:1093 builtin/merge.c:1103
#, c-format #, c-format
msgid "Could not open '%s' for writing" msgid "Could not open '%s' for writing"
msgstr "无法为写入打开 '%s'" msgstr "无法打开 '%s' 以写入"
#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:865 #: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:865
#: builtin/merge.c:1095 builtin/merge.c:1108 #: builtin/merge.c:1095 builtin/merge.c:1108
@ -636,7 +636,7 @@ msgstr " (干净的工作区)"
#: wt-status.c:884 #: wt-status.c:884
msgid "HEAD (no branch)" msgid "HEAD (no branch)"
msgstr "(非分支)" msgstr "HEAD(非分支)"
# 注意保持句尾空格 # 注意保持句尾空格
#: wt-status.c:890 #: wt-status.c:890
@ -856,7 +856,7 @@ msgstr ""
#: builtin/branch.c:214 #: builtin/branch.c:214
#, c-format #, c-format
msgid "Error deleting %sbranch '%s'" msgid "Error deleting %sbranch '%s'"
msgstr "错误删除 %s分支 '%s'" msgstr "删除 %s分支 '%s' 时错误"
#: builtin/branch.c:219 #: builtin/branch.c:219
#, c-format #, c-format