Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: zh_CN.po: update one translation
author
Jiang Xin
<worldhello.net@gmail.com>
Mon, 6 Aug 2012 17:10:34 +0000
(
01:10
+0800)
committer
Jiang Xin
<worldhello.net@gmail.com>
Mon, 6 Aug 2012 17:10:34 +0000
(
01:10
+0800)
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>
po/zh_CN.po
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
bb2ba06
)
diff --git
a/po/zh_CN.po
b/po/zh_CN.po
index 6547c0acb44f8950967fbd2d9196c1ad8efe95dd..bc04236e476dfd5b9683ada57e4c6515c837e2c7 100644
(file)
--- a/
po/zh_CN.po
+++ b/
po/zh_CN.po
@@
-12,8
+12,8
@@
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2012-08-0
2 09:26
+0800\n"
-"PO-Revision-Date: 2012-08-0
5 07:08
+0800\n"
+"POT-Creation-Date: 2012-08-0
6 23:47
+0800\n"
+"PO-Revision-Date: 2012-08-0
7 01:07
+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
"Language: zh_CN\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
"Language: zh_CN\n"
@@
-594,21
+594,23
@@
msgstr "未处理的路径??? %s"
msgid "Merging:"
msgstr "合并:"
msgid "Merging:"
msgstr "合并:"
-#: merge-recursive.c:19
18
+#: merge-recursive.c:19
20
#, c-format
#, c-format
-msgid "found %u common ancestor(s):"
-msgstr "发现 %u 个共同祖先:"
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "发现 %u 个共同祖先:"
+msgstr[1] "发现 %u 个共同祖先:"
-#: merge-recursive.c:195
4
+#: merge-recursive.c:195
7
msgid "merge returned no commit"
msgstr "合并未返回提交"
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:201
1
+#: merge-recursive.c:201
4
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:202
3
builtin/merge.c:697
+#: merge-recursive.c:202
6
builtin/merge.c:697
msgid "Unable to write index."
msgstr "不能写入索引。"
msgid "Unable to write index."
msgstr "不能写入索引。"