Merge branch 'maint'

1 files changed, 23 insertions, 23 deletions

diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index dc76b3ff..98af296a 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -6,17 +6,17 @@
 # Dan McGee <dpmcgee@gmail.com>, 2011
 # leonfeng <chaofeng111@gmail.com>, 2011
 # leonfeng <chaofeng111@gmail.com>, 2011
-# mytbk <mytbk920423@gmail.com>, 2013
-# mytbk <mytbk920423@gmail.com>, 2013
+# mytbk <mytbk920423@gmail.com>, 2013,2015
+# mytbk <mytbk920423@gmail.com>, 2013,2015
 # ykelvis <ykelvis@users.noreply.github.com>, 2014
 # 甘 露 <rhythm.gan@gmail.com>, 2011
 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: 2014-11-18 15:12+1000\n"
-"PO-Revision-Date: 2014-11-24 10:03+0000\n"
-"Last-Translator: ykelvis <ykelvis@users.noreply.github.com>\n"
+"POT-Creation-Date: 2015-02-14 11:13+1000\n"
+"PO-Revision-Date: 2015-01-01 14:08+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"
 "Language: zh_CN\n"
@@ -58,9 +58,9 @@ msgstr "无法将 %1$s 重命名为 %2$s (%3$s)\n"
 #: lib/libalpm/add.c:184
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
+msgstr "在包 %s 的文件列表中没找到文件。跳过 %s 的提取\n"
 
-#: lib/libalpm/add.c:230
+#: lib/libalpm/add.c:232
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -69,7 +69,7 @@ msgstr ""
 "目录权限不一致 %1$s\n"
 "文件系统：%2$o  软件包：%3$o\n"
 
-#: lib/libalpm/add.c:240
+#: lib/libalpm/add.c:247
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
@@ -78,43 +78,43 @@ msgstr ""
 "目录权限不一致 %s\n"
 "文件系统：%u:%u 软件包：%u:%u\n"
 
-#: lib/libalpm/add.c:255
+#: lib/libalpm/add.c:263
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "解压缩：没有用文件 %s 覆盖目录\n"
 
-#: lib/libalpm/add.c:595 lib/libalpm/util.c:331 lib/libalpm/util.c:507
+#: lib/libalpm/add.c:603 lib/libalpm/util.c:331 lib/libalpm/util.c:507
 #, c-format
 msgid "could not get current working directory\n"
 msgstr "无法得到当前的工作目录\n"
 
-#: lib/libalpm/add.c:600 lib/libalpm/util.c:336 lib/libalpm/util.c:512
+#: lib/libalpm/add.c:608 lib/libalpm/util.c:336 lib/libalpm/util.c:512
 #: lib/libalpm/util.c:553
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "无法更改目录到 %1$s (%2$s)\n"
 
-#: lib/libalpm/add.c:639 lib/libalpm/util.c:400 lib/libalpm/util.c:624
+#: lib/libalpm/add.c:647 lib/libalpm/util.c:400 lib/libalpm/util.c:624
 #, c-format
 msgid "could not restore working directory (%s)\n"
 msgstr "无法恢复工作目录 (%s)\n"
 
-#: lib/libalpm/add.c:647
+#: lib/libalpm/add.c:655
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "更新 %s 时出现错误\n"
 
-#: lib/libalpm/add.c:653
+#: lib/libalpm/add.c:661
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "安装 %s 时出现错误\n"
 
-#: lib/libalpm/add.c:669
+#: lib/libalpm/add.c:677
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "无法更新数据库记录 %1$s-%2$s\n"
 
-#: lib/libalpm/add.c:680
+#: lib/libalpm/add.c:688
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "无法在缓存中添加记录 '%s' \n"
@@ -181,7 +181,7 @@ msgstr "读取软件包 %1$s 发生错误: %2$s\n"
 #: lib/libalpm/be_package.c:493 lib/libalpm/be_package.c:517
 #, c-format
 msgid "error while reading mtree of package %s: %s\n"
-msgstr ""
+msgstr "读取包 %s 的mtree时出错: %s\n"
 
 #: lib/libalpm/be_package.c:588
 #, c-format
@@ -345,7 +345,7 @@ msgstr "无法从 %2$s : %3$s 获取文件 '%1$s'\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
+msgstr "获取文件 '%s' 失败，来自 %s : 下载大小超出期望值\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -742,22 +742,22 @@ msgstr "无法交付可撤销处理\n"
 msgid "could not commit transaction\n"
 msgstr "无法交付处理\n"
 
-#: lib/libalpm/trans.c:339
+#: lib/libalpm/trans.c:343
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "无法创建临时目录\n"
 
-#: lib/libalpm/trans.c:354
+#: lib/libalpm/trans.c:358
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "无法复制临时文件到 %1$s (%2$s)\n"
 
-#: lib/libalpm/trans.c:385
+#: lib/libalpm/trans.c:389
 #, c-format
 msgid "could not remove %s\n"
 msgstr "无法删除 %s\n"
 
-#: lib/libalpm/trans.c:389
+#: lib/libalpm/trans.c:393
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "无法删除临时目录 %s\n"
@@ -810,7 +810,7 @@ msgstr "未知信号"
 #: lib/libalpm/util.c:614
 #, c-format
 msgid "command terminated by signal %d: %s\n"
-msgstr ""
+msgstr "命令被信号 %d 终止: %s\n"
 
 #: lib/libalpm/util.c:711
 #, c-format