sync with code

1 files changed, 78 insertions, 69 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index fc0e405f..e5ba3f0b 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: 2009-10-16 19:59+0200\n"
+"POT-Creation-Date: 2009-11-19 18:54+0100\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"
@@ -121,7 +121,7 @@ msgstr "启用"
 msgid "Error updating media"
 msgstr "更新介质出错"
 
-#: ../mdkapplet:210 ../mdkapplet:672
+#: ../mdkapplet:210 ../mdkapplet:738
 #, c-format
 msgid "Install updates"
 msgstr "安装更新"
@@ -146,207 +146,207 @@ msgstr "配置网络"
 msgid "Upgrade the system"
 msgstr "升级系统"
 
-#: ../mdkapplet:405
+#: ../mdkapplet:422
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "调用 Mandriva 网络中心\n"
 
-#: ../mdkapplet:410 ../mdkapplet:431
+#: ../mdkapplet:433 ../mdkapplet:481
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "新版本的 Mandriva Linux 发行版"
 
-#: ../mdkapplet:420
+#: ../mdkapplet:438
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:429
+#: ../mdkapplet:447
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Mandriva Linux 发行版已经发布了新版本。"
 
-#: ../mdkapplet:416
+#: ../mdkapplet:449
 #, c-format
 msgid "More info about this new version"
 msgstr "关于此版本的更多信息"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:451
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "您是否想要升级到“%s”发行版?"
 
-#: ../mdkapplet:420 ../mdkapplet:786 ../mdkapplet:812
+#: ../mdkapplet:453 ../mdkapplet:852 ../mdkapplet:878
 #, c-format
 msgid "Do not ask me next time"
 msgstr "下次不要再询问"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:455
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:437
+#: ../mdkapplet:456
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:443
+#: ../mdkapplet:462
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:446 ../mdkapplet:487 ../mdkapplet:818 ../mdkapplet:844
+#: ../mdkapplet:466 ../mdkapplet:507 ../mdkapplet:853 ../mdkapplet:879
 #: ../mdkapplet-enterprise-update-helper:88 ../mdkapplet-restricted-helper:88
 #, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: ../mdkapplet:421 ../mdkapplet:457 ../mdkapplet:787 ../mdkapplet:813
+#: ../mdkapplet:466 ../mdkapplet:507 ../mdkapplet:853 ../mdkapplet:879
 #: ../mdkapplet-enterprise-update-helper:88 ../mdkapplet-restricted-helper:88
-#: ../mdkapplet-upgrade-helper:126 ../mdkapplet-upgrade-helper:145
+#: ../mdkapplet-upgrade-helper:131 ../mdkapplet-upgrade-helper:150
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../mdkapplet:448
+#: ../mdkapplet:498
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr "本升级需要宽带连接，可能需要几小时才能完成。"
 
-#: ../mdkapplet:450
+#: ../mdkapplet:500
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "估计将下载数据为 %s"
 
-#: ../mdkapplet:451
+#: ../mdkapplet:501
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "在继续之前，您应该关闭正在运行的其它应用程序。"
 
-#: ../mdkapplet:454
+#: ../mdkapplet:504
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr "如果可能的话，您应该将您的笔记本转为用电源供电，并且使用高速有线连接。"
 
-#: ../mdkapplet:480
+#: ../mdkapplet:531
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "调用 MandrivaUpdate\n"
 
-#: ../mdkapplet:501
+#: ../mdkapplet:552
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "正在检查更新...\n"
 
-#: ../mdkapplet:593
+#: ../mdkapplet:659
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "系统已为最新\n"
 
-#: ../mdkapplet:621
+#: ../mdkapplet:687
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "检查网络：似乎已禁用\n"
 
-#: ../mdkapplet:663
+#: ../mdkapplet:729
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../mdkapplet:666 ../mdkapplet:674 ../mdkapplet:676
-#: ../mdkapplet-enterprise-update-helper:155
+#: ../mdkapplet:732 ../mdkapplet:740 ../mdkapplet:742
+#: ../mdkapplet-enterprise-update-helper:160
 #: ../mdkapplet-restricted-helper:160
 #, c-format
 msgid "More Information"
 msgstr "更多信息"
 
-#: ../mdkapplet:678
+#: ../mdkapplet:744
 #, c-format
 msgid "Add media"
 msgstr "添加介质"
 
-#: ../mdkapplet:693
+#: ../mdkapplet:759
 #, c-format
 msgid "About..."
 msgstr "关于..."
 
-#: ../mdkapplet:697
+#: ../mdkapplet:763
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:698
+#: ../mdkapplet:764
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权 (C) %s Mandriva"
 
-#: ../mdkapplet:701
+#: ../mdkapplet:767
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online 可让您访问 Mandriva 的 Web 服务。"
 
-#: ../mdkapplet:703
+#: ../mdkapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "在线网站"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:708
+#: ../mdkapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "汤诗语 <shiyu@mandriva.org>\n"
 
-#: ../mdkapplet:717 ../mdkapplet-config:61
+#: ../mdkapplet:783 ../mdkapplet-config:61
 #, c-format
 msgid "Updates Configuration"
 msgstr "更新配置"
 
-#: ../mdkapplet:719
+#: ../mdkapplet:785
 #, c-format
 msgid "Always launch on startup"
 msgstr "在启动时自动调用"
 
-#: ../mdkapplet:721
+#: ../mdkapplet:787
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../mdkapplet:771 ../mdkapplet:781 ../mdkapplet:802 ../mdkapplet:807
+#: ../mdkapplet:837 ../mdkapplet:847 ../mdkapplet:868 ../mdkapplet:873
 #, c-format
 msgid "New medium available"
 msgstr "有新介质"
 
-#: ../mdkapplet:773
+#: ../mdkapplet:839
 #, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva PowerPack"
 
-#: ../mdkapplet:774 ../mdkapplet:810
+#: ../mdkapplet:840 ../mdkapplet:876
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr "Mandriva 企业服务器"
 
-#: ../mdkapplet:783 ../mdkapplet:809
+#: ../mdkapplet:849 ../mdkapplet:875
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr "您正在使用“%s”发行版，所以有权访问额外的软件。"
 
-#: ../mdkapplet:785 ../mdkapplet:811
+#: ../mdkapplet:851 ../mdkapplet:877
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "您是否想要安装这一额外的软件仓库?"
 
 #: ../mdkapplet-config:42 ../mdkapplet-enterprise-update-helper:61
 #: ../mdkapplet-enterprise-update-helper:73
-#: ../mdkapplet-enterprise-update-helper:145
-#: ../mdkapplet-enterprise-update-helper:150 ../mdkapplet-restricted-helper:61
+#: ../mdkapplet-enterprise-update-helper:150
+#: ../mdkapplet-enterprise-update-helper:155 ../mdkapplet-restricted-helper:61
 #: ../mdkapplet-restricted-helper:73 ../mdkapplet-restricted-helper:150
 #: ../mdkapplet-restricted-helper:155
 #, c-format
@@ -394,11 +394,11 @@ msgid "Forgotten password"
 msgstr "忘记密码"
 
 #: ../mdkapplet-enterprise-update-helper:96
-#: ../mdkapplet-enterprise-update-helper:126
-#: ../mdkapplet-enterprise-update-helper:163 ../mdkapplet-restricted-helper:96
+#: ../mdkapplet-enterprise-update-helper:131
+#: ../mdkapplet-enterprise-update-helper:168 ../mdkapplet-restricted-helper:96
 #: ../mdkapplet-restricted-helper:126 ../mdkapplet-restricted-helper:168
-#: ../mdkapplet-upgrade-helper:79 ../mdkapplet-upgrade-helper:120
-#: ../mdkapplet-upgrade-helper:172 ../mdkapplet-upgrade-helper:209
+#: ../mdkapplet-upgrade-helper:82 ../mdkapplet-upgrade-helper:125
+#: ../mdkapplet-upgrade-helper:177 ../mdkapplet-upgrade-helper:214
 #, c-format
 msgid "Error"
 msgstr "错误"
@@ -408,87 +408,96 @@ msgstr "错误"
 msgid "Password and email cannot be empty."
 msgstr "密码和电子邮件不能为空。"
 
-#: ../mdkapplet-enterprise-update-helper:126
+#: ../mdkapplet-enterprise-update-helper:131
 #: ../mdkapplet-restricted-helper:126
 #, c-format
 msgid "An error occurred"
 msgstr "发生了错误"
 
-#: ../mdkapplet-enterprise-update-helper:137
-#: ../mdkapplet-enterprise-update-helper:138
+#: ../mdkapplet-enterprise-update-helper:142
+#: ../mdkapplet-enterprise-update-helper:143
 #: ../mdkapplet-restricted-helper:142 ../mdkapplet-restricted-helper:143
 #, c-format
 msgid "Successfully added media %s."
 msgstr "成功添加了介质 %s。"
 
-#: ../mdkapplet-enterprise-update-helper:138
+#: ../mdkapplet-enterprise-update-helper:143
 #: ../mdkapplet-restricted-helper:143
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../mdkapplet-enterprise-update-helper:151
-#: ../mdkapplet-restricted-helper:156
-#, c-format
-msgid ""
-"Your Mandriva account does not have Powerpack download subscription enabled."
+#: ../mdkapplet-enterprise-update-helper:156
+#, fuzzy, c-format
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr "您的 Mandriva 账户没有启用 Powerpack 下载订阅服务。"
 
-#: ../mdkapplet-enterprise-update-helper:157
+#: ../mdkapplet-enterprise-update-helper:156
+#, c-format
+msgid "MES5"
+msgstr ""
+
+#: ../mdkapplet-enterprise-update-helper:162
 #: ../mdkapplet-restricted-helper:162
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../mdkapplet-enterprise-update-helper:163
+#: ../mdkapplet-enterprise-update-helper:168
 #: ../mdkapplet-restricted-helper:168
 #, c-format
 msgid "An error occurred while adding medium"
 msgstr "添加介质时发生了错误"
 
-#: ../mdkapplet-upgrade-helper:76
+#: ../mdkapplet-restricted-helper:156
+#, c-format
+msgid ""
+"Your Mandriva account does not have Powerpack download subscription enabled."
+msgstr "您的 Mandriva 账户没有启用 Powerpack 下载订阅服务。"
+
+#: ../mdkapplet-upgrade-helper:79
 #, c-format
 msgid ""
 "Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
 msgstr "您系统中的 %s 没有足够的空间进行升级(%dMB < %dMB)"
 
-#: ../mdkapplet-upgrade-helper:124 ../mdkapplet-upgrade-helper:173
-#: ../mdkapplet-upgrade-helper:210
+#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
+#: ../mdkapplet-upgrade-helper:215
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../mdkapplet-upgrade-helper:125
+#: ../mdkapplet-upgrade-helper:130
 #, c-format
 msgid "Installation logs can be found in '%s'"
 msgstr "安装日志可以在“%s”找到"
 
-#: ../mdkapplet-upgrade-helper:126
+#: ../mdkapplet-upgrade-helper:131
 #, c-format
 msgid "Retry"
 msgstr "重试"
 
-#: ../mdkapplet-upgrade-helper:138
+#: ../mdkapplet-upgrade-helper:143
 #, c-format
 msgid "Congratulations"
 msgstr "恭喜"
 
-#: ../mdkapplet-upgrade-helper:142
+#: ../mdkapplet-upgrade-helper:147
 #, c-format
 msgid "Upgrade to Mandriva %s release was successfull."
 msgstr "升级到 Mandriva %s 版本成功。"
 
-#: ../mdkapplet-upgrade-helper:144
+#: ../mdkapplet-upgrade-helper:149
 #, c-format
 msgid "You must restart your system."
 msgstr "您必须重新启动您的系统。"
 
-#: ../mdkapplet-upgrade-helper:145
+#: ../mdkapplet-upgrade-helper:150
 #, c-format
 msgid "Reboot"
 msgstr "重新启动"
 
-#: ../mdkapplet-upgrade-helper:175
+#: ../mdkapplet-upgrade-helper:180
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -499,7 +508,7 @@ msgstr ""
 "软件包数据库已锁定。请关闭其它使用软件包数据库的应用程序(您是否有其它介质管理"
 "器或其它桌面，或者您正在安装软件包？)。"
 
-#: ../mdkapplet-upgrade-helper:211
+#: ../mdkapplet-upgrade-helper:216
 #, c-format
 msgid "Failure when adding medium"
 msgstr "添加介质失败"