Merge branch 'maint'

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index e6cafa50..31cb0540 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -13,7 +13,7 @@ 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: 2013-06-06 13:07+1000\n"
-"PO-Revision-Date: 2013-03-10 05:41+0000\n"
+"PO-Revision-Date: 2013-06-06 04:44+0000\n"
 "Last-Translator: mytbk <mytbk920423@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
 "archlinux-pacman/language/zh_CN/)\n"
@@ -183,13 +183,13 @@ msgstr "无法删除锁定文件 %s\n"
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr "无法解析软件包描述文件 '%s' 从数据库 '%s'\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr "%1$s 数据库不一致：名字和软件包中的 %2$s 不一致\n"
+msgstr "%s 数据库不一致: 包 %s 的文件名不合法\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr "%1$s 数据库不一致：名字和软件包中的 %2$s 不一致\n"
+msgstr "%s 数据库不一致: 包 %s 的文件名太长\n"
 
 #, c-format
 msgid "database path is undefined\n"