Merge branch 'maint'

1 files changed, 13 insertions, 9 deletions

diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index ca170930..c24459a3 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -7,9 +7,9 @@ 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-03-16 19:34-0500\n"
-"PO-Revision-Date: 2011-03-15 05:36+0000\n"
-"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
+"POT-Creation-Date: 2011-03-20 23:42-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"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr "正在降级软件包 %1$s (%2$s => %3$s)\n"
 
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
-msgstr ""
+msgstr "解压 %s 时出现警告 (%s)\n"
 
 #, c-format
 msgid "could not extract %s (%s)\n"
@@ -183,15 +183,19 @@ msgstr "无法获取文件系统的信息\n"
 
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
+msgstr "无法为 %s 获得文件系统信息：%s\n"
 
 #, c-format
 msgid "could not determine mount point for file %s\n"
 msgstr "无法确定文件 %s 的挂载点\n"
 
 #, c-format
-msgid "could not determine filesystem mount points"
-msgstr "无法确定文件系统的挂载点"
+msgid "could not determine filesystem mount points\n"
+msgstr "无法测定文件系统挂载点\n"
+
+#, c-format
+msgid "could not determine root mount point %s\n"
+msgstr "无法测定根分区挂载点 %s\n"
 
 #, c-format
 msgid "Partition %s is mounted read only\n"
@@ -201,7 +205,7 @@ msgstr ""
 
 #, c-format
 msgid "Partition %s too full: %ld blocks needed, %ld blocks free\n"
-msgstr ""
+msgstr "分区 %s 无可用空间：需要 %ld 盘区，可用 %ld 盘区\n"
 
 #, c-format
 msgid "disk"
@@ -525,7 +529,7 @@ msgstr "无法更改根目录 (%s)\n"
 
 #, c-format
 msgid "call to execv failed (%s)\n"
-msgstr ""
+msgstr "调用 execv 失败 (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"