From 558d08d821a6797c972acdf02e03aa1a1ff49917 Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Fri, 23 Apr 2021 10:44:27 +1000
Subject: Prepare translations for next release

Signed-off-by: Allan McRae <allan@archlinux.org>
---
 lib/libalpm/po/zh_CN.po | 286 ++++++++++++++++++++++++++----------------------
 1 file changed, 154 insertions(+), 132 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 b526b39c..7f0ff5ce 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -4,12 +4,13 @@
 #
 # Translators:
 # Alimspender Dong <akillcool@outlook.com>, 2019
-# leonfeng <chaofeng111@qq.com>, 2018
+# Feng Chao <chaofeng111@qq.com>, 2018
 # Dan McGee <dpmcgee@gmail.com>, 2011
+# Feng Chao <chaofeng111@qq.com>, 2020
 # Jiachen YANG <farseerfc@gmail.com>, 2019
-# leonfeng <chaofeng111@qq.com>, 2011
-# leonfeng <chaofeng111@qq.com>, 2011,2018
-# leonfeng <chaofeng111@qq.com>, 2011
+# Feng Chao <chaofeng111@qq.com>, 2011
+# Feng Chao <chaofeng111@qq.com>, 2011,2018
+# Feng Chao <chaofeng111@qq.com>, 2011
 # mytbk <mytbk920423@gmail.com>, 2013,2015,2017
 # mytbk <mytbk920423@gmail.com>, 2013,2015,2017
 # ykelvis <ykelvis@users.noreply.github.com>, 2014
@@ -20,9 +21,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: 2019-10-21 17:23+1000\n"
-"PO-Revision-Date: 2019-10-07 08:12+0000\n"
-"Last-Translator: Allan McRae <allan@archlinux.org>\n"
+"POT-Creation-Date: 2021-04-23 10:36+1000\n"
+"PO-Revision-Date: 2020-04-26 08:52+0000\n"
+"Last-Translator: Feng Chao <chaofeng111@qq.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-"
 "pacman/language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -31,17 +32,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: lib/libalpm/add.c:91 lib/libalpm/sync.c:290
+#: lib/libalpm/add.c:90 lib/libalpm/sync.c:279
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%1$s-%2$s 已经为最新 -- 跳过\n"
 
-#: lib/libalpm/add.c:95
+#: lib/libalpm/add.c:94
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%1$s-%2$s 已经为最新 -- 重新安装\n"
 
-#: lib/libalpm/add.c:100
+#: lib/libalpm/add.c:99
 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "正在降级软件包 %1$s (%2$s => %3$s)\n"
@@ -51,17 +52,17 @@ msgstr "正在降级软件包 %1$s (%2$s => %3$s)\n"
 msgid "cannot allocate disk archive object"
 msgstr "无法分配磁盘归档对象"
 
-#: lib/libalpm/add.c:143 lib/libalpm/util.c:382
+#: lib/libalpm/add.c:143 lib/libalpm/util.c:384
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
 msgstr "解压 %s 时出现警告 (%s)\n"
 
-#: lib/libalpm/add.c:146 lib/libalpm/util.c:385
+#: lib/libalpm/add.c:146 lib/libalpm/util.c:387
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "无法解压缩 %1$s (%2$s)\n"
 
-#: lib/libalpm/add.c:159 lib/libalpm/dload.c:574 lib/libalpm/remove.c:542
+#: lib/libalpm/add.c:159 lib/libalpm/dload.c:659 lib/libalpm/remove.c:534
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
 msgstr "无法将 %1$s 重命名为 %2$s (%3$s)\n"
@@ -104,137 +105,137 @@ msgstr "解压缩：没有用文件 %s 覆盖目录\n"
 msgid "unable to extract %s.pacnew: path too long"
 msgstr "无法解压缩 %s.pacnew：路径过长"
 
-#: lib/libalpm/add.c:513 lib/libalpm/util.c:334 lib/libalpm/util.c:592
+#: lib/libalpm/add.c:510 lib/libalpm/util.c:335 lib/libalpm/util.c:600
 #, c-format
 msgid "could not get current working directory\n"
 msgstr "无法得到当前的工作目录\n"
 
-#: lib/libalpm/add.c:518 lib/libalpm/util.c:339 lib/libalpm/util.c:597
-#: lib/libalpm/util.c:650
+#: lib/libalpm/add.c:515 lib/libalpm/util.c:340 lib/libalpm/util.c:605
+#: lib/libalpm/util.c:658
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "无法更改目录到 %1$s (%2$s)\n"
 
-#: lib/libalpm/add.c:575 lib/libalpm/util.c:403 lib/libalpm/util.c:766
+#: lib/libalpm/add.c:571 lib/libalpm/util.c:405 lib/libalpm/util.c:774
 #, c-format
 msgid "could not restore working directory (%s)\n"
 msgstr "无法恢复工作目录 (%s)\n"
 
-#: lib/libalpm/add.c:583
+#: lib/libalpm/add.c:579
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "更新 %s 时出现错误\n"
 
-#: lib/libalpm/add.c:589
+#: lib/libalpm/add.c:585
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "安装 %s 时出现错误\n"
 
-#: lib/libalpm/add.c:604
+#: lib/libalpm/add.c:600
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "无法更新数据库记录 %1$s-%2$s\n"
 
-#: lib/libalpm/add.c:615
+#: lib/libalpm/add.c:610
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "无法在缓存中添加记录 '%s' \n"
 
-#: lib/libalpm/be_local.c:267
+#: lib/libalpm/be_local.c:266
 #, c-format
 msgid "error while reading file %s: %s\n"
 msgstr "读取文件%s时发生错误：%s\n"
 
-#: lib/libalpm/be_local.c:364
+#: lib/libalpm/be_local.c:376
 #, c-format
 msgid "removing invalid database: %s\n"
 msgstr "正在删除无效的数据库： %s\n"
 
-#: lib/libalpm/be_local.c:415 lib/libalpm/be_local.c:905
+#: lib/libalpm/be_local.c:427 lib/libalpm/be_local.c:909
 #, c-format
 msgid "could not create directory %s: %s\n"
 msgstr "无法更改目录到 %1$s：%2$s\n"
 
-#: lib/libalpm/be_local.c:590 lib/libalpm/be_sync.c:386
+#: lib/libalpm/be_local.c:602 lib/libalpm/be_sync.c:322
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "数据库记录 '%s' 名字无效\n"
 
-#: lib/libalpm/be_local.c:598
+#: lib/libalpm/be_local.c:610
 #, c-format
 msgid "duplicated database entry '%s'\n"
 msgstr "重复的数据库记录 '%s'\n"
 
-#: lib/libalpm/be_local.c:610
+#: lib/libalpm/be_local.c:622
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "损坏的数据库记录 '%s'\n"
 
-#: lib/libalpm/be_local.c:713 lib/libalpm/be_local.c:809
-#: lib/libalpm/be_local.c:954 lib/libalpm/be_local.c:1051
-#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:422 lib/libalpm/util.c:253
-#: lib/libalpm/util.c:269
+#: lib/libalpm/be_local.c:722 lib/libalpm/be_local.c:818
+#: lib/libalpm/be_local.c:958 lib/libalpm/be_local.c:1055
+#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:770 lib/libalpm/util.c:254
+#: lib/libalpm/util.c:270
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "无法打开文件 %1$s: %2$s\n"
 
-#: lib/libalpm/be_local.c:729 lib/libalpm/be_sync.c:650
+#: lib/libalpm/be_local.c:738 lib/libalpm/be_sync.c:582
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
 msgstr "%1$s 数据库不一致：名字和软件包中的 %2$s 不一致\n"
 
-#: lib/libalpm/be_local.c:735 lib/libalpm/be_sync.c:656
+#: lib/libalpm/be_local.c:744 lib/libalpm/be_sync.c:588
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
 msgstr "%1$s 数据库不一致：版本和软件包中的 %2$s 不一致\n"
 
-#: lib/libalpm/be_local.c:776
+#: lib/libalpm/be_local.c:785
 #, c-format
 msgid "unknown validation type for package %s: %s\n"
 msgstr "包%s的验证类型未知：%s\n"
 
-#: lib/libalpm/be_package.c:479 lib/libalpm/be_package.c:637
-#: lib/libalpm/be_package.c:650
+#: lib/libalpm/be_package.c:478 lib/libalpm/be_package.c:631
+#: lib/libalpm/be_package.c:643
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "读取软件包 %1$s 发生错误: %2$s\n"
 
-#: lib/libalpm/be_package.c:493 lib/libalpm/be_package.c:517
+#: lib/libalpm/be_package.c:491 lib/libalpm/be_package.c:514
 #, c-format
 msgid "error while reading mtree of package %s: %s\n"
 msgstr "读取包 %s 的mtree时出错: %s\n"
 
-#: lib/libalpm/be_package.c:603
+#: lib/libalpm/be_package.c:597
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "无法解析 %s 中的软件包描述文件\n"
 
-#: lib/libalpm/be_package.c:608
+#: lib/libalpm/be_package.c:602
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "%s 中缺少软件包名字\n"
 
-#: lib/libalpm/be_package.c:612
+#: lib/libalpm/be_package.c:606
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "%s 中缺少软件包版本号\n"
 
-#: lib/libalpm/be_package.c:616
+#: lib/libalpm/be_package.c:610
 #, c-format
 msgid "invalid package version in %s\n"
 msgstr "%s 中软件包版本号无效\n"
 
-#: lib/libalpm/be_package.c:657
+#: lib/libalpm/be_package.c:649
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "%s 中缺少软件包元数据\n"
 
-#: lib/libalpm/be_package.c:750
+#: lib/libalpm/be_package.c:741
 #, c-format
 msgid "failed to read signature file: %s\n"
 msgstr "读取签名文件失败：%s\n"
 
-#: lib/libalpm/be_package.c:779 lib/libalpm/sync.c:953
+#: lib/libalpm/be_package.c:770 lib/libalpm/sync.c:934
 #, c-format
 msgid "required key missing from keyring\n"
 msgstr "所需的密钥不在密钥环中\n"
@@ -244,32 +245,32 @@ msgstr "所需的密钥不在密钥环中\n"
 msgid "removing invalid file: %s\n"
 msgstr "删除无效文件: %s\n"
 
-#: lib/libalpm/be_sync.c:515
+#: lib/libalpm/be_sync.c:449
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr "无法解析软件包描述文件 '%s' 从数据库 '%s'\n"
 
-#: lib/libalpm/be_sync.c:522
+#: lib/libalpm/be_sync.c:456
 #, c-format
 msgid "could not read db '%s' (%s)\n"
 msgstr "无法读取数据库 '%s' (%s)\n"
 
-#: lib/libalpm/be_sync.c:556 lib/libalpm/be_sync.c:561
+#: lib/libalpm/be_sync.c:489 lib/libalpm/be_sync.c:494
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
 msgstr "%s 数据库不一致: 包 %s 的文件名不合法\n"
 
-#: lib/libalpm/be_sync.c:566
+#: lib/libalpm/be_sync.c:499
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
 msgstr "%s 数据库不一致: 包 %s 的文件名太长\n"
 
-#: lib/libalpm/be_sync.c:632
+#: lib/libalpm/be_sync.c:564
 #, c-format
 msgid "unknown database file: %s\n"
 msgstr "未知的数据库文件： %s\n"
 
-#: lib/libalpm/db.c:370
+#: lib/libalpm/db.c:338
 #, c-format
 msgid "database path is undefined\n"
 msgstr "数据库路径未定义\n"
@@ -289,12 +290,12 @@ msgstr "%1$s 将在它 %2$s 的依赖关系之后被删除\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%1$s 将在它 %2$s 的依赖关系之前被安装\n"
 
-#: lib/libalpm/deps.c:681 lib/libalpm/deps.c:712
+#: lib/libalpm/deps.c:666 lib/libalpm/deps.c:697
 #, c-format
 msgid "ignoring package %s-%s\n"
 msgstr "正在忽略软件包更新 %s-%s\n"
 
-#: lib/libalpm/deps.c:869
+#: lib/libalpm/deps.c:842
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "无法解决 \"%1$s\"，\"%2$s\" 的一个依赖关系\n"
@@ -353,41 +354,67 @@ msgstr ""
 "分区 %s 被挂载为只读\n"
 "\n"
 
-#: lib/libalpm/dload.c:161
+#: lib/libalpm/dload.c:116
+#, c-format
+msgid ""
+"too many errors from %s, skipping for the remainder of this transaction\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:224
 #, c-format
 msgid "disk"
 msgstr "硬盘"
 
-#: lib/libalpm/dload.c:348
+#: lib/libalpm/dload.c:396
 #, c-format
 msgid "failed to create temporary file for download\n"
 msgstr "无法创建下载用的临时文件\n"
 
-#: lib/libalpm/dload.c:393
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "url '%s' 无效\n"
-
-#: lib/libalpm/dload.c:464 lib/libalpm/dload.c:485 lib/libalpm/dload.c:496
+#: lib/libalpm/dload.c:497 lib/libalpm/dload.c:525 lib/libalpm/dload.c:542
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "无法从 %2$s : %3$s 获取文件 '%1$s'\n"
 
-#: lib/libalpm/dload.c:477
+#: lib/libalpm/dload.c:516
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
 msgstr "获取文件 '%s' 失败，来自 %s : 下载大小超出期望值\n"
 
-#: lib/libalpm/dload.c:532
+#: lib/libalpm/dload.c:637
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
 msgstr "%s 可缩小：%jd/%jd bytes\n"
 
-#: lib/libalpm/dload.c:677 lib/libalpm/dload.c:706
+#: lib/libalpm/dload.c:737
 #, c-format
-msgid "failed to download %s\n"
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' 无效\n"
+
+#: lib/libalpm/dload.c:817
+#, fuzzy, c-format
+msgid "failed to setup a download payload for %s\n"
 msgstr "下载 %s 失败\n"
 
+#: lib/libalpm/dload.c:829
+#, c-format
+msgid "curl returned error %d from transfer\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:851
+#, c-format
+msgid "curl transfer error: %d\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:969 lib/libalpm/sync.c:821
+#, c-format
+msgid "failed to retrieve some files\n"
+msgstr "无法获取某些文件\n"
+
+#: lib/libalpm/dload.c:992
+#, c-format
+msgid "download completed successfully but no file in the cache\n"
+msgstr ""
+
 #: lib/libalpm/error.c:40
 #, c-format
 msgid "out of memory!"
@@ -658,12 +685,12 @@ msgstr "编译时未启用签名支持"
 msgid "unexpected error"
 msgstr "未预期的错误"
 
-#: lib/libalpm/handle.c:153
+#: lib/libalpm/handle.c:142
 #, c-format
 msgid "lock file missing %s\n"
 msgstr "缺失锁文件 %s\n"
 
-#: lib/libalpm/handle.c:159
+#: lib/libalpm/handle.c:148
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "无法删除锁文件 %s\n"
@@ -735,7 +762,7 @@ msgstr "钩子 %s 第 %d 行：无法设置选项 (%s)\n"
 msgid "unable to run hook %s: %s\n"
 msgstr "无法运行钩子 %s: %s\n"
 
-#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:386
+#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:378
 #, c-format
 msgid "could not open directory: %s: %s\n"
 msgstr "无法打开目录：%s: %s\n"
@@ -745,7 +772,7 @@ msgstr "无法打开目录：%s: %s\n"
 msgid "could not open file: %s%s: %s\n"
 msgstr "无法打开文件：%s%s: %s\n"
 
-#: lib/libalpm/hook.c:595 lib/libalpm/util.c:259
+#: lib/libalpm/hook.c:595 lib/libalpm/util.c:260
 #, c-format
 msgid "could not stat file %s: %s\n"
 msgstr "无法确定文件%s的状态: %s\n"
@@ -755,279 +782,274 @@ msgstr "无法确定文件%s的状态: %s\n"
 msgid "could not read directory: %s: %s\n"
 msgstr "无法读取目录：%s: %s\n"
 
-#: lib/libalpm/package.c:578
+#: lib/libalpm/package.c:598
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
 msgstr "无法完全加载软件包 %s 的元数据 - %s\n"
 
-#: lib/libalpm/remove.c:119
+#: lib/libalpm/remove.c:111
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "无法在数据库中找到 %s -- 跳过\n"
 
-#: lib/libalpm/remove.c:154
+#: lib/libalpm/remove.c:146
 #, c-format
 msgid "removing %s from target list\n"
 msgstr "正在从目标清单中删除 '%s' \n"
 
-#: lib/libalpm/remove.c:346
+#: lib/libalpm/remove.c:338
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "无法删除文件 '%1$s': %2$s\n"
 
-#: lib/libalpm/remove.c:411 lib/libalpm/remove.c:420
+#: lib/libalpm/remove.c:403 lib/libalpm/remove.c:412
 #, c-format
 msgid "could not backup %s due to PATH_MAX overflow\n"
 msgstr "由于 PATH_MAX 溢出无法备份 %s\n"
 
-#: lib/libalpm/remove.c:562
+#: lib/libalpm/remove.c:554
 #, c-format
 msgid "cannot remove %s (%s)\n"
 msgstr "无法删除 %s (%s)\n"
 
-#: lib/libalpm/remove.c:735
+#: lib/libalpm/remove.c:727
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "无法删除数据库记录 %1$s-%2$s\n"
 
-#: lib/libalpm/remove.c:740
+#: lib/libalpm/remove.c:732
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "无法从缓存中删除记录 '%s'\n"
 
-#: lib/libalpm/signing.c:171
+#: lib/libalpm/signing.c:163
 #, c-format
 msgid "Public keyring not found; have you run '%s'?\n"
 msgstr "找不到公钥环。你执行 '%s' 了吗？\n"
 
-#: lib/libalpm/signing.c:207 lib/libalpm/signing.c:784
+#: lib/libalpm/signing.c:199 lib/libalpm/signing.c:766
 #, c-format
 msgid "GPGME error: %s\n"
 msgstr "GPGME 错误：%s\n"
 
-#: lib/libalpm/signing.c:284
+#: lib/libalpm/signing.c:274
 #, c-format
 msgid "looking up key %s using WKD\n"
-msgstr ""
+msgstr "用 WKD 查询密钥 %s\n"
 
-#: lib/libalpm/signing.c:293
+#: lib/libalpm/signing.c:283
 #, c-format
 msgid "gpg error: %s\n"
-msgstr ""
+msgstr "gpg 错误: %s\n"
 
-#: lib/libalpm/signing.c:441 lib/libalpm/signing.c:515
+#: lib/libalpm/signing.c:430 lib/libalpm/signing.c:503
 #, c-format
 msgid "keyring is not writable\n"
 msgstr "密钥环不可写\n"
 
-#: lib/libalpm/signing.c:539
+#: lib/libalpm/signing.c:527
 #, c-format
 msgid "key \"%s\" on keyserver\n"
-msgstr ""
+msgstr "密钥服务器上的密钥 \"%s\"\n"
 
-#: lib/libalpm/signing.c:544
+#: lib/libalpm/signing.c:532
 #, c-format
 msgid "key \"%s\" could not be imported\n"
 msgstr "密钥 \"%s\" 无法导入\n"
 
-#: lib/libalpm/signing.c:548
+#: lib/libalpm/signing.c:536
 #, c-format
 msgid "key \"%s\" could not be looked up remotely\n"
 msgstr "无法远程查找到密钥 \"%s\"\n"
 
-#: lib/libalpm/signing.c:943 lib/libalpm/sync.c:1022
+#: lib/libalpm/signing.c:925 lib/libalpm/sync.c:1003
 #, c-format
 msgid "%s: missing required signature\n"
 msgstr "%s：缺失签名\n"
 
-#: lib/libalpm/signing.c:958
+#: lib/libalpm/signing.c:940
 #, c-format
 msgid "%s: signature from \"%s\" is marginal trust\n"
 msgstr "%s: 来自 \"%s\" 的签名是勉强信任的\n"
 
-#: lib/libalpm/signing.c:966
+#: lib/libalpm/signing.c:948
 #, c-format
 msgid "%s: signature from \"%s\" is unknown trust\n"
 msgstr "%s: 来自 \"%s\" 的签名是未知信任的\n"
 
-#: lib/libalpm/signing.c:973
+#: lib/libalpm/signing.c:955
 #, c-format
 msgid "%s: signature from \"%s\" should never be trusted\n"
 msgstr "%s: 来自 \"%s\" 的签名是从不应该被信任的\n"
 
-#: lib/libalpm/signing.c:985
+#: lib/libalpm/signing.c:967
 #, c-format
 msgid "%s: key \"%s\" is unknown\n"
 msgstr "%s: 密钥 \"%s\" 未知\n"
 
-#: lib/libalpm/signing.c:994
+#: lib/libalpm/signing.c:976
 #, c-format
 msgid "%s: key \"%s\" is disabled\n"
 msgstr "%s: 密钥 \"%s\" 被禁用了\n"
 
-#: lib/libalpm/signing.c:998
+#: lib/libalpm/signing.c:980
 #, c-format
 msgid "%s: signature from \"%s\" is expired\n"
 msgstr "%s: 来自 \"%s\" 的签名过期了\n"
 
-#: lib/libalpm/signing.c:1002
+#: lib/libalpm/signing.c:984
 #, c-format
 msgid "%s: signature from \"%s\" is invalid\n"
 msgstr "%s: 来自 \"%s\" 的签名无效\n"
 
-#: lib/libalpm/signing.c:1079 lib/libalpm/signing.c:1147
-#: lib/libalpm/signing.c:1226
+#: lib/libalpm/signing.c:1042 lib/libalpm/signing.c:1103
+#: lib/libalpm/signing.c:1182
 #, c-format
 msgid "%s: signature format error\n"
 msgstr "%s: 签名格式错误\n"
 
-#: lib/libalpm/signing.c:1179 lib/libalpm/signing.c:1212
-#: lib/libalpm/signing.c:1220
+#: lib/libalpm/signing.c:1135 lib/libalpm/signing.c:1168
+#: lib/libalpm/signing.c:1176
 #, c-format
 msgid "%s: unsupported signature format\n"
 msgstr "%s: 不支持的签名格式\n"
 
-#: lib/libalpm/sync.c:99
+#: lib/libalpm/sync.c:96
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s：忽略软件包升级 (%s => %s)\n"
 
-#: lib/libalpm/sync.c:111
+#: lib/libalpm/sync.c:108
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
 msgstr "%s：忽略软件包降级 (%s => %s)\n"
 
-#: lib/libalpm/sync.c:114
+#: lib/libalpm/sync.c:111
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
 msgstr "%s：正在从版本 %s 降级为 %s \n"
 
-#: lib/libalpm/sync.c:120
+#: lib/libalpm/sync.c:117
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s：本地 (%s) 比 %s 的版本更新 (%s)\n"
 
-#: lib/libalpm/sync.c:161
+#: lib/libalpm/sync.c:158
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
 msgstr "正在忽略替换软件包 (%s-%s => %s-%s)\n"
 
-#: lib/libalpm/sync.c:177
+#: lib/libalpm/sync.c:174
 #, c-format
 msgid "cannot replace %s by %s\n"
 msgstr "无法替换 %s 为 %s\n"
 
-#: lib/libalpm/sync.c:535 lib/libalpm/sync.c:605
+#: lib/libalpm/sync.c:523 lib/libalpm/sync.c:593
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "检测到未解决的软件包冲突\n"
 
-#: lib/libalpm/sync.c:555
+#: lib/libalpm/sync.c:543
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
 msgstr "正在从目标清单中删除 '%1$s' ，因为它和 '%2$s' 冲突\n"
 
-#: lib/libalpm/sync.c:849
-#, c-format
-msgid "failed to retrieve some files\n"
-msgstr "无法获取某些文件\n"
-
-#: lib/libalpm/sync.c:1036
+#: lib/libalpm/sync.c:1017
 #, c-format
 msgid "failed to read file %s: %s\n"
 msgstr "无法读取文件 %s：%s\n"
 
-#: lib/libalpm/sync.c:1223
+#: lib/libalpm/sync.c:1204
 #, c-format
 msgid "not enough free disk space\n"
 msgstr "剩余空间不够\n"
 
-#: lib/libalpm/sync.c:1245
+#: lib/libalpm/sync.c:1226
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "无法提交删除事务\n"
 
-#: lib/libalpm/sync.c:1253
+#: lib/libalpm/sync.c:1234
 #, c-format
 msgid "could not commit transaction\n"
 msgstr "无法提交事务\n"
 
-#: lib/libalpm/trans.c:364
+#: lib/libalpm/trans.c:365
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "无法创建临时目录\n"
 
-#: lib/libalpm/trans.c:379
+#: lib/libalpm/trans.c:380
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "无法复制临时文件到 %1$s (%2$s)\n"
 
-#: lib/libalpm/trans.c:410
+#: lib/libalpm/trans.c:411
 #, c-format
 msgid "could not remove %s\n"
 msgstr "无法删除 %s\n"
 
-#: lib/libalpm/trans.c:414
+#: lib/libalpm/trans.c:415
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "无法删除临时目录 %s\n"
 
-#: lib/libalpm/util.c:486
+#: lib/libalpm/util.c:488
 #, c-format
 msgid "unable to write to pipe (%s)\n"
 msgstr "无法写入管道 (%s)\n"
 
-#: lib/libalpm/util.c:545
+#: lib/libalpm/util.c:547
 #, c-format
 msgid "unable to read from pipe (%s)\n"
 msgstr "无法读取管道 (%s)\n"
 
-#: lib/libalpm/util.c:609 lib/libalpm/util.c:615
+#: lib/libalpm/util.c:617 lib/libalpm/util.c:623
 #, c-format
 msgid "could not create pipe (%s)\n"
 msgstr "无法创建管道 (%s)\n"
 
-#: lib/libalpm/util.c:623
+#: lib/libalpm/util.c:631
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "无法 fork 新进程 (%s)\n"
 
-#: lib/libalpm/util.c:646
+#: lib/libalpm/util.c:654
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "无法更改根目录 (%s)\n"
 
-#: lib/libalpm/util.c:658
+#: lib/libalpm/util.c:666
 #, c-format
 msgid "call to execv failed (%s)\n"
 msgstr "调用 execv 失败 (%s)\n"
 
-#: lib/libalpm/util.c:737
+#: lib/libalpm/util.c:745
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "调用 waitpid 失败 (%s)\n"
 
-#: lib/libalpm/util.c:747
+#: lib/libalpm/util.c:755
 #, c-format
 msgid "command failed to execute correctly\n"
 msgstr "命令未能被正确执行\n"
 
-#: lib/libalpm/util.c:754
+#: lib/libalpm/util.c:762
 #, c-format
 msgid "Unknown signal"
 msgstr "未知信号"
 
-#: lib/libalpm/util.c:756
+#: lib/libalpm/util.c:764
 #, c-format
 msgid "command terminated by signal %d: %s\n"
 msgstr "命令被信号 %d 终止: %s\n"
 
-#: lib/libalpm/util.c:853
+#: lib/libalpm/util.c:875
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "没有 %s 缓存存在，正在创建...\n"
 
-#: lib/libalpm/util.c:884
+#: lib/libalpm/util.c:906
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
 msgstr "无法找到或创建软件包缓存，使用 %s 中\n"
-- 
cgit v1.2.3-54-g00ecf