diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-09 17:51:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-09 17:51:46 (GMT) |
| commit | 034161a94e827ef05790b1c7ce5a6e3e740c864e (patch) | |
| tree | 713f3468b02ca0ffd14547a3a7294093a2195de1 /po/zh_CN.po | |
| parent | e5acacfb48b29e5d2c86d14b988321df086f2228 (diff) | |
| parent | cc2f50dafe28fda6652e1ab78034aae49b495b08 (diff) | |
| download | git-034161a94e827ef05790b1c7ce5a6e3e740c864e.zip git-034161a94e827ef05790b1c7ce5a6e3e740c864e.tar.gz git-034161a94e827ef05790b1c7ce5a6e3e740c864e.tar.bz2 | |
Merge git://github.com/git-l10n/git-po
L10n updates for 1.7.12-rc2
* 'master' of git://github.com/git-l10n/git-po:
l10n: Update Swedish translation (1168t0f0u)
l10n: de.po: translate 77 new messages
l10n: vi.po: update one message
l10n: zh_CN.po: update one translation
l10n: Update one message in git.pot
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 6547c0a..bc04236 100644 --- 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" -"POT-Creation-Date: 2012-08-02 09:26+0800\n" -"PO-Revision-Date: 2012-08-05 07:08+0800\n" +"POT-Creation-Date: 2012-08-06 23:47+0800\n" +"PO-Revision-Date: 2012-08-07 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" @@ -594,21 +594,23 @@ msgstr "未处理的路径??? %s" msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:1918 +#: merge-recursive.c:1920 #, 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:1954 +#: merge-recursive.c:1957 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:2011 +#: merge-recursive.c:2014 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:2023 builtin/merge.c:697 +#: merge-recursive.c:2026 builtin/merge.c:697 msgid "Unable to write index." msgstr "不能写入索引。" |