undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

l10n: zh_CN.po: update one translation

Browse Source 
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>
This commit is contained in:
Jiang Xin 2012-08-07 01:10:34 +08:00
parent bb2ba06fd3
commit e5e38ce485
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
po/zh_CN.po
View File

@ -12,8 +12,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Git\n" "Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2012-08-02 09:26+0800\n" "POT-Creation-Date: 2012-08-06 23:47+0800\n"
"PO-Revision-Date: 2012-08-05 07:08+0800\n" "PO-Revision-Date: 2012-08-07 01:07+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
"Language: zh_CN\n" "Language: zh_CN\n"
@ -594,21 +594,23 @@ msgstr "未处理的路径??? %s"
msgid "Merging:" msgid "Merging:"
msgstr "合并：" msgstr "合并："
#: merge-recursive.c:1918 #: merge-recursive.c:1920
#, c-format #, c-format
msgid "found %u common ancestor(s):" msgid "found %u common ancestor:"
msgstr "发现 %u 个共同祖先：" msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先："
msgstr[1] "发现 %u 个共同祖先："
#: merge-recursive.c:1954 #: merge-recursive.c:1957
msgid "merge returned no commit" msgid "merge returned no commit"
msgstr "合并未返回提交" msgstr "合并未返回提交"
#: merge-recursive.c:2011 #: merge-recursive.c:2014
#, c-format #, c-format
msgid "Could not parse object '%s'" msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'" msgstr "不能解析对象 '%s'"
#: merge-recursive.c:2023 builtin/merge.c:697 #: merge-recursive.c:2026 builtin/merge.c:697
msgid "Unable to write index." msgid "Unable to write index."
msgstr "不能写入索引。" msgstr "不能写入索引。"