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 /lib/libalpm/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 'lib/libalpm/po/zh_CN.po')
| -rw-r--r-- | lib/libalpm/po/zh_CN.po | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po index d1c0fdc4..e2093a6f 100644 --- a/lib/libalpm/po/zh_CN.po +++ b/lib/libalpm/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: 2011-11-13 21:47-0600\n" +"POT-Creation-Date: 2012-03-28 18:00-0500\n" "PO-Revision-Date: 2011-11-15 02:39+0000\n" -"Last-Translator: ganlu <rhythm.gan@gmail.com>\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" |