diff options
| author | Dan McGee <dan@archlinux.org> | 2012-04-07 18:23:55 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-04-07 18:23:55 +0200 |
| commit | 4ca6590af58177964910588a6d0406f0d009bd0e (patch) | |
| tree | 3ff2d0d07aa5bd38f13e9456c5f831bdef06b8e2 /scripts/po/zh_CN.po | |
| parent | 3f1ea8b62f46a915c94a5b46e21ad39ea2628f65 (diff) | |
| parent | b752561a52a88f8e9cc3bcc9c2079eb685245110 (diff) | |
| download | pacman-4ca6590af58177964910588a6d0406f0d009bd0e.tar.gz pacman-4ca6590af58177964910588a6d0406f0d009bd0e.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/signing.c
lib/libalpm/sync.c
Diffstat (limited to 'scripts/po/zh_CN.po')
| -rw-r--r-- | scripts/po/zh_CN.po | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/scripts/po/zh_CN.po b/scripts/po/zh_CN.po index c5cef4e3..138dad69 100644 --- a/scripts/po/zh_CN.po +++ b/scripts/po/zh_CN.po @@ -10,11 +10,11 @@ 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: 2012-02-02 00:05-0600\n" +"POT-Creation-Date: 2012-03-28 18:00-0500\n" "PO-Revision-Date: 2012-02-05 02:05+0000\n" "Last-Translator: 甘 露 <rhythm.gan@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/" -"archlinux-pacman/team/zh_CN/)\n" +"archlinux-pacman/language/zh_CN/)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -734,18 +734,6 @@ msgstr "没有签名可用的机密密匙。" msgid "Use '%s' to generate a default secret key." msgstr "使用 '%s' 来生成默认的机密密匙。" -msgid "Verifying %s..." -msgstr "正在验证 %s..." - -msgid "File %s is unsigned, cannot continue." -msgstr "文件 %s 未签名，无法继续。" - -msgid "The signature of file %s is not valid." -msgstr "文件 %s 的签名无效。" - -msgid "Verifying keyring file signatures..." -msgstr "正在验证密匙环文件签名..." - msgid "No keyring files exist in %s." msgstr "在 %s 中没有密匙环文件。" |