Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/po/zh_CN.po
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-01-22 10:12:46 -0600
committerDan McGee <dan@archlinux.org>2011-01-22 10:12:46 -0600
commitc4332c8091dbba8bb9d9c56a3229843497b58670 (patch)
tree7aba5c0d694517c3e5f7bf18182ea6ce600dca7d /lib/libalpm/po/zh_CN.po
parent51175f31c4aac9df6ceeffc7855a0f842c580fdb (diff)
parenta97e28205a462a7433a8d0e7061cd911ea3d8c4c (diff)
Merge branch 'maint'
Diffstat (limited to 'lib/libalpm/po/zh_CN.po')
-rw-r--r--lib/libalpm/po/zh_CN.po6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index 529297b8..e7dee7c2 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.3.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"POT-Creation-Date: 2011-01-21 10:47-0600\n"
"PO-Revision-Date: 2010-06-05 10:41+0700\n"
"Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
"Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
@@ -447,6 +447,10 @@ msgid "downgrading package %s (%s => %s)\n"
msgstr "正在降级软件包 %1$s (%2$s => %3$s)\n"
#, c-format
+msgid "skipping target: %s\n"
+msgstr "正在跳过软件包:%s\n"
+
+#, c-format
msgid "unresolvable package conflicts detected\n"
msgstr "检测到未解决的软件包冲突\n"