diff options
| author | Dan McGee <dan@archlinux.org> | 2012-01-08 19:14:04 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-01-08 19:14:04 +0100 |
| commit | 4f02b98338437b9395addb29000893b91d1ae21e (patch) | |
| tree | 986568d1e64bea1bde6ff287ed5a2629e7f8136f /scripts/po/zh_CN.po | |
| parent | 7f51ba99ae6db204d69ce271cd5cc4e959135738 (diff) | |
| parent | 73d0d743bda5367fcab2453bbe21c15e481150c2 (diff) | |
| download | pacman-4f02b98338437b9395addb29000893b91d1ae21e.tar.gz pacman-4f02b98338437b9395addb29000893b91d1ae21e.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/signing.c
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts/po/zh_CN.po')
| -rw-r--r-- | scripts/po/zh_CN.po | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/scripts/po/zh_CN.po b/scripts/po/zh_CN.po index 6c685bb9..5887f15d 100644 --- a/scripts/po/zh_CN.po +++ b/scripts/po/zh_CN.po @@ -10,7 +10,7 @@ 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-11-13 21:47-0600\n" +"POT-Creation-Date: 2012-01-05 16:57-0600\n" "PO-Revision-Date: 2011-11-14 11:42+0000\n" "Last-Translator: ganlu <rhythm.gan@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/" @@ -993,12 +993,16 @@ msgstr "'%s' 未包含有效的压缩包扩展名。" msgid "An entry for '%s' already existed" msgstr "已存在条目 '%s'" -msgid "Computing checksums..." -msgstr "正在计算校验值..." +#, fuzzy +msgid "Invalid package signature file '%s'." +msgstr "无效的软件包文件 '%s'。" msgid "Adding package signature..." msgstr "正在添加软件包签名..." +msgid "Computing checksums..." +msgstr "正在计算校验值..." + msgid "Creating '%s' db entry..." msgstr "正在创建 '%s' 数据库条目..." |