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>2009-09-20 12:09:10 -0500
committerDan McGee <dan@archlinux.org>2009-09-20 12:09:10 -0500
commit6bfca2fd14d07a18d7000d1f9dd998428036656f (patch)
treec766b1ea0071f17857a975b15f53a8f77909f46d /lib/libalpm/po/zh_CN.po
parentef3716877032941f7882c11c5a091abef95ef983 (diff)
parent338c6546ff86acbb25c1508439adfb89c3dea952 (diff)
Merge branch 'maint'
Message updates made this one a bit messy, but nothing too bad. Conflicts: lib/libalpm/add.c lib/libalpm/remove.c
Diffstat (limited to 'lib/libalpm/po/zh_CN.po')
-rw-r--r--lib/libalpm/po/zh_CN.po22
1 files changed, 15 insertions, 7 deletions
diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index c12dd961..f22fdb74 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.2.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-07-27 21:15-0500\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
"PO-Revision-Date: 2009-07-30 20:39+0700\n"
"Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
"Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
@@ -21,12 +21,12 @@ msgstr ""
msgid "replacing older version %s-%s by %s in target list\n"
msgstr "正在用目标清单中的 %3$s 替换老版本 %1$s-%2$s\n"
-#, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
+#, fuzzy, c-format
+msgid "skipping %s-%s because newer version %s is in target list\n"
msgstr "跳过 %1$s-%2$s,因为较新版本的 %3$s 在目标清单中\n"
-#, c-format
-msgid "conflicting packages were found in the target list\n"
+#, fuzzy, c-format
+msgid "conflicting packages were found in target list\n"
msgstr "目标清单中发现有冲突的软件包\n"
#, c-format
@@ -101,6 +101,10 @@ msgstr "无法更新数据库记录 %1$s-%2$s\n"
msgid "could not add entry '%s' in cache\n"
msgstr "无法在缓存中添加记录 '%s' \n"
+#, fuzzy, c-format
+msgid "removing invalid database: %s\n"
+msgstr "无法删除数据库 %s\n"
+
#, c-format
msgid "could not remove database %s\n"
msgstr "无法删除数据库 %s\n"
@@ -393,6 +397,10 @@ msgstr "未预期的错误"
msgid "could not find %s in database -- skipping\n"
msgstr "无法在数据库中找到 %s -- 跳过\n"
+#, fuzzy, c-format
+msgid "removing %s from target list\n"
+msgstr "正在从目标清单中删除 '%1$s' ,因为它和 '%2$s' 冲突\n"
+
#, c-format
msgid "cannot remove file '%s': %s\n"
msgstr "无法删除文件 '%1$s': %2$s\n"
@@ -521,8 +529,8 @@ msgstr "无法更改根目录 (%s)\n"
msgid "could not change directory to / (%s)\n"
msgstr "无法切换目录到 / (%s)\n"
-#, c-format
-msgid "call to popen failed (%s)"
+#, fuzzy, c-format
+msgid "call to popen failed (%s)\n"
msgstr "调用 popen 失败 (%s)"
#, c-format