From a0895a74fe95997a5d75e5b54c95afb9594554f6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Dec 2009 21:59:49 +0100 Subject: merged -r 1923..1926 from lp:~donkult/apt/sid --- po/zh_CN.po | 162 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 91 insertions(+), 71 deletions(-) (limited to 'po/zh_CN.po') diff --git a/po/zh_CN.po b/po/zh_CN.po index 753bba073..8daf9e203 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-12-10 16:49+0100\n" "PO-Revision-Date: 2009-12-02 01:00+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Debian Chinese [GB] \n" @@ -1107,7 +1107,7 @@ msgstr "推荐安装的软件包:" msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1958 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "失败" @@ -1566,7 +1566,7 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 #: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 #: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33 +#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 #: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 #, c-format msgid "Unable to read %s" @@ -1745,148 +1745,148 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "无效的 URI,本地的 URI 不能以 // 开头" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:167 +#: methods/ftp.cc:168 msgid "Logging in" msgstr "正在登录" -#: methods/ftp.cc:173 +#: methods/ftp.cc:174 msgid "Unable to determine the peer name" msgstr "无法获知对方主机名" -#: methods/ftp.cc:178 +#: methods/ftp.cc:179 msgid "Unable to determine the local name" msgstr "无法获知本地主机名" -#: methods/ftp.cc:209 methods/ftp.cc:237 +#: methods/ftp.cc:210 methods/ftp.cc:238 #, c-format msgid "The server refused the connection and said: %s" msgstr "服务器拒绝了我们的连接,响应信息为:%s" -#: methods/ftp.cc:215 +#: methods/ftp.cc:216 #, c-format msgid "USER failed, server said: %s" msgstr "USER 指令出错,服务器响应信息为:%s" -#: methods/ftp.cc:222 +#: methods/ftp.cc:223 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 指令出错,服务器响应信息为:%s" -#: methods/ftp.cc:242 +#: methods/ftp.cc:243 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" "您指定了代理服务器,但是没有登陆脚本,Acquire::ftp::ProxyLogin 设置为空。" -#: methods/ftp.cc:270 +#: methods/ftp.cc:271 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "登录脚本命令“%s”出错,服务器响应信息为:%s" -#: methods/ftp.cc:296 +#: methods/ftp.cc:297 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 指令出错,服务器响应信息为:%s" -#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226 +#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" msgstr "连接超时" -#: methods/ftp.cc:340 +#: methods/ftp.cc:341 msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 msgid "Read error" msgstr "读错误" -#: methods/ftp.cc:350 methods/rsh.cc:197 +#: methods/ftp.cc:351 methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "回应超出了缓存区大小。" -#: methods/ftp.cc:367 methods/ftp.cc:379 +#: methods/ftp.cc:368 methods/ftp.cc:380 msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 msgid "Write error" msgstr "写出错" -#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 +#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 msgid "Could not create a socket" msgstr "无法创建套接字" -#: methods/ftp.cc:703 +#: methods/ftp.cc:704 msgid "Could not connect data socket, connection timed out" msgstr "无法连接上数据套接字,连接超时" -#: methods/ftp.cc:709 +#: methods/ftp.cc:710 msgid "Could not connect passive socket." msgstr "无法连接被动模式的套接字。" -#: methods/ftp.cc:727 +#: methods/ftp.cc:728 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo 无法得到监听套接字" -#: methods/ftp.cc:741 +#: methods/ftp.cc:742 msgid "Could not bind a socket" msgstr "无法绑定套接字" -#: methods/ftp.cc:745 +#: methods/ftp.cc:746 msgid "Could not listen on the socket" msgstr "无法在套接字上监听" -#: methods/ftp.cc:752 +#: methods/ftp.cc:753 msgid "Could not determine the socket's name" msgstr "无法确定套接字的名字" -#: methods/ftp.cc:784 +#: methods/ftp.cc:785 msgid "Unable to send PORT command" msgstr "无法发出 PORT 指令" -#: methods/ftp.cc:794 +#: methods/ftp.cc:795 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "无法识别的地址族 %u (AF_*)" -#: methods/ftp.cc:803 +#: methods/ftp.cc:804 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 指令出错,服务器响应信息为:%s" -#: methods/ftp.cc:823 +#: methods/ftp.cc:824 msgid "Data socket connect timed out" msgstr "数据套接字连接超时" -#: methods/ftp.cc:830 +#: methods/ftp.cc:831 msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" -#: methods/ftp.cc:882 +#: methods/ftp.cc:883 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "无法获取文件,服务器响应信息为“%s”" -#: methods/ftp.cc:897 methods/rsh.cc:322 +#: methods/ftp.cc:898 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "数据套接字超时" -#: methods/ftp.cc:927 +#: methods/ftp.cc:928 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "数据传送出错,服务器响应信息为“%s”" #. Get the files information -#: methods/ftp.cc:1002 +#: methods/ftp.cc:1005 msgid "Query" msgstr "查询" -#: methods/ftp.cc:1114 +#: methods/ftp.cc:1117 msgid "Unable to invoke " msgstr "无法调用 " @@ -1994,80 +1994,80 @@ msgstr "无法为 %s 开启管道" msgid "Read error from %s process" msgstr "从 %s 进程读取数据出错" -#: methods/http.cc:384 +#: methods/http.cc:385 msgid "Waiting for headers" msgstr "正在等待报头" -#: methods/http.cc:530 +#: methods/http.cc:531 #, c-format msgid "Got a single header line over %u chars" msgstr "接收到一行报头行,它的长度超过了 %u 个字符" -#: methods/http.cc:538 +#: methods/http.cc:539 msgid "Bad header line" msgstr "错误的报头行" -#: methods/http.cc:557 methods/http.cc:564 +#: methods/http.cc:558 methods/http.cc:565 msgid "The HTTP server sent an invalid reply header" msgstr "该 HTTP 服务器发送了一个无效的应答报头" -#: methods/http.cc:593 +#: methods/http.cc:594 msgid "The HTTP server sent an invalid Content-Length header" msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头" -#: methods/http.cc:608 +#: methods/http.cc:609 msgid "The HTTP server sent an invalid Content-Range header" msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头" -#: methods/http.cc:610 +#: methods/http.cc:611 msgid "This HTTP server has broken range support" msgstr "该 HTTP 服务器的 range 支持不正常" -#: methods/http.cc:634 +#: methods/http.cc:635 msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:787 +#: methods/http.cc:790 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:792 +#: methods/http.cc:795 msgid "Connection timed out" msgstr "连接超时" -#: methods/http.cc:815 +#: methods/http.cc:818 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:846 +#: methods/http.cc:849 msgid "Error writing to file" msgstr "写入文件出错" -#: methods/http.cc:874 +#: methods/http.cc:877 msgid "Error writing to the file" msgstr "写入文件出错" -#: methods/http.cc:888 +#: methods/http.cc:891 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错,对方关闭了连接" -#: methods/http.cc:890 +#: methods/http.cc:893 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 msgid "Failed to truncate file" msgstr "无法截断文件" -#: methods/http.cc:1146 +#: methods/http.cc:1149 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1166 methods/http.cc:1221 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1310 +#: methods/http.cc:1313 msgid "Internal error" msgstr "内部错误" @@ -2474,7 +2474,7 @@ msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“ msgid "Malformed line %u in source list %s (vendor id)" msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:439 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2554,12 +2554,12 @@ msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。" -#: apt-pkg/init.cc:132 +#: apt-pkg/init.cc:133 #, c-format msgid "Packaging system '%s' is not supported" msgstr "不支持“%s”打包系统" -#: apt-pkg/init.cc:148 +#: apt-pkg/init.cc:149 msgid "Unable to determine a suitable packaging system type" msgstr "无法确定适合的打包系统类型" @@ -2862,76 +2862,96 @@ msgstr "已写入 %i 条记录,并有 %i 个文件不匹配\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不匹配\n" +#: apt-pkg/indexcopy.cc:530 +#, fuzzy, c-format +msgid "Skipping nonexistent file %s" +msgstr "正在打开配置文件 %s" + +#: apt-pkg/indexcopy.cc:536 +#, c-format +msgid "Can't find authentication record for: %s" +msgstr "" + +#: apt-pkg/indexcopy.cc:542 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Hash 校验和不符" + #: apt-pkg/deb/dpkgpm.cc:49 #, c-format msgid "Installing %s" msgstr "正在安装 %s" -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660 +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661 #, c-format msgid "Configuring %s" msgstr "正在配置 %s" -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667 +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668 #, c-format msgid "Removing %s" msgstr "正在删除 %s" #: apt-pkg/deb/dpkgpm.cc:52 +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "完全删除了 %s" + +#: apt-pkg/deb/dpkgpm.cc:53 #, c-format msgid "Running post-installation trigger %s" msgstr "执行安装后执行的触发器 %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:558 #, c-format msgid "Directory '%s' missing" msgstr "目录 %s 不见了" -#: apt-pkg/deb/dpkgpm.cc:653 +#: apt-pkg/deb/dpkgpm.cc:654 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:654 +#: apt-pkg/deb/dpkgpm.cc:655 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:659 +#: apt-pkg/deb/dpkgpm.cc:660 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:661 +#: apt-pkg/deb/dpkgpm.cc:662 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:666 +#: apt-pkg/deb/dpkgpm.cc:667 #, c-format msgid "Preparing for removal of %s" msgstr "正在准备 %s 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:668 +#: apt-pkg/deb/dpkgpm.cc:669 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:673 +#: apt-pkg/deb/dpkgpm.cc:674 #, c-format msgid "Preparing to completely remove %s" msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:674 +#: apt-pkg/deb/dpkgpm.cc:675 #, c-format msgid "Completely removed %s" msgstr "完全删除了 %s" -#: apt-pkg/deb/dpkgpm.cc:878 +#: apt-pkg/deb/dpkgpm.cc:879 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ?)\n" -#: apt-pkg/deb/dpkgpm.cc:907 +#: apt-pkg/deb/dpkgpm.cc:908 msgid "Running dpkg" msgstr "正在运行 dpkg" -- cgit v1.2.3