diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-07 11:41:16 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-07 11:43:12 -0500 |
| commit | 8c6a636cd970c19e7a79bb17c484b28454da877d (patch) | |
| tree | cea080bbc11f9c0723db436e173a4ff18c511186 /po/zh_CN.po | |
| parent | c7501148942159597677c2a8a738f0d59fdaa6dd (diff) | |
| parent | e62566a7635449e3e35d757c4b3bb768479689ab (diff) | |
| download | pacman-8c6a636cd970c19e7a79bb17c484b28454da877d.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/add.c
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index ee2a168c..107778f8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,16 +1,19 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org> # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +# <rainofchaos@gmail.com>, 2011 +# leonfeng <rainofchaos@gmail.com>, 2011 +# 甘 露 <rhythm.gan@gmail.com>, 2011 msgid "" msgstr "" "Project-Id-Version: Arch Linux Pacman package manager\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "POT-Creation-Date: 2011-04-18 11:23-0500\n" -"PO-Revision-Date: 2011-04-12 04:10+0000\n" -"Last-Translator: ganlu <rhythm.gan@gmail.com>\n" -"Language-Team: Chinese (China) <None>\n" +"PO-Revision-Date: 2011-06-04 02:50+0000\n" +"Last-Translator: leonfeng <rainofchaos@gmail.com>\n" +"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/" +"archlinux-pacman/team/zh_CN/)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -150,7 +153,7 @@ msgstr "正在下载 %s...\n" #, c-format msgid "malloc failure: could not allocate %zd bytes\n" -msgstr "内存分配失败：无法分配 %zd bytes\n" +msgstr "内存分配失败：无法分配 %zd \n" #, c-format msgid "no targets specified (use -h for help)\n" |