Updated translations.

1 files changed, 137 insertions, 149 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8fa67547..336e23ff 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 08:50-0300\n"
+"POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2008-03-29 21:34+0800\n"
 "Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -106,7 +106,7 @@ msgstr "启用"
 msgid "Error updating media"
 msgstr "更新介质出错"
 
-#: ../mdkapplet:224 ../mdkapplet:938
+#: ../mdkapplet:224 ../mdkapplet:946
 #, c-format
 msgid "Install updates"
 msgstr "安装更新"
@@ -131,7 +131,7 @@ msgstr "配置网络"
 msgid "Upgrade the system"
 msgstr "升级系统"
 
-#: ../mdkapplet:393
+#: ../mdkapplet:394
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -140,307 +140,336 @@ msgid ""
 msgstr ""
 "此发行版的基本维护已经过期。感谢您购买延保服务，您的系统将持续更新至 %s"
 
-#: ../mdkapplet:438
+#: ../mdkapplet:439
+#, c-format
+msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
+msgstr ""
+
+#: ../mdkapplet:446
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "调用 Mandriva 网络中心\n"
 
-#: ../mdkapplet:451 ../mdkapplet:624
+#: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "新版本的 Mandriva Linux 发行版"
 
-#: ../mdkapplet:456
+#: ../mdkapplet:464
 #, c-format
 msgid "Browse"
 msgstr "浏览"
 
-#: ../mdkapplet:465
+#: ../mdkapplet:473
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Mandriva Linux 发行版已经发布了新版本。"
 
-#: ../mdkapplet:467 ../mdkapplet:564
+#: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
 msgid "More info about this new version"
 msgstr "关于此版本的更多信息"
 
-#: ../mdkapplet:469 ../mdkapplet:558
+#: ../mdkapplet:477 ../mdkapplet:566
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "您是否想要升级到“%s”发行版?"
 
-#: ../mdkapplet:471 ../mdkapplet:568 ../mdkapplet:1025 ../mdkapplet:1055
+#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
 #, c-format
 msgid "Do not ask me next time"
 msgstr "下次不要再询问"
 
-#: ../mdkapplet:474
+#: ../mdkapplet:482
 #, c-format
 msgid "Download all packages at once"
 msgstr "立即下载全部软件包"
 
-#: ../mdkapplet:475
+#: ../mdkapplet:483
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(警告：您需要大量剩余空间)"
 
-#: ../mdkapplet:481
+#: ../mdkapplet:489
 #, c-format
 msgid "Where to download packages:"
 msgstr "从何处下载软件包:"
 
-#: ../mdkapplet:485 ../mdkapplet:573 ../mdkapplet:650 ../mdkapplet:1026
-#: ../mdkapplet:1056 ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
+#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
 #, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: ../mdkapplet:485 ../mdkapplet:573 ../mdkapplet:650 ../mdkapplet:1026
-#: ../mdkapplet:1056 ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
+#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../mdkapplet:500
+#: ../mdkapplet:508
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr "此版本的 Mandriva Linux 维护已经结束。此系统不会发放任何更新。"
 
-#: ../mdkapplet:506
+#: ../mdkapplet:514
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "为了保持您的系统安全，您可以:"
 
-#: ../mdkapplet:512
+#: ../mdkapplet:520
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
-#: ../mdkapplet:518
+#: ../mdkapplet:526
 #, c-format
 msgid "You should get extended maintenance."
 msgstr "您应该购买延保服务。"
 
-#: ../mdkapplet:520
+#: ../mdkapplet:528
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr "您应该购买延保服务，或者升级到 %s 发行版的新版本。"
 
-#: ../mdkapplet:524
+#: ../mdkapplet:532
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "您与该升级到 %s 发行版的新版本。"
 
-#: ../mdkapplet:534
+#: ../mdkapplet:542
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "您的版本已经不再支持"
 
-#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet:547
 #, c-format
 msgid "Extended Maintenance"
 msgstr "延保服务"
 
-#: ../mdkapplet:544
+#: ../mdkapplet:552
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr "购买此版本(%s)的延保服务可持续更新至 %s。"
 
-#: ../mdkapplet:641
+#: ../mdkapplet:649
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr "本升级需要宽带连接，可能需要几小时才能完成。"
 
-#: ../mdkapplet:643
+#: ../mdkapplet:651
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "估计将下载数据为 %s"
 
-#: ../mdkapplet:644
+#: ../mdkapplet:652
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "在继续之前，您应该关闭正在运行的其它应用程序。"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:655
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr "如果可能的话，您应该将您的笔记本转为用电源供电，并且使用高速有线连接。"
 
-#: ../mdkapplet:679
+#: ../mdkapplet:687
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "调用 MandrivaUpdate\n"
 
-#: ../mdkapplet:711
+#: ../mdkapplet:719
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "正在检查更新...\n"
 
-#: ../mdkapplet:818
+#: ../mdkapplet:826
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "系统已为最新\n"
 
-#: ../mdkapplet:858
+#: ../mdkapplet:866
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "检查网络：似乎已禁用\n"
 
-#: ../mdkapplet:885
+#: ../mdkapplet:893
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:886
+#: ../mdkapplet:894
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权 (C) %s Mandriva"
 
-#: ../mdkapplet:889
+#: ../mdkapplet:897
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online 可让您访问 Mandriva 的 Web 服务。"
 
-#: ../mdkapplet:891
+#: ../mdkapplet:899
 #, c-format
 msgid "Online WebSite"
 msgstr "在线网站"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:896
+#: ../mdkapplet:904
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "汤诗语 <shiyu@mandriva.org>\n"
 
-#: ../mdkapplet:924
+#: ../mdkapplet:932
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../mdkapplet:927 ../mdkapplet:932 ../mdkapplet:940 ../mdkapplet:942
-#: ../mdkapplet-extended-maintenance-helper:196 ../mdkapplet_gui.pm:264
+#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
+#: ../mdkapplet_gui.pm:264
 #, c-format
 msgid "More Information"
 msgstr "更多信息"
 
-#: ../mdkapplet:944
+#: ../mdkapplet:952
 #, c-format
 msgid "Add media"
 msgstr "添加介质"
 
-#: ../mdkapplet:959
+#: ../mdkapplet:967
 #, c-format
 msgid "About..."
 msgstr "关于..."
 
-#: ../mdkapplet:961 ../mdkapplet-config:68
+#: ../mdkapplet:969 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "更新配置"
 
-#: ../mdkapplet:963
+#: ../mdkapplet:971
 #, c-format
 msgid "Always launch on startup"
 msgstr "在启动时自动调用"
 
-#: ../mdkapplet:965
+#: ../mdkapplet:973
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
+#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
 #, c-format
 msgid "New medium available"
 msgstr "有新介质"
 
-#: ../mdkapplet:1022 ../mdkapplet:1052
+#: ../mdkapplet:1030 ../mdkapplet:1060
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr "您正在使用“%s”发行版，所以有权访问额外的软件。"
 
-#: ../mdkapplet:1024 ../mdkapplet:1054
+#: ../mdkapplet:1032 ../mdkapplet:1062
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "您是否想要安装这一额外的软件仓库?"
 
-#: ../mdkapplet:1053 ../mdkonline.pm:181
+#: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr "Mandriva 企业服务器"
 
-#: ../mdkapplet-add-media-helper:69 ../mdkapplet-config:43
-#: ../mdkapplet-extended-maintenance-helper:77
-#: ../mdkapplet-extended-maintenance-helper:186
+#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "添加额外的软件包介质"
 
-#: ../mdkapplet-add-media-helper:112
+#: ../mdkapplet-add-media-helper:128
 #, c-format
 msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr "支持的产品是 %s，而“%s”不在列表中。\n"
 
-#: ../mdkapplet-add-media-helper:121
+#: ../mdkapplet-add-media-helper:138
 #, c-format
 msgid "Please fill in your account ID to add an additional package medium"
 msgstr "请填入您的账户 ID，以便添加额外的软件包介质"
 
-#: ../mdkapplet-add-media-helper:135 ../mdkapplet-add-media-helper:163
-#: ../mdkapplet-extended-maintenance-helper:86
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-extended-maintenance-helper:204 ../mdkapplet_gui.pm:244
+#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
+#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
 #, c-format
 msgid "Error"
 msgstr "错误"
 
-#: ../mdkapplet-add-media-helper:136
-#: ../mdkapplet-extended-maintenance-helper:160
+#: ../mdkapplet-add-media-helper:149
+#, c-format
+msgid "Failure while retrieving distributions list:"
+msgstr "获取发行版列失败:"
+
+#. -PO: Here '%s' will be a localized date (eg:
+#: ../mdkapplet-add-media-helper:161
+#, c-format
+msgid ""
+"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"base updates (up to the %s) for distributions."
+msgstr ""
+"Mandriva 为桌面提供了十二个月的更新(直至 %s)，为基本系统提供了十八个月的更新"
+"(直至 %s)。"
+
+#: ../mdkapplet-add-media-helper:167
+#, c-format
+msgid ""
+"Extended maintenance is now available to get 18 months of additional updates "
+"(until %s)."
+msgstr "而延保服务可另外再获取十八个月的更新(直至 %s)。"
+
+#: ../mdkapplet-add-media-helper:170
+#, c-format
+msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+msgstr "您可以<b>立即</b>订阅延保服务："
+
+#: ../mdkapplet-add-media-helper:174
+#, c-format
+msgid "Lifetime policy"
+msgstr "生命周期策略"
+
+#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
+#, c-format
+msgid "Online subscription"
+msgstr "在线订阅"
+
+#: ../mdkapplet-add-media-helper:194
 #, c-format
 msgid "An error occurred"
 msgstr "发生了错误"
 
-#: ../mdkapplet-add-media-helper:142
+#: ../mdkapplet-add-media-helper:200
 #, c-format
 msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr "您的 Mandriva 账户没有启用 %s 下载订阅服务。"
 
-#: ../mdkapplet-add-media-helper:164
-#: ../mdkapplet-extended-maintenance-helper:204
+#: ../mdkapplet-add-media-helper:226
 #, c-format
 msgid "An error occurred while adding medium"
 msgstr "添加介质时发生了错误"
 
-#: ../mdkapplet-add-media-helper:171
+#: ../mdkapplet-add-media-helper:234
 #, c-format
 msgid "Successfully added media!"
 msgstr "成功添加了介质!"
 
-#: ../mdkapplet-add-media-helper:173
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
+#: ../mdkapplet-add-media-helper:236
 #, c-format
 msgid "Successfully added media %s."
 msgstr "成功添加了介质 %s。"
 
-#: ../mdkapplet-add-media-helper:175
-#: ../mdkapplet-extended-maintenance-helper:179
+#: ../mdkapplet-add-media-helper:238
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -480,102 +509,51 @@ msgstr "限制"
 msgid "Enterprise"
 msgstr "企业"
 
-#: ../mdkapplet-extended-maintenance-helper:86
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "获取发行版列失败:"
-
-#. -PO: Here '%s' will be a localized date (eg: "2009/11/28" in english but "28/11/2009" for brazil or "28 Nov. "2009" for french:
-#: ../mdkapplet-extended-maintenance-helper:104
+#: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
+"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"stability and efficiency of open source solutions together with exclusive "
+"softwares and Mandriva official support."
 msgstr ""
-"Mandriva 为桌面提供了十二个月的更新(直至 %s)，为基本系统提供了十八个月的更新"
-"(直至 %s)。"
-
-#: ../mdkapplet-extended-maintenance-helper:107
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr "而延保服务可另外再获取十八个月的更新(直至 %s)。"
-
-#: ../mdkapplet-extended-maintenance-helper:109
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr "您可以<b>立即</b>订阅延保服务："
-
-#: ../mdkapplet-extended-maintenance-helper:112
-#, c-format
-msgid "Lifetime policy"
-msgstr "生命周期策略"
+"Mandriva Powerpack 为您提供了绝佳的 Linux 桌面体验：既有开放源代码解决方案的"
+"稳定和高效，又有丰富软件和 Mandriva 的官方支持。"
 
-#: ../mdkapplet-extended-maintenance-helper:113 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "在线订阅"
-
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet_gui.pm:94
 #, c-format
-msgid ""
-"Please fill in your account ID to add an additional package medium once you "
-"have subscribed online"
-msgstr "在您在线订阅之后，请填入您的账户 ID，以便添加额外的软件包介质"
+msgid "Mandriva Linux Features"
+msgstr "Mandriva Linux 特性"
 
-#: ../mdkapplet-extended-maintenance-helper:119 ../mdkapplet_gui.pm:213
+#: ../mdkapplet_gui.pm:213
 #, c-format
 msgid "More information on your user account"
 msgstr "关于您用户账户的更多信息"
 
-#: ../mdkapplet-extended-maintenance-helper:122 ../mdkapplet_gui.pm:220
+#: ../mdkapplet_gui.pm:220
 #, c-format
 msgid "Your email"
 msgstr "您的电子邮件"
 
-#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:221
+#: ../mdkapplet_gui.pm:221
 #, c-format
 msgid "Your password"
 msgstr "您的密码"
 
-#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:228
+#: ../mdkapplet_gui.pm:228
 #, c-format
 msgid "Forgotten password"
 msgstr "忘记密码"
 
-#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:245
+#: ../mdkapplet_gui.pm:245
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "密码和电子邮件不能为空。"
 
-#: ../mdkapplet-extended-maintenance-helper:192
-#, c-format
-msgid ""
-"Your Mandriva account does not have Extended Maintenance subscription "
-"enabled."
-msgstr "您的 Mandriva 账户没有启用延保服务。"
-
-#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:267
+#: ../mdkapplet_gui.pm:267
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
-msgstr ""
-"Mandriva Powerpack 为您提供了绝佳的 Linux 桌面体验："
-"既有开放源代码解决方案的稳定和高效，又有丰富软件和 Mandriva 的官方支持。"
-
-#: ../mdkapplet_gui.pm:94
-#, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux 特性"
-
 #: ../mdkapplet_gui.pm:302
 #, c-format
 msgid "Choose your upgrade version"
@@ -591,44 +569,44 @@ msgstr "您的 Powerpack 访问已经终止"
 msgid "%s is now available, you can upgrade to:"
 msgstr "%s 现已发布，您可以升级到："
 
-#: ../mdkonline.pm:176
+#: ../mdkonline.pm:177
 #, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Flash"
 
-#: ../mdkonline.pm:177 ../mdkonline.pm:197
+#: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Free"
 
-#: ../mdkonline.pm:178
+#: ../mdkonline.pm:179
 #, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Mini"
 
-#: ../mdkonline.pm:179
+#: ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva One"
 msgstr "Mandriva One"
 
-#: ../mdkonline.pm:180 ../mdkonline.pm:193
+#: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva PowerPack"
 
-#: ../mdkonline.pm:194
+#: ../mdkonline.pm:195
 #, c-format
 msgid ""
 "The Mandriva Linux distribution with even more softwares and official "
 "support."
 msgstr "Mandriva Linux 发行版为您提供了更多软件和官方支持。"
 
-#: ../mdkonline.pm:198
+#: ../mdkonline.pm:199
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "百分之百的开放源代码发行版。"
 
-#: ../mdkonline.pm:212
+#: ../mdkonline.pm:213
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "发行版升级"
@@ -678,3 +656,13 @@ msgstr "  --debug\t\t\t- 记录所执行的操作\n"
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "无法从 update_source 介质更新软件包。\n"
+
+#~ msgid ""
+#~ "Please fill in your account ID to add an additional package medium once "
+#~ "you have subscribed online"
+#~ msgstr "在您在线订阅之后，请填入您的账户 ID，以便添加额外的软件包介质"
+
+#~ msgid ""
+#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "enabled."
+#~ msgstr "您的 Mandriva 账户没有启用延保服务。"