Merge bubulle@debian.org--2005/apt--main--0

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-58
   Correct file permissions

 * bubulle@debian.org--2005/apt--main--0--patch-59
   Bring consistency to the use of capitals in programs messages

 * bubulle@debian.org--2005/apt--main--0--patch-60
   Correct the permission change on configure.in

 * bubulle@debian.org--2005/apt--main--0--patch-61
   Complete unfuzzification of PO files after the capitalization fixes

 * bubulle@debian.org--2005/apt--main--0--patch-62
   Final work of capitalization cleaning and translation unfuzzyfication

 * bubulle@debian.org--2005/apt--main--0--patch-63
   Correct the "arbitary" typo in apt-ftparchive

 * bubulle@debian.org--2005/apt--main--0--patch-64
   Italian translation update

 * bubulle@debian.org--2005/apt--main--0--patch-65
   Italian translation update

1 files changed, 73 insertions, 81 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 55db22336..163917e05 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.23\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-05 12:06+0100\n"
+"POT-Creation-Date: 2005-03-05 22:10+0100\n"
 "PO-Revision-Date: 2005-02-09 17:34+0800\n"
 "Last-Translator: Tchaikov <chaisave@263.net>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -28,23 +28,23 @@ msgid "Unable to locate package %s"
 msgstr "未发现软件包 %s"
 
 #: cmdline/apt-cache.cc:232
-msgid "Total Package Names : "
+msgid "Total package names : "
 msgstr "软件包总数(按名称计)："
 
 #: cmdline/apt-cache.cc:272
-msgid "  Normal Packages: "
+msgid "  Normal packages: "
 msgstr "  普通软件包："
 
 #: cmdline/apt-cache.cc:273
-msgid "  Pure Virtual Packages: "
+msgid "  Pure virtual packages: "
 msgstr "  完全虚拟软件包："
 
 #: cmdline/apt-cache.cc:274
-msgid "  Single Virtual Packages: "
+msgid "  Single virtual packages: "
 msgstr "  单虚拟软件包："
 
 #: cmdline/apt-cache.cc:275
-msgid "  Mixed Virtual Packages: "
+msgid "  Mixed virtual packages: "
 msgstr "  混合虚拟软件包："
 
 #: cmdline/apt-cache.cc:276
@@ -52,35 +52,35 @@ msgid "  Missing: "
 msgstr "  缺漏的："
 
 #: cmdline/apt-cache.cc:278
-msgid "Total Distinct Versions: "
+msgid "Total distinct versions: "
 msgstr "按版本共计："
 
 #: cmdline/apt-cache.cc:280
-msgid "Total Dependencies: "
+msgid "Total dependencies: "
 msgstr "按依赖关系共计："
 
 #: cmdline/apt-cache.cc:283
-msgid "Total Ver/File relations: "
+msgid "Total ver/file relations: "
 msgstr "按版本/文件关系共计："
 
 #: cmdline/apt-cache.cc:285
-msgid "Total Provides Mappings: "
+msgid "Total Provides mappings: "
 msgstr "提供映射共计："
 
 #: cmdline/apt-cache.cc:297
-msgid "Total Globbed Strings: "
+msgid "Total globbed strings: "
 msgstr "Glob 字串共计："
 
 #: cmdline/apt-cache.cc:311
-msgid "Total Dependency Version space: "
+msgid "Total dependency version space: "
 msgstr "依赖关系版本名所占空间共计："
 
 #: cmdline/apt-cache.cc:316
-msgid "Total Slack space: "
+msgid "Total slack space: "
 msgstr "Slack 空间共计："
 
 #: cmdline/apt-cache.cc:324
-msgid "Total Space Accounted for: "
+msgid "Total space accounted for: "
 msgstr "总占用空间："
 
 #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
@@ -97,7 +97,7 @@ msgid "No packages found"
 msgstr "没有发现吻合的软件包"
 
 #: cmdline/apt-cache.cc:1462
-msgid "Package Files:"
+msgid "Package files:"
 msgstr "软件包文件："
 
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
@@ -111,7 +111,7 @@ msgstr "%4i %s\n"
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1482
-msgid "Pinned Packages:"
+msgid "Pinned packages:"
 msgstr "被锁定(pinned)的软件包："
 
 #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
@@ -133,12 +133,12 @@ msgid "  Candidate: "
 msgstr "  候选的软件包："
 
 #: cmdline/apt-cache.cc:1532
-msgid "  Package Pin: "
+msgid "  Package pin: "
 msgstr "  软件包锁(Pin)："
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1541
-msgid "  Version Table:"
+msgid "  Version table:"
 msgstr "  版本列表："
 
 #: cmdline/apt-cache.cc:1556
@@ -305,7 +305,7 @@ msgstr "软件包的扩展列表超长"
 #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
 #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
 #, c-format
-msgid "Error Processing directory %s"
+msgid "Error processing directory %s"
 msgstr "处理目录 %s 时出错"
 
 #: ftparchive/apt-ftparchive.cc:250
@@ -318,7 +318,7 @@ msgstr "将 header 写到 contents 文件时出错"
 
 #: ftparchive/apt-ftparchive.cc:397
 #, c-format
-msgid "Error Processing Contents %s"
+msgid "Error processing contents %s"
 msgstr "处理 Contents %s 时出错"
 
 #: ftparchive/apt-ftparchive.cc:551
@@ -520,7 +520,7 @@ msgstr "  %s 的维护者 %s 并非 %s\n"
 
 #: ftparchive/contents.cc:317
 #, c-format
-msgid "Internal Error, could not locate member %s"
+msgid "Internal error, could not locate member %s"
 msgstr "内部错误，无法定位包内文件 %s"
 
 #: ftparchive/contents.cc:353 ftparchive/contents.cc:384
@@ -554,7 +554,7 @@ msgstr "无法读取 override 文件 %s"
 
 #: ftparchive/multicompress.cc:75
 #, c-format
-msgid "Unknown Compresison Algorithm '%s'"
+msgid "Unknown compression algorithm '%s'"
 msgstr "未知的压缩算法“%s”"
 
 #: ftparchive/multicompress.cc:105
@@ -575,12 +575,12 @@ msgid "Failed to fork"
 msgstr "无法 fork"
 
 #: ftparchive/multicompress.cc:215
-msgid "Compress Child"
+msgid "Compress child"
 msgstr "压缩子进程"
 
 #: ftparchive/multicompress.cc:238
 #, c-format
-msgid "Internal Error, Failed to create %s"
+msgid "Internal error, failed to create %s"
 msgstr "内部错误，无法建立 %s"
 
 #: ftparchive/multicompress.cc:289
@@ -751,7 +751,7 @@ msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "【警告】：下列的软件包不能通过认证！"
 
 #: cmdline/apt-get.cc:698
-msgid "Install these packages without verification? [y/N] "
+msgid "Install these packages without verification [y/N]? "
 msgstr "不经验证就安装这些软件包么？[y/N] "
 
 #: cmdline/apt-get.cc:700
@@ -763,7 +763,7 @@ msgid "There are problems and -y was used without --force-yes"
 msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes。"
 
 #: cmdline/apt-get.cc:762
-msgid "Packages need to be removed but Remove is disabled."
+msgid "Packages need to be removed but remove is disabled."
 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 
 #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
@@ -824,7 +824,7 @@ msgid "Abort."
 msgstr "中止执行。"
 
 #: cmdline/apt-get.cc:886
-msgid "Do you want to continue? [Y/n] "
+msgid "Do you want to continue [Y/n]? "
 msgstr "您希望继续执行吗？[Y/n]"
 
 #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
@@ -857,7 +857,7 @@ msgid "Unable to correct missing packages."
 msgstr "无法更正缺少的软件包。"
 
 #: cmdline/apt-get.cc:993
-msgid "Aborting Install."
+msgid "Aborting install."
 msgstr "放弃安装。"
 
 #: cmdline/apt-get.cc:1026
@@ -949,7 +949,7 @@ msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 
 #: cmdline/apt-get.cc:1372
-msgid "Internal Error, AllUpgrade broke stuff"
+msgid "Internal error, AllUpgrade broke stuff"
 msgstr "内部错误，AllUpgrade 造成某些故障"
 
 #: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
@@ -1015,7 +1015,7 @@ msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 
 #: cmdline/apt-get.cc:1664
-msgid "Calculating Upgrade... "
+msgid "Calculating upgrade... "
 msgstr "正在筹划升级... "
 
 #: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
@@ -1052,7 +1052,7 @@ msgstr "需要下载 %sB 的源代码包。\n"
 
 #: cmdline/apt-get.cc:1933
 #, c-format
-msgid "Fetch Source %s\n"
+msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 
 #: cmdline/apt-get.cc:1964
@@ -1128,7 +1128,7 @@ msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 
 #: cmdline/apt-get.cc:2318
-msgid "Supported Modules:"
+msgid "Supported modules:"
 msgstr "被支持模块："
 
 #: cmdline/apt-get.cc:2359
@@ -1238,7 +1238,7 @@ msgstr " [执行中]"
 #: cmdline/acqprogress.cc:271
 #, c-format
 msgid ""
-"Media Change: Please insert the disc labeled\n"
+"Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
@@ -1301,7 +1301,7 @@ msgid ""
 msgstr "这个提示之前的错误消息才值得您注意。请更正它们，然后再次执行 [I]nstall"
 
 #: dselect/update:30
-msgid "Merging Available information"
+msgid "Merging available information"
 msgstr "正在合并现有信息"
 
 #: apt-inst/contrib/extracttar.cc:117
@@ -1317,7 +1317,7 @@ msgid "Corrupted archive"
 msgstr "包文件已被损坏"
 
 #: apt-inst/contrib/extracttar.cc:195
-msgid "Tar Checksum failed, archive corrupted"
+msgid "Tar checksum failed, archive corrupted"
 msgstr "tar 的校验码不符，包文件已被损坏"
 
 #: apt-inst/contrib/extracttar.cc:298
@@ -1358,7 +1358,7 @@ msgid "Failed to allocate diversion"
 msgstr "无法分配转移项(diversion)"
 
 #: apt-inst/filelist.cc:468
-msgid "Internal Error in AddDiversion"
+msgid "Internal error in AddDiversion"
 msgstr "内部错误，出现在 AddDiversion"
 
 #: apt-inst/filelist.cc:481
@@ -1467,7 +1467,7 @@ msgstr "info 和 temp 目录要求处于同一文件系统之下"
 #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
 #: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
 #: apt-pkg/pkgcachegen.cc:840
-msgid "Reading Package Lists"
+msgid "Reading package lists"
 msgstr "正在读取软件包列表"
 
 #: apt-inst/deb/dpkgdb.cc:180
@@ -1477,11 +1477,11 @@ msgstr "无法切换工作目录到 admin 目录 %sinfo"
 
 #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
 #: apt-inst/deb/dpkgdb.cc:448
-msgid "Internal Error getting a Package Name"
+msgid "Internal error getting a package name"
 msgstr "在获取软件包名字时出现内部错误"
 
 #: apt-inst/deb/dpkgdb.cc:205
-msgid "Reading File Listing"
+msgid "Reading file listing"
 msgstr "正在读取文件列表"
 
 #: apt-inst/deb/dpkgdb.cc:216
@@ -1500,7 +1500,7 @@ msgid "Failed reading the list file %sinfo/%s"
 msgstr "无法读取列表文件 %sinfo/%s"
 
 #: apt-inst/deb/dpkgdb.cc:266
-msgid "Internal Error getting a Node"
+msgid "Internal error getting a node"
 msgstr "获得一个节点时出现内部错误"
 
 #: apt-inst/deb/dpkgdb.cc:309
@@ -1519,7 +1519,7 @@ msgid "Invalid line in the diversion file: %s"
 msgstr "转移配置文件中有一行是无效的：%s"
 
 #: apt-inst/deb/dpkgdb.cc:362
-msgid "Internal Error adding a diversion"
+msgid "Internal error adding a diversion"
 msgstr "添加 diversion 时出现内部错误"
 
 #: apt-inst/deb/dpkgdb.cc:383
@@ -1527,12 +1527,12 @@ msgid "The pkg cache must be initialize first"
 msgstr "必须首先初始化软件包缓存"
 
 #: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading File List"
+msgid "Reading file list"
 msgstr "正在读取文件列表"
 
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
-msgid "Failed to find a Package: Header, offset %lu"
+msgid "Failed to find a Package: header, offset %lu"
 msgstr "无法找到某个软件包：包头，于偏移位置 %lu"
 
 #: apt-inst/deb/dpkgdb.cc:465
@@ -1561,7 +1561,7 @@ msgid "Couldn't change to %s"
 msgstr "无法切换工作目录到 %s"
 
 #: apt-inst/deb/debfile.cc:138
-msgid "Internal Error, could not locate member"
+msgid "Internal error, could not locate member"
 msgstr "内部错误，无法定位包内文件"
 
 #: apt-inst/deb/debfile.cc:171
@@ -1569,7 +1569,7 @@ msgid "Failed to locate a valid control file"
 msgstr "无法在打包文件中找到有效的主控文件"
 
 #: apt-inst/deb/debfile.cc:256
-msgid "Unparsible control file"
+msgid "Unparsable control file"
 msgstr "不能解析的主控文件"
 
 #: methods/cdrom.cc:113
@@ -1579,14 +1579,14 @@ msgstr "无法读取光盘数据库 %s"
 
 #: methods/cdrom.cc:122
 msgid ""
-"Please use apt-cdrom to make this CD recognized by APT. apt-get update "
-"cannot be used to add new CDs"
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
 msgstr ""
 "请使用 apt-cdrom，通过它就可以让 APT 能识别该光盘。apt-get upgdate 不能被用来"
 "加入新的光盘。"
 
 #: methods/cdrom.cc:130 methods/cdrom.cc:168
-msgid "Wrong CD"
+msgid "Wrong CD-ROM"
 msgstr "错误的光盘"
 
 #: methods/cdrom.cc:163
@@ -1594,9 +1594,9 @@ msgstr "错误的光盘"
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "无法卸载现在挂载于 %s 的 CD-ROM，可能它正在使用中。"
 
-#: methods/cdrom.cc:177 methods/file.cc:77
+#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264
 msgid "File not found"
-msgstr "无法找到文件"
+msgstr "无法找到该文件"
 
 #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142
 msgid "Failed to stat"
@@ -1625,7 +1625,7 @@ msgstr "无法获知本地主机名"
 
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
-msgid "Server refused our connection and said: %s"
+msgid "The server refused the connection and said: %s"
 msgstr "服务器拒绝了我们的连接，它响应道：%s"
 
 #: methods/ftp.cc:210
@@ -1675,9 +1675,9 @@ msgstr "回应超出了缓存区大小。"
 msgid "Protocol corruption"
 msgstr "协议有误"
 
-#: methods/ftp.cc:446 methods/rsh.cc:232
-msgid "Write Error"
-msgstr "写错误"
+#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492
+msgid "Write error"
+msgstr "写文件出错"
 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
 msgid "Could not create a socket"
@@ -1837,19 +1837,19 @@ msgid "Bad header line"
 msgstr "错误的报头条目"
 
 #: methods/http.cc:517 methods/http.cc:524
-msgid "The http server sent an invalid reply header"
+msgid "The HTTP server sent an invalid reply header"
 msgstr "该 http 服务器发送了一个无效的应答报头"
 
 #: methods/http.cc:553
-msgid "The http server sent an invalid Content-Length header"
+msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
 
 #: methods/http.cc:568
-msgid "The http server sent an invalid Content-Range header"
+msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
 
 #: methods/http.cc:570
-msgid "This http server has broken range support"
+msgid "This HTTP server has broken range support"
 msgstr "该 http 服务器的 range 支持不正常"
 
 #: methods/http.cc:594
@@ -1877,7 +1877,7 @@ msgid "Error writing to the file"
 msgstr "写文件时出错"
 
 #: methods/http.cc:832
-msgid "Error reading from server Remote end closed connection"
+msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
 #: methods/http.cc:834
@@ -1885,7 +1885,7 @@ msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
 #: methods/http.cc:1065
-msgid "Bad header Data"
+msgid "Bad header data"
 msgstr "错误的报头数据"
 
 #: methods/http.cc:1082
@@ -1896,10 +1896,6 @@ msgstr "连接失败"
 msgid "Internal error"
 msgstr "内部错误"
 
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "无法找到该文件"
-
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "连接被永久关闭"
@@ -1940,7 +1936,7 @@ msgstr "语法错误 %s:%u：配置小节没有以名字开头"
 
 #: apt-pkg/contrib/configuration.cc:586
 #, c-format
-msgid "Syntax error %s:%u: Malformed Tag"
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr "语法错误 %s:%u：标签格式有误"
 
 #: apt-pkg/contrib/configuration.cc:603
@@ -2065,7 +2061,7 @@ msgstr "无法获得锁 %s"
 
 #: apt-pkg/contrib/fileutl.cc:359
 #, c-format
-msgid "Waited, for %s but it wasn't there"
+msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
 
 #: apt-pkg/contrib/fileutl.cc:369
@@ -2093,10 +2089,6 @@ msgstr "无法打开文件 %s"
 msgid "read, still have %lu to read but none left"
 msgstr "读文件时出错，还剩 %lu 字节没有读出"
 
-#: apt-pkg/contrib/fileutl.cc:492
-msgid "Write error"
-msgstr "写文件出错"
-
 #: apt-pkg/contrib/fileutl.cc:504
 #, c-format
 msgid "write, still have %lu to write but couldn't"
@@ -2128,7 +2120,7 @@ msgstr "软件包缓存区文件的版本不兼容"
 
 #: apt-pkg/pkgcache.cc:142
 #, c-format
-msgid "This APT does not support the Versioning System '%s'"
+msgid "This APT does not support the versioning system '%s'"
 msgstr "本程序目前不支持“%s”这个版本控制系统"
 
 #: apt-pkg/pkgcache.cc:147
@@ -2184,15 +2176,15 @@ msgid "extra"
 msgstr "额外"
 
 #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
-msgid "Building Dependency Tree"
+msgid "Building dependency tree"
 msgstr "正在分析软件包的依赖关系树"
 
 #: apt-pkg/depcache.cc:61
-msgid "Candidate Versions"
+msgid "Candidate versions"
 msgstr "候选版本"
 
 #: apt-pkg/depcache.cc:90
-msgid "Dependency Generation"
+msgid "Dependency generation"
 msgstr "生成依赖关系"
 
 #: apt-pkg/tagfile.cc:73
@@ -2222,7 +2214,7 @@ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)"
 
 #: apt-pkg/sourcelist.cc:98
 #, c-format
-msgid "Malformed line %lu in source list %s (Absolute dist)"
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)"
 
 #: apt-pkg/sourcelist.cc:105
@@ -2485,7 +2477,7 @@ msgstr "正在鉴别.. "
 
 #: apt-pkg/cdrom.cc:538
 #, c-format
-msgid "Stored Label: %s \n"
+msgid "Stored label: %s \n"
 msgstr "存档标签：%s \n"
 
 #: apt-pkg/cdrom.cc:558
@@ -2507,7 +2499,7 @@ msgid "Mounting CD-ROM...\n"
 msgstr "正在挂载 CD-ROM 文件系统……\n"
 
 #: apt-pkg/cdrom.cc:606
-msgid "Scanning Disc for index files..\n"
+msgid "Scanning disc for index files..\n"
 msgstr "正在光盘中查找索引文件..\n"
 
 #: apt-pkg/cdrom.cc:644
@@ -2522,7 +2514,7 @@ msgstr "这不是一个有效的名字，请再次命名。\n"
 #: apt-pkg/cdrom.cc:717
 #, c-format
 msgid ""
-"This Disc is called: \n"
+"This disc is called: \n"
 "'%s'\n"
 msgstr ""
 "这张光盘现在的名字是：\n"
@@ -2537,7 +2529,7 @@ msgid "Writing new source list\n"
 msgstr "正在写入新的软件包源列表\n"
 
 #: apt-pkg/cdrom.cc:754
-msgid "Source List entries for this Disc are:\n"
+msgid "Source list entries for this disc are:\n"
 msgstr "对应于该光盘的软件包源设置项是：\n"
 
 #: apt-pkg/cdrom.cc:788
@@ -2556,12 +2548,12 @@ msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
 
 #: apt-pkg/indexcopy.cc:266
 #, c-format
-msgid "Wrote %i records with %i mismachted files\n"
+msgid "Wrote %i records with %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件不吻合\n"
 
 #: apt-pkg/indexcopy.cc:269
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n"
 
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"