Merge branch 'po-split'

1 files changed, 36 insertions, 21 deletions

diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index d3844477..3b07ac07 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -7,7 +7,7 @@ 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-04-18 11:23-0500\n"
+"POT-Creation-Date: 2011-06-23 21:48-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: ganlu <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese (China) <None>\n"
@@ -153,6 +153,10 @@ msgstr "%s 中缺少软件包元数据\n"
 msgid "removing invalid file: %s\n"
 msgstr "删除无效文件: %s\n"
 
+#, fuzzy, c-format
+msgid "could not parse package '%s' description file from db '%s'\n"
+msgstr "无法解析 %s 中的软件包描述文件\n"
+
 #, c-format
 msgid "database path is undefined\n"
 msgstr "数据库路径未定义\n"
@@ -220,18 +224,6 @@ msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "无法从 %2$s : %3$s 获取文件 '%1$s'\n"
 
 #, c-format
-msgid "resuming download of %s not possible; starting over\n"
-msgstr "无法恢复下载 %s；正在重新开始\n"
-
-#, c-format
-msgid "error writing to file '%s': %s\n"
-msgstr "写入文件 '%1$s' 时出错: %2$s\n"
-
-#, c-format
-msgid "failed retrieving file '%s' from %s\n"
-msgstr "无法从 %2$s 获取文件 '%1$s'\n"
-
-#, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
 msgstr "%s 可缩小：%jd/%jd bytes\n"
 
@@ -380,6 +372,18 @@ msgid "could not find repository for target"
 msgstr "无法为目标找到软件库"
 
 #, c-format
+msgid "signature directory not configured correctly"
+msgstr ""
+
+#, c-format
+msgid "invalid PGP signature"
+msgstr ""
+
+#, c-format
+msgid "unknown PGP signature"
+msgstr ""
+
+#, c-format
 msgid "invalid or corrupted delta"
 msgstr "无效的或已损坏的 delta"
 
@@ -404,10 +408,6 @@ msgid "failed to retrieve some files"
 msgstr "无法获取某些文件"
 
 #, c-format
-msgid "failed to copy some file"
-msgstr "复制文件失败"
-
-#, c-format
 msgid "invalid regular expression"
 msgstr "无效的正则表达式"
 
@@ -420,6 +420,10 @@ msgid "download library error"
 msgstr "下载函数库出错"
 
 #, c-format
+msgid "gpgme error"
+msgstr ""
+
+#, c-format
 msgid "error invoking external downloader"
 msgstr "调用外部下载程序时出错"
 
@@ -428,10 +432,6 @@ msgid "unexpected error"
 msgstr "未预期的错误"
 
 #, c-format
-msgid "database larger than maximum size\n"
-msgstr "数据库超过最大支持的大小\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "无法在数据库中找到 %s -- 跳过\n"
 
@@ -550,3 +550,18 @@ msgstr "没有 %s 缓存存在，正在创建...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "无法创建软件包缓存，正在使用 /tmp 代替\n"
+
+#~ msgid "resuming download of %s not possible; starting over\n"
+#~ msgstr "无法恢复下载 %s；正在重新开始\n"
+
+#~ msgid "error writing to file '%s': %s\n"
+#~ msgstr "写入文件 '%1$s' 时出错: %2$s\n"
+
+#~ msgid "failed retrieving file '%s' from %s\n"
+#~ msgstr "无法从 %2$s 获取文件 '%1$s'\n"
+
+#~ msgid "failed to copy some file"
+#~ msgstr "复制文件失败"
+
+#~ msgid "database larger than maximum size\n"
+#~ msgstr "数据库超过最大支持的大小\n"