From 254a8e2e05f5ffffdaa5ae21d1c6b32375df9061 Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Sun, 29 Apr 2018 23:43:07 +1000
Subject: Import updated translations from Transifex

Signed-off-by: Allan McRae <allan@archlinux.org>
---
 lib/libalpm/po/zh_CN.po | 153 ++++++++++++++++++++++++------------------------
 1 file changed, 75 insertions(+), 78 deletions(-)

(limited to 'lib/libalpm/po/zh_CN.po')

diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index f1c0bd3a..e35474a3 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -1,12 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# leonfeng <chaofeng111@qq.com>, 2018
 # Dan McGee <dpmcgee@gmail.com>, 2011
-# leonfeng <chaofeng111@gmail.com>, 2011
-# leonfeng <chaofeng111@gmail.com>, 2011
-# mytbk <mytbk920423@gmail.com>, 2013,2015
+# leonfeng <chaofeng111@qq.com>, 2011
+# leonfeng <chaofeng111@qq.com>, 2011
+# mytbk <mytbk920423@gmail.com>, 2013,2015,2017
 # mytbk <mytbk920423@gmail.com>, 2013,2015
 # ykelvis <ykelvis@users.noreply.github.com>, 2014
 # 张海, 2015
@@ -16,15 +17,14 @@ 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: 2016-02-23 13:08+1000\n"
-"PO-Revision-Date: 2015-12-25 16:12+0000\n"
-"Last-Translator: mytbk <mytbk920423@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/zh_CN/)\n"
-"Language: zh_CN\n"
+"POT-Creation-Date: 2017-05-22 11:00+1000\n"
+"PO-Revision-Date: 2018-01-10 09:16+0000\n"
+"Last-Translator: leonfeng <chaofeng111@qq.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-pacman/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: lib/libalpm/add.c:86
@@ -42,91 +42,92 @@ msgstr "%1$s-%2$s 已经为最新 -- 重新安装\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "正在降级软件包 %1$s (%2$s => %3$s)\n"
 
-#: lib/libalpm/add.c:124 lib/libalpm/util.c:379
+#: lib/libalpm/add.c:124
+#, c-format
+msgid "cannot allocate disk archive object"
+msgstr "无法分配磁盘归档对象"
+
+#: lib/libalpm/add.c:138 lib/libalpm/util.c:379
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
 msgstr "解压 %s 时出现警告 (%s)\n"
 
-#: lib/libalpm/add.c:127 lib/libalpm/util.c:382
+#: lib/libalpm/add.c:141 lib/libalpm/util.c:382
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "无法解压缩 %1$s (%2$s)\n"
 
-#: lib/libalpm/add.c:140 lib/libalpm/dload.c:589 lib/libalpm/remove.c:520
+#: lib/libalpm/add.c:154 lib/libalpm/dload.c:589 lib/libalpm/remove.c:533
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
 msgstr "无法将 %1$s 重命名为 %2$s (%3$s)\n"
 
-#: lib/libalpm/add.c:191
+#: lib/libalpm/add.c:205
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
 msgstr "在包 %s 的文件列表中没找到文件。跳过 %s 的提取\n"
 
-#: lib/libalpm/add.c:200
+#: lib/libalpm/add.c:214
 #, c-format
 msgid "unable to extract %s%s: path too long"
 msgstr "无法解压缩 %s%s：路径过长"
 
-#: lib/libalpm/add.c:242
+#: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"目录权限不一致 %1$s\n"
-"文件系统：%2$o  软件包：%3$o\n"
+msgstr "目录权限不一致 %1$s\n文件系统：%2$o  软件包：%3$o\n"
 
-#: lib/libalpm/add.c:257
+#: lib/libalpm/add.c:271
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"目录权限不一致 %s\n"
-"文件系统：%u:%u 软件包：%u:%u\n"
+msgstr "目录权限不一致 %s\n文件系统：%u:%u 软件包：%u:%u\n"
 
-#: lib/libalpm/add.c:273
+#: lib/libalpm/add.c:287
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "解压缩：没有用文件 %s 覆盖目录\n"
 
-#: lib/libalpm/add.c:301
+#: lib/libalpm/add.c:315
 #, c-format
 msgid "unable to extract %s.pacnew: path too long"
 msgstr "无法解压缩 %s.pacnew：路径过长"
 
-#: lib/libalpm/add.c:498 lib/libalpm/util.c:331 lib/libalpm/util.c:567
+#: lib/libalpm/add.c:508 lib/libalpm/util.c:331 lib/libalpm/util.c:577
 #, c-format
 msgid "could not get current working directory\n"
 msgstr "无法得到当前的工作目录\n"
 
-#: lib/libalpm/add.c:503 lib/libalpm/util.c:336 lib/libalpm/util.c:572
-#: lib/libalpm/util.c:625
+#: lib/libalpm/add.c:513 lib/libalpm/util.c:336 lib/libalpm/util.c:582
+#: lib/libalpm/util.c:635
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "无法更改目录到 %1$s (%2$s)\n"
 
-#: lib/libalpm/add.c:542 lib/libalpm/util.c:400 lib/libalpm/util.c:730
+#: lib/libalpm/add.c:570 lib/libalpm/util.c:400 lib/libalpm/util.c:740
 #, c-format
 msgid "could not restore working directory (%s)\n"
 msgstr "无法恢复工作目录 (%s)\n"
 
-#: lib/libalpm/add.c:550
+#: lib/libalpm/add.c:578
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "更新 %s 时出现错误\n"
 
-#: lib/libalpm/add.c:556
+#: lib/libalpm/add.c:584
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "安装 %s 时出现错误\n"
 
-#: lib/libalpm/add.c:572
+#: lib/libalpm/add.c:599
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "无法更新数据库记录 %1$s-%2$s\n"
 
-#: lib/libalpm/add.c:583
+#: lib/libalpm/add.c:610
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "无法在缓存中添加记录 '%s' \n"
@@ -141,12 +142,12 @@ msgstr "读取文件%s时发生错误：%s\n"
 msgid "removing invalid database: %s\n"
 msgstr "正在删除无效的数据库： %s\n"
 
-#: lib/libalpm/be_local.c:401 lib/libalpm/be_local.c:873
+#: lib/libalpm/be_local.c:401 lib/libalpm/be_local.c:886
 #, c-format
 msgid "could not create directory %s: %s\n"
 msgstr "无法更改目录到 %1$s：%2$s\n"
 
-#: lib/libalpm/be_local.c:576 lib/libalpm/be_sync.c:377
+#: lib/libalpm/be_local.c:576 lib/libalpm/be_sync.c:387
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "数据库记录 '%s' 名字无效\n"
@@ -162,19 +163,19 @@ msgid "corrupted database entry '%s'\n"
 msgstr "损坏的数据库记录 '%s'\n"
 
 #: lib/libalpm/be_local.c:696 lib/libalpm/be_local.c:788
-#: lib/libalpm/be_local.c:922 lib/libalpm/be_local.c:1019
+#: lib/libalpm/be_local.c:935 lib/libalpm/be_local.c:1032
 #: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:447 lib/libalpm/util.c:250
 #: lib/libalpm/util.c:266
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "无法打开文件 %1$s: %2$s\n"
 
-#: lib/libalpm/be_local.c:712 lib/libalpm/be_sync.c:630
+#: lib/libalpm/be_local.c:712 lib/libalpm/be_sync.c:641
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
 msgstr "%1$s 数据库不一致：名字和软件包中的 %2$s 不一致\n"
 
-#: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
+#: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:647
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
 msgstr "%1$s 数据库不一致：版本和软件包中的 %2$s 不一致\n"
@@ -184,48 +185,48 @@ msgstr "%1$s 数据库不一致：版本和软件包中的 %2$s 不一致\n"
 msgid "unknown validation type for package %s: %s\n"
 msgstr "包%s的验证类型未知：%s\n"
 
-#: lib/libalpm/be_package.c:476 lib/libalpm/be_package.c:634
-#: lib/libalpm/be_package.c:647
+#: lib/libalpm/be_package.c:477 lib/libalpm/be_package.c:635
+#: lib/libalpm/be_package.c:648
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "读取软件包 %1$s 发生错误: %2$s\n"
 
-#: lib/libalpm/be_package.c:490 lib/libalpm/be_package.c:514
+#: lib/libalpm/be_package.c:491 lib/libalpm/be_package.c:515
 #, c-format
 msgid "error while reading mtree of package %s: %s\n"
 msgstr "读取包 %s 的mtree时出错: %s\n"
 
-#: lib/libalpm/be_package.c:600
+#: lib/libalpm/be_package.c:601
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "无法解析 %s 中的软件包描述文件\n"
 
-#: lib/libalpm/be_package.c:605
+#: lib/libalpm/be_package.c:606
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "%s 中缺少软件包名字\n"
 
-#: lib/libalpm/be_package.c:609
+#: lib/libalpm/be_package.c:610
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "%s 中缺少软件包版本号\n"
 
-#: lib/libalpm/be_package.c:613
+#: lib/libalpm/be_package.c:614
 #, c-format
 msgid "invalid package version in %s\n"
 msgstr "%s 中软件包版本号无效\n"
 
-#: lib/libalpm/be_package.c:654
+#: lib/libalpm/be_package.c:655
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "%s 中缺少软件包元数据\n"
 
-#: lib/libalpm/be_package.c:743
+#: lib/libalpm/be_package.c:747
 #, c-format
 msgid "failed to read signature file: %s\n"
 msgstr "读取签名文件失败：%s\n"
 
-#: lib/libalpm/be_package.c:764 lib/libalpm/sync.c:1113
+#: lib/libalpm/be_package.c:768 lib/libalpm/sync.c:1113
 #, c-format
 msgid "required key missing from keyring\n"
 msgstr "所需的密钥从密钥环中丢失\n"
@@ -235,22 +236,22 @@ msgstr "所需的密钥从密钥环中丢失\n"
 msgid "removing invalid file: %s\n"
 msgstr "删除无效文件: %s\n"
 
-#: lib/libalpm/be_sync.c:502
+#: lib/libalpm/be_sync.c:513
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr "无法解析软件包描述文件 '%s' 从数据库 '%s'\n"
 
-#: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
+#: lib/libalpm/be_sync.c:546 lib/libalpm/be_sync.c:551
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
 msgstr "%s 数据库不一致: 包 %s 的文件名不合法\n"
 
-#: lib/libalpm/be_sync.c:545
+#: lib/libalpm/be_sync.c:556
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
 msgstr "%s 数据库不一致: 包 %s 的文件名太长\n"
 
-#: lib/libalpm/be_sync.c:611
+#: lib/libalpm/be_sync.c:622
 #, c-format
 msgid "unknown database file: %s\n"
 msgstr "未知的数据库文件： %s\n"
@@ -323,9 +324,7 @@ msgstr "无法测定文件系统挂载点\n"
 #: lib/libalpm/diskspace.c:385
 #, c-format
 msgid "could not determine cachedir mount point %s\n"
-msgstr ""
-"无法确定缓存目录挂载点 %s\n"
-"\n"
+msgstr "无法确定缓存目录挂载点 %s\n\n"
 
 #: lib/libalpm/diskspace.c:438
 #, c-format
@@ -335,9 +334,7 @@ msgstr "无法测定根分区挂载点 %s\n"
 #: lib/libalpm/diskspace.c:486
 #, c-format
 msgid "Partition %s is mounted read only\n"
-msgstr ""
-"分区 %s 为只读\n"
-"\n"
+msgstr "分区 %s 为只读\n\n"
 
 #: lib/libalpm/dload.c:149
 #, c-format
@@ -412,12 +409,12 @@ msgstr "剩余空间不够"
 #: lib/libalpm/error.c:55
 #, c-format
 msgid "library not initialized"
-msgstr "函数库未初始化"
+msgstr "仓库未初始化"
 
 #: lib/libalpm/error.c:57
 #, c-format
 msgid "library already initialized"
-msgstr "函数库已初始化"
+msgstr "仓库已初始化"
 
 #: lib/libalpm/error.c:59
 #, c-format
@@ -632,7 +629,7 @@ msgstr "libarchive 错误"
 #: lib/libalpm/error.c:157
 #, c-format
 msgid "download library error"
-msgstr "下载函数库出错"
+msgstr "下载数据库出错"
 
 #: lib/libalpm/error.c:159
 #, c-format
@@ -674,27 +671,27 @@ msgstr "无法在数据库中找到 %s -- 跳过\n"
 msgid "removing %s from target list\n"
 msgstr "正在从目标清单中删除 '%s' \n"
 
-#: lib/libalpm/remove.c:343
+#: lib/libalpm/remove.c:345
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "无法删除文件 '%1$s': %2$s\n"
 
-#: lib/libalpm/remove.c:383
+#: lib/libalpm/remove.c:385
 #, c-format
 msgid "could not open directory: %s: %s\n"
 msgstr "无法打开目录：%s: %s\n"
 
-#: lib/libalpm/remove.c:540
+#: lib/libalpm/remove.c:553
 #, c-format
 msgid "cannot remove %s (%s)\n"
 msgstr "无法删除 %s (%s)\n"
 
-#: lib/libalpm/remove.c:713
+#: lib/libalpm/remove.c:726
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "无法删除数据库记录 %1$s-%2$s\n"
 
-#: lib/libalpm/remove.c:718
+#: lib/libalpm/remove.c:731
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "无法从缓存中删除记录 '%s'\n"
@@ -789,62 +786,62 @@ msgstr "无法删除临时目录 %s\n"
 msgid "could not stat file %s: %s\n"
 msgstr "无法确定文件%s的状态: %s\n"
 
-#: lib/libalpm/util.c:483
+#: lib/libalpm/util.c:493
 #, c-format
 msgid "unable to write to pipe (%s)\n"
 msgstr "无法写入管道 (%s)\n"
 
-#: lib/libalpm/util.c:542
+#: lib/libalpm/util.c:552
 #, c-format
 msgid "unable to read from pipe (%s)\n"
 msgstr "无法读取管道 (%s)\n"
 
-#: lib/libalpm/util.c:584 lib/libalpm/util.c:590
+#: lib/libalpm/util.c:594 lib/libalpm/util.c:600
 #, c-format
 msgid "could not create pipe (%s)\n"
 msgstr "无法创建管道 (%s)\n"
 
-#: lib/libalpm/util.c:598
+#: lib/libalpm/util.c:608
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "无法 fork 新进程 (%s)\n"
 
-#: lib/libalpm/util.c:621
+#: lib/libalpm/util.c:631
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "无法更改根目录 (%s)\n"
 
-#: lib/libalpm/util.c:632
+#: lib/libalpm/util.c:642
 #, c-format
 msgid "call to execv failed (%s)\n"
 msgstr "调用 execv 失败 (%s)\n"
 
-#: lib/libalpm/util.c:701
+#: lib/libalpm/util.c:711
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "调用 waitpid 失败 (%s)\n"
 
-#: lib/libalpm/util.c:711
+#: lib/libalpm/util.c:721
 #, c-format
 msgid "command failed to execute correctly\n"
 msgstr "命令未能被正确执行\n"
 
-#: lib/libalpm/util.c:718
+#: lib/libalpm/util.c:728
 #, c-format
 msgid "Unknown signal"
 msgstr "未知信号"
 
-#: lib/libalpm/util.c:720
+#: lib/libalpm/util.c:730
 #, c-format
 msgid "command terminated by signal %d: %s\n"
 msgstr "命令被信号 %d 终止: %s\n"
 
-#: lib/libalpm/util.c:817
+#: lib/libalpm/util.c:827
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "没有 %s 缓存存在，正在创建...\n"
 
-#: lib/libalpm/util.c:848
+#: lib/libalpm/util.c:858
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
 msgstr "无法找到或创建软件包缓存，使用 %s 中\n"
-- 
cgit v1.2.3-24-g4f1b