releasing package apt version 0.9.15.2

1 files changed, 103 insertions, 105 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3b3e10554..7a97e6305 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+0100\n"
 "PO-Revision-Date: 2010-08-26 14:42+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -156,7 +156,7 @@ msgstr "  软件包锁："
 msgid "  Version table:"
 msgstr "  版本列表："
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
@@ -254,12 +254,12 @@ msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”"
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "请把盘片插入驱动器再按回车键"
 
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "无法将 %s 挂载到 %s"
 
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
 
@@ -736,12 +736,12 @@ msgstr "找不到盘片。"
 msgid "File not found"
 msgstr "无法找到该文件"
 
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
 msgid "Failed to stat"
 msgstr "无法读取状态"
 
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
 msgid "Failed to set modification time"
 msgstr "无法设置文件的修改日期"
 
@@ -999,7 +999,7 @@ msgid ""
 "available:\n"
 msgstr "由于没有公钥，无法验证下列签名：\n"
 
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
 msgid "Empty files can't be valid archives"
 msgstr ""
 
@@ -1303,108 +1303,108 @@ msgstr "不经验证就安装这些软件包吗？"
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"
 
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
 #: apt-private/private-show.cc:86
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [已安装]"
 
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [已安装]"
 
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [已安装]"
 
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
 #, fuzzy
 msgid "[installed]"
 msgstr " [已安装]"
 
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
 msgid "The following packages have unmet dependencies:"
 msgstr "下列软件包有未满足的依赖关系："
 
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
 #, c-format
 msgid "but %s is installed"
 msgstr "但是 %s 已经安装"
 
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
 #, c-format
 msgid "but %s is to be installed"
 msgstr "但是 %s 正要被安装"
 
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
 msgid "but it is not installable"
 msgstr "但无法安装它"
 
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
 msgid "but it is a virtual package"
 msgstr "但是它是虚拟软件包"
 
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
 msgid "but it is not installed"
 msgstr "但是它还没有被安装"
 
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
 msgid "but it is not going to be installed"
 msgstr "但是它将不会被安装"
 
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
 msgid " or"
 msgstr " 或"
 
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
 msgid "The following NEW packages will be installed:"
 msgstr "下列【新】软件包将被安装："
 
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
 msgid "The following packages will be REMOVED:"
 msgstr "下列软件包将被【卸载】："
 
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
 msgid "The following packages have been kept back:"
 msgstr "下列软件包的版本将保持不变："
 
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
 msgid "The following packages will be upgraded:"
 msgstr "下列软件包将被升级："
 
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列软件包将被【降级】："
 
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
 msgid "The following held packages will be changed:"
 msgstr "下列被要求保持版本不变的软件包将被改变："
 
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (是由于 %s) "
 
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1412,27 +1412,27 @@ msgstr ""
 "【警告】：下列基础软件包将被卸载。\n"
 "请勿尝试，除非您确实知道您在做什么！"
 
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "重新安装了 %lu 个软件包，"
 
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
 #, c-format
 msgid "%lu downgraded, "
 msgstr "降级了 %lu 个软件包，"
 
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
 
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
@@ -1441,7 +1441,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
 #. e.g. "Do you want to continue? [Y/n] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
 msgid "[Y/n]"
 msgstr ""
 
@@ -1449,21 +1449,21 @@ msgstr ""
 #. e.g. "Should this file be removed? [y/N] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"
@@ -1633,7 +1633,7 @@ msgstr "没有找到镜像文件 %s"
 msgid "[Mirror: %s]"
 msgstr "[镜像：%s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "无法为子进程创建 IPC 管道"
 
@@ -1983,47 +1983,47 @@ msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
 msgid "Malformed override %s line %llu #3"
 msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
 
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "未知的压缩算法“%s”"
 
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
 
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
 msgid "Failed to create FILE*"
 msgstr "无法创建 FILE*"
 
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
 msgid "Failed to fork"
 msgstr "无法 fork"
 
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
 msgid "Compress child"
 msgstr "压缩子进程"
 
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "内部错误，无法创建 %s"
 
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
 msgid "IO to subprocess/file failed"
 msgstr "无法对子进程或文件进行读写"
 
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
 msgid "Failed to read while computing MD5"
 msgstr "在计算 MD5 校验和时无法读取数据"
 
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "在使用 unlink 删除 %s 时出错"
 
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
@@ -2158,12 +2158,12 @@ msgstr "添加了两个转移项 %s-> %s"
 msgid "Duplicate conf file %s/%s"
 msgstr "重复的配置文件 %s/%s"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
 #, c-format
 msgid "Failed to write file %s"
 msgstr "无法写入文件 %s"
 
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "无法关闭文件 %s"
@@ -2540,22 +2540,22 @@ msgstr "读取文件出错，还剩 %lu 字节没有读出"
 msgid "write, still have %llu to write but couldn't"
 msgstr "写入文件出错，还剩 %lu 字节没有保存"
 
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "关闭文件 %s 出错"
 
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "重命名文件 %s 为 %s 出错"
 
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "用 unlink 删除文件 %s 出错"
 
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
 msgid "Problem syncing the file"
 msgstr "同步文件出错"
 
@@ -2813,7 +2813,7 @@ msgstr ""
 "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
 "系。"
 
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "软件包列表的目录 %spartial 缺失。"
@@ -2982,35 +2982,35 @@ msgstr "大小不符"
 msgid "Invalid file format"
 msgstr "无效的操作 %s"
 
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "无法解析软件包仓库 Release 文件 %s"
 
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下 ID 的密钥没有可用的公钥：\n"
 
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
 
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3019,12 +3019,12 @@ msgstr ""
 "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG 错误：%s: %s"
 
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3033,12 +3033,12 @@ msgstr ""
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3074,50 +3074,41 @@ msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
 msgid "Vendor block %s contains no fingerprint"
 msgstr "软件提供者数据块内 %s 没有包含指纹信息"
 
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"现把 %s 作为了 CD-ROM 的挂载点\n"
-"正在挂载 CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "正在鉴别.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "已归档文件的标签：%s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "正在卸载 CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
 
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
 msgid "Unmounting CD-ROM\n"
 msgstr "正在卸载 CD-ROM 文件系统\n"
 
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
 msgid "Waiting for disc...\n"
 msgstr "等待插入盘片……\n"
 
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
 msgid "Mounting CD-ROM...\n"
 msgstr "正在挂载 CD-ROM 文件系统……\n"
 
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "正在鉴别.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "已归档文件的标签：%s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "正在卸载 CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:667
 msgid "Scanning disc for index files..\n"
 msgstr "正在盘片中查找索引文件..\n"
 
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3126,7 +3117,7 @@ msgstr ""
 "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
 "名\n"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3134,16 +3125,16 @@ msgstr ""
 "无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
 "架。"
 
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "找到标签 '%s'\n"
 
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
 msgid "That is not a valid name, try again.\n"
 msgstr "这不是一个有效的名字，请重试。\n"
 
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3152,15 +3143,15 @@ msgstr ""
 "这张盘片现在的名字是：\n"
 "“%s”\n"
 
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
 msgid "Copying package lists..."
 msgstr "正在复制软件包列表……"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
 msgid "Writing new source list\n"
 msgstr "正在写入新的源列表\n"
 
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
 msgid "Source list entries for this disc are:\n"
 msgstr "对应于该盘片的软件源设置项是：\n"
 
@@ -3444,6 +3435,13 @@ msgid "Not locked"
 msgstr "未锁定"
 
 #~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "现把 %s 作为了 CD-ROM 的挂载点\n"
+#~ "正在挂载 CD-ROM\n"
+
+#~ msgid ""
 #~ "Could not patch %s with mmap and with file operation usage - the patch "
 #~ "seems to be corrupt."
 #~ msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"