l10n: zh_CN.po: update one translation
Translate 1 new messages came from git.pot update in bb2ba06 (l10n: Update one message in git.pot) Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Aug 7, 2012 at 01:10 UTC
e5e38ce485342e924c6554eda163acc9e1890982
1 file changed
+10
-8
po/zh_CN.po
+10
-8
@@ -12,8 +12,8 @@ msgid ""
12
msgstr ""
13
"Project-Id-Version: Git\n"
14
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15
-"POT-Creation-Date: 2012-08-02 09:26+0800\n"
16
-"PO-Revision-Date: 2012-08-05 07:08+0800\n"
15
+"POT-Creation-Date: 2012-08-06 23:47+0800\n"
16
+"PO-Revision-Date: 2012-08-07 01:07+0800\n"
17
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
19
"Language: zh_CN\n"
@@ -594,21 +594,23 @@ msgstr "未处理的路径??? %s"
594
msgid "Merging:"
595
msgstr "合并："
596
597
-#: merge-recursive.c:1918
597
+#: merge-recursive.c:1920
598
#, c-format
599
-msgid "found %u common ancestor(s):"
600
-msgstr "发现 %u 个共同祖先："
599
+msgid "found %u common ancestor:"
600
+msgid_plural "found %u common ancestors:"
601
+msgstr[0] "发现 %u 个共同祖先："
602
+msgstr[1] "发现 %u 个共同祖先："
603
602
-#: merge-recursive.c:1954
604
+#: merge-recursive.c:1957
605
msgid "merge returned no commit"
606
msgstr "合并未返回提交"
607
606
-#: merge-recursive.c:2011
608
+#: merge-recursive.c:2014
609
#, c-format
610
msgid "Could not parse object '%s'"
611
msgstr "不能解析对象 '%s'"
612
611
-#: merge-recursive.c:2023 builtin/merge.c:697
613
+#: merge-recursive.c:2026 builtin/merge.c:697
614
msgid "Unable to write index."
615
msgstr "不能写入索引。"
616