Merge branch 'maint'

1 files changed, 12 insertions, 9 deletions

diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index 3b3af526..43642811 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.1.2\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-0500\n"
 "PO-Revision-Date: 2008-07-17 23:01+0200\n"
 "Last-Translator: 甘露(Lu Gan) <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
@@ -406,14 +406,6 @@ msgid "unexpected error"
 msgstr "未预期的错误"
 
 #, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s：强制更新至版本 %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s：本地（%s）比 %s 的版本更新(%s)\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "无法在数据库中找到 %s -- 跳过\n"
 
@@ -434,6 +426,10 @@ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s：忽略软件包更新（由%s-%s替代）\n"
 
 #, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s：本地（%s）比 %s 的版本更新(%s)\n"
+
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s：忽略软件包更新（%s => %s）\n"
 
@@ -449,6 +445,10 @@ msgstr "%s-%s 已经为最新 -- 跳过\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s 已经为最新 -- 重新安装\n"
 
+#, fuzzy, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "%s：忽略软件包更新（%s => %s）\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "探测到无法解决的软件包冲突\n"
@@ -556,3 +556,6 @@ msgstr "没有 %s 缓存存在，正在创建...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "无法创建软件包缓存，正在使用 /tmp 代替\n"
+
+#~ msgid "%s: forcing upgrade to version %s\n"
+#~ msgstr "%s：强制更新至版本 %s\n"