Merge 0.7.13.5 pre.

1 files changed, 79 insertions, 292 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index fd2099cb..f7bb9fec 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2006-10-16 04:00+0000\n"
-"Last-Translator: catinsnow <catinsnow@gmail.com>\n"
+"POT-Creation-Date: 2009-09-04 09:06+0000\n"
+"PO-Revision-Date: 2009-09-06 03:14+0000\n"
+"Last-Translator: Feng Chao <rainofchaos@gmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,125 +23,79 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
-#, fuzzy
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr "Ubuntu 4.10 'Warty Warthog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-#, fuzzy
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "Ubuntu 4.10 'Warty Warthog'光盘"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Ubuntu 4.10 'Warty Warthog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-#, fuzzy
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Ubuntu 4.10 'Warty Warthog'光盘"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-#, fuzzy
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-#, fuzzy
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Ubuntu 5.04 'Hoary Hedgehog'光盘"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:8
 msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr "Ubuntu 8.04‘Hardy Heron’"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "Ubuntu 5.04 'Hoary Hedgehog'光盘"
+msgstr "已插入 Ubuntu 8.04 'Hardy Heron' 光盘的光驱"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:60
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 5.04 安全更新"
+msgstr "Ubuntu 7.10‘Gutsy Gibbon’"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:77
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 5.10 'Breezy Badger' 光盘"
+msgstr "Ubuntu 7.10‘Gutsy Gibbon’光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:112
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 5.04 安全更新"
+msgstr "Ubuntu 7.04‘(Feisty Fawn)’"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:129
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 5.10 'Breezy Badger' 光盘"
+msgstr "已插入 Ubuntu 7.04 'Feisty Fawn' 光盘的光驱"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:163
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:168
 msgid "Community-maintained"
-msgstr "社区维护(Universe)"
+msgstr "社区维护"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:174
 msgid "Restricted software"
 msgstr "受限软件"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:180
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:214
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:217
 msgid "Canonical-supported Open Source software"
-msgstr "社区维护(Universe)"
+msgstr "Canonical 支持的开源软件"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:219
 msgid "Community-maintained (universe)"
-msgstr "社区维护(universe)"
+msgstr "社区维护 (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:220
 msgid "Community-maintained Open Source software"
-msgstr "社区维护开源软件"
+msgstr "社区维护的开源软件"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:222
 msgid "Non-free drivers"
-msgstr "非自由驱动"
+msgstr "非开源或私有驱动"
 
 #. CompDescriptionLong
 #: ../data/templates/Ubuntu.info.in:418
@@ -149,141 +103,137 @@ msgid "Proprietary drivers for devices"
 msgstr "设备的专有驱动"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:225
 msgid "Restricted software (Multiverse)"
 msgstr "受限软件(Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:226
 msgid "Software restricted by copyright or legal issues"
-msgstr ""
+msgstr "有版权和合法性问题的的软件"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:231
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:243
 msgid "Important security updates"
 msgstr "重要安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:248
 msgid "Recommended updates"
-msgstr "建议更新"
+msgstr "推荐更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:253
 msgid "Pre-released updates"
-msgstr "建议更新"
+msgstr "提前释放出的更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:258
 msgid "Unsupported updates"
-msgstr "Backported 更新"
+msgstr "不支持的更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:265
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:278
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:290
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:295
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:300
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 移植"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:307
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:320
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'光盘"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
 msgid "Officially supported"
 msgstr "官方支持"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:332
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:337
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:342
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:348
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:354
 msgid "Community-maintained (Universe)"
-msgstr "社区维护"
+msgstr "社区维护 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:356
 msgid "Non-free (Multiverse)"
 msgstr "非自由"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:361
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'光盘"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:364
 msgid "No longer officially supported"
 msgstr "官方不再支持"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:366
 msgid "Restricted copyright"
-msgstr "版权限制"
+msgstr "版权受限"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:373
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:378
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:383
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 Backports"
 
@@ -295,68 +245,53 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-#, fuzzy
-msgid "Debian 6.0 'Squeeze' "
-msgstr "Debian 3.1 \"Sarge\""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 4.0 'Etch' "
+msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:83
+#: ../data/templates/Debian.info.in:31
 #, fuzzy
 msgid "Debian 3.1 'Sarge'"
 msgstr "Debian 3.1 \"Sarge\""
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:42
 msgid "Proposed updates"
 msgstr "建议更新"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
+#: ../data/templates/Debian.info.in:47
 msgid "Security updates"
-msgstr "重要安全更新"
+msgstr "安全更新"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:54
 msgid "Debian current stable release"
-msgstr ""
+msgstr "当前稳定的 Debian 发布"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:67
 msgid "Debian testing"
-msgstr "Debian \"Etch\" (测试)"
+msgstr "Debian testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:92
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (非稳定)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:96
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "带有非自由依赖关系的DFSG兼容软件"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:98
 msgid "Non-DFSG-compatible Software"
 msgstr "非DFSG兼容软件"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
 #, python-format
 msgid "Server for %s"
 msgstr "%s 的服务器"
@@ -364,160 +299,12 @@ msgstr "%s 的服务器"
 #. More than one server is used. Since we don't handle this case
 #. in the user interface we set "custom servers" to true and
 #. append a list of all used servers
-#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
+#: ../aptsources/distro.py:213 ../aptsources/distro.py:218
+#: ../aptsources/distro.py:232
 msgid "Main server"
 msgstr "主服务器"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:235
 msgid "Custom servers"
 msgstr "自定义服务器"
 
-#: ../apt/progress/gtk2.py:259
-#, fuzzy, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "正在下载文件 %li/%li 速度是 %s/s"
-
-#: ../apt/progress/gtk2.py:265
-#, fuzzy, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr "正在下载文件 %li/%li 速度是 %s/s"
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-msgid "Details"
-msgstr "详细信息"
-
-#: ../apt/progress/gtk2.py:367
-#, fuzzy
-msgid "Starting..."
-msgstr "设置"
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr "变动列表尚不可用。"
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-#, fuzzy
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr "无法下载更新列表。请检查您的网络连接。"
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
-msgid "Cannot install '%s'"
-msgstr "无法安装'%s'"
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-#, fuzzy
-msgid "An essential package would be removed"
-msgstr "一个必要的软件包会被删除"
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""