sync with code

1 files changed, 115 insertions, 79 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2ead5df5..ddfe1680 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-11-19 18:54+0100\n"
+"POT-Creation-Date: 2009-11-26 16:41+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:738
+#: ../mdkapplet:210 ../mdkapplet:731
 #, c-format
 msgid "Install updates"
 msgstr "安装更新"
@@ -146,283 +146,299 @@ msgstr "配置网络"
 msgid "Upgrade the system"
 msgstr "升级系统"
 
-#: ../mdkapplet:422
+#: ../mdkapplet:416
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "调用 Mandriva 网络中心\n"
 
-#: ../mdkapplet:433 ../mdkapplet:481
+#: ../mdkapplet:427 ../mdkapplet:475
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "新版本的 Mandriva Linux 发行版"
 
-#: ../mdkapplet:438
+#: ../mdkapplet:432
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:447
+#: ../mdkapplet:441
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Mandriva Linux 发行版已经发布了新版本。"
 
-#: ../mdkapplet:449
+#: ../mdkapplet:443
 #, c-format
 msgid "More info about this new version"
 msgstr "关于此版本的更多信息"
 
-#: ../mdkapplet:451
+#: ../mdkapplet:445
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "您是否想要升级到“%s”发行版?"
 
-#: ../mdkapplet:453 ../mdkapplet:852 ../mdkapplet:878
+#: ../mdkapplet:447 ../mdkapplet:839 ../mdkapplet:865
 #, c-format
 msgid "Do not ask me next time"
 msgstr "下次不要再询问"
 
-#: ../mdkapplet:455
+#: ../mdkapplet:449
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:456
+#: ../mdkapplet:450
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:462
+#: ../mdkapplet:456
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:466 ../mdkapplet:507 ../mdkapplet:853 ../mdkapplet:879
-#: ../mdkapplet-enterprise-update-helper:88 ../mdkapplet-restricted-helper:88
+#: ../mdkapplet:460 ../mdkapplet:501 ../mdkapplet:840 ../mdkapplet:866
+#: ../mdkapplet-enterprise-update-helper:88 ../mdkapplet-restricted-helper:94
 #, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: ../mdkapplet:466 ../mdkapplet:507 ../mdkapplet:853 ../mdkapplet:879
-#: ../mdkapplet-enterprise-update-helper:88 ../mdkapplet-restricted-helper:88
+#: ../mdkapplet:460 ../mdkapplet:501 ../mdkapplet:840 ../mdkapplet:866
+#: ../mdkapplet-enterprise-update-helper:88 ../mdkapplet-restricted-helper:94
 #: ../mdkapplet-upgrade-helper:131 ../mdkapplet-upgrade-helper:150
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../mdkapplet:498
+#: ../mdkapplet:492
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr "本升级需要宽带连接，可能需要几小时才能完成。"
 
-#: ../mdkapplet:500
+#: ../mdkapplet:494
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "估计将下载数据为 %s"
 
-#: ../mdkapplet:501
+#: ../mdkapplet:495
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "在继续之前，您应该关闭正在运行的其它应用程序。"
 
-#: ../mdkapplet:504
+#: ../mdkapplet:498
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr "如果可能的话，您应该将您的笔记本转为用电源供电，并且使用高速有线连接。"
 
-#: ../mdkapplet:531
+#: ../mdkapplet:525
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "调用 MandrivaUpdate\n"
 
-#: ../mdkapplet:552
+#: ../mdkapplet:546
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "正在检查更新...\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:652
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "系统已为最新\n"
 
-#: ../mdkapplet:687
+#: ../mdkapplet:680
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "检查网络：似乎已禁用\n"
 
-#: ../mdkapplet:729
+#: ../mdkapplet:722
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../mdkapplet:732 ../mdkapplet:740 ../mdkapplet:742
+#: ../mdkapplet:725 ../mdkapplet:733 ../mdkapplet:735
 #: ../mdkapplet-enterprise-update-helper:160
-#: ../mdkapplet-restricted-helper:160
+#: ../mdkapplet-restricted-helper:166
 #, c-format
 msgid "More Information"
 msgstr "更多信息"
 
-#: ../mdkapplet:744
+#: ../mdkapplet:737
 #, c-format
 msgid "Add media"
 msgstr "添加介质"
 
-#: ../mdkapplet:759
+#: ../mdkapplet:752
 #, c-format
 msgid "About..."
 msgstr "关于..."
 
-#: ../mdkapplet:763
+#: ../mdkapplet:756
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:764
+#: ../mdkapplet:757
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权 (C) %s Mandriva"
 
-#: ../mdkapplet:767
+#: ../mdkapplet:760
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online 可让您访问 Mandriva 的 Web 服务。"
 
-#: ../mdkapplet:769
+#: ../mdkapplet:762
 #, c-format
 msgid "Online WebSite"
 msgstr "在线网站"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:774
+#: ../mdkapplet:767
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "汤诗语 <shiyu@mandriva.org>\n"
 
-#: ../mdkapplet:783 ../mdkapplet-config:61
+#: ../mdkapplet:776 ../mdkapplet-config:69
 #, c-format
 msgid "Updates Configuration"
 msgstr "更新配置"
 
-#: ../mdkapplet:785
+#: ../mdkapplet:778
 #, c-format
 msgid "Always launch on startup"
 msgstr "在启动时自动调用"
 
-#: ../mdkapplet:787
+#: ../mdkapplet:780
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../mdkapplet:837 ../mdkapplet:847 ../mdkapplet:868 ../mdkapplet:873
+#: ../mdkapplet:829 ../mdkapplet:834 ../mdkapplet:855 ../mdkapplet:860
 #, c-format
 msgid "New medium available"
 msgstr "有新介质"
 
-#: ../mdkapplet:839
-#, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
-
-#: ../mdkapplet:840 ../mdkapplet:876
-#, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva 企业服务器"
-
-#: ../mdkapplet:849 ../mdkapplet:875
+#: ../mdkapplet:836 ../mdkapplet:862
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr "您正在使用“%s”发行版，所以有权访问额外的软件。"
 
-#: ../mdkapplet:851 ../mdkapplet:877
+#: ../mdkapplet:838 ../mdkapplet:864
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "您是否想要安装这一额外的软件仓库?"
 
-#: ../mdkapplet-config:42 ../mdkapplet-enterprise-update-helper:61
+#: ../mdkapplet:863 ../mdkonline.pm:90
+#, c-format
+msgid "Mandriva Enterprise Server"
+msgstr "Mandriva 企业服务器"
+
+#: ../mdkapplet-config:43 ../mdkapplet-enterprise-update-helper:61
 #: ../mdkapplet-enterprise-update-helper:73
 #: ../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
+#: ../mdkapplet-enterprise-update-helper:155 ../mdkapplet-restricted-helper:68
+#: ../mdkapplet-restricted-helper:79 ../mdkapplet-restricted-helper:156
+#: ../mdkapplet-restricted-helper:161
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "添加额外的软件包介质"
 
-#: ../mdkapplet-config:62
+#: ../mdkapplet-config:70
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "您可以在此配置更新小程序"
 
-#: ../mdkapplet-config:64
+#: ../mdkapplet-config:72
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "更新频率(小时)"
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "第一次检查延迟(分钟)"
 
-#: ../mdkapplet-enterprise-update-helper:74 ../mdkapplet-restricted-helper:74
+#: ../mdkapplet-config:89
+#, c-format
+msgid "Check for newer \"%s\" releases"
+msgstr ""
+
+#: ../mdkapplet-config:94 ../mdkapplet-config:100
+#, c-format
+msgid "Check for missing \"%s\" media"
+msgstr ""
+
+#: ../mdkapplet-config:94
+#, c-format
+msgid "Restricted"
+msgstr ""
+
+#: ../mdkapplet-config:100
+#, c-format
+msgid "Enterprise"
+msgstr ""
+
+#: ../mdkapplet-enterprise-update-helper:74 ../mdkapplet-restricted-helper:80
 #, c-format
 msgid "Please fill in your account ID to add an additional package medium"
 msgstr "请填入您的账户 ID，以便添加额外的软件包介质"
 
-#: ../mdkapplet-enterprise-update-helper:78 ../mdkapplet-restricted-helper:78
+#: ../mdkapplet-enterprise-update-helper:78 ../mdkapplet-restricted-helper:84
 #, c-format
 msgid "More information on your user account"
 msgstr "关于您用户账户的更多信息"
 
-#: ../mdkapplet-enterprise-update-helper:81 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-enterprise-update-helper:81 ../mdkapplet-restricted-helper:87
 #, c-format
 msgid "Your email"
 msgstr "您的电子邮件"
 
-#: ../mdkapplet-enterprise-update-helper:82 ../mdkapplet-restricted-helper:82
+#: ../mdkapplet-enterprise-update-helper:82 ../mdkapplet-restricted-helper:88
 #, c-format
 msgid "Your password"
 msgstr "您的密码"
 
-#: ../mdkapplet-enterprise-update-helper:86 ../mdkapplet-restricted-helper:86
+#: ../mdkapplet-enterprise-update-helper:86 ../mdkapplet-restricted-helper:92
 #, c-format
 msgid "Forgotten password"
 msgstr "忘记密码"
 
 #: ../mdkapplet-enterprise-update-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:82 ../mdkapplet-upgrade-helper:125
-#: ../mdkapplet-upgrade-helper:177 ../mdkapplet-upgrade-helper:214
+#: ../mdkapplet-enterprise-update-helper:168
+#: ../mdkapplet-restricted-helper:102 ../mdkapplet-restricted-helper:132
+#: ../mdkapplet-restricted-helper:174 ../mdkapplet-upgrade-helper:82
+#: ../mdkapplet-upgrade-helper:125 ../mdkapplet-upgrade-helper:177
+#: ../mdkapplet-upgrade-helper:214
 #, c-format
 msgid "Error"
 msgstr "错误"
 
-#: ../mdkapplet-enterprise-update-helper:96 ../mdkapplet-restricted-helper:96
+#: ../mdkapplet-enterprise-update-helper:96 ../mdkapplet-restricted-helper:102
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "密码和电子邮件不能为空。"
 
 #: ../mdkapplet-enterprise-update-helper:131
-#: ../mdkapplet-restricted-helper:126
+#: ../mdkapplet-restricted-helper:132
 #, c-format
 msgid "An error occurred"
 msgstr "发生了错误"
 
 #: ../mdkapplet-enterprise-update-helper:142
 #: ../mdkapplet-enterprise-update-helper:143
-#: ../mdkapplet-restricted-helper:142 ../mdkapplet-restricted-helper:143
+#: ../mdkapplet-restricted-helper:148 ../mdkapplet-restricted-helper:149
 #, c-format
 msgid "Successfully added media %s."
 msgstr "成功添加了介质 %s。"
 
 #: ../mdkapplet-enterprise-update-helper:143
-#: ../mdkapplet-restricted-helper:143
+#: ../mdkapplet-restricted-helper:149
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -432,24 +448,19 @@ msgstr "确定"
 msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr "您的 Mandriva 账户没有启用 %s 下载订阅服务。"
 
-#: ../mdkapplet-enterprise-update-helper:156
-#, c-format
-msgid "MES5"
-msgstr ""
-
 #: ../mdkapplet-enterprise-update-helper:162
-#: ../mdkapplet-restricted-helper:162
+#: ../mdkapplet-restricted-helper:168
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
 #: ../mdkapplet-enterprise-update-helper:168
-#: ../mdkapplet-restricted-helper:168
+#: ../mdkapplet-restricted-helper:174
 #, c-format
 msgid "An error occurred while adding medium"
 msgstr "添加介质时发生了错误"
 
-#: ../mdkapplet-restricted-helper:156
+#: ../mdkapplet-restricted-helper:162
 #, c-format
 msgid ""
 "Your Mandriva account does not have Powerpack download subscription enabled."
@@ -513,7 +524,32 @@ msgstr ""
 msgid "Failure when adding medium"
 msgstr "添加介质失败"
 
-#: ../mdkonline.pm:66
+#: ../mdkonline.pm:85
+#, fuzzy, c-format
+msgid "Mandriva Flash"
+msgstr "Mandriva Online %s"
+
+#: ../mdkonline.pm:86
+#, fuzzy, c-format
+msgid "Mandriva Free"
+msgstr "Mandriva Linux"
+
+#: ../mdkonline.pm:87
+#, fuzzy, c-format
+msgid "Mandriva Mini"
+msgstr "Mandriva Linux"
+
+#: ../mdkonline.pm:88
+#, fuzzy, c-format
+msgid "Mandriva One"
+msgstr "Mandriva Online %s"
+
+#: ../mdkonline.pm:89
+#, c-format
+msgid "Mandriva PowerPack"
+msgstr "Mandriva PowerPack"
+
+#: ../mdkonline.pm:101
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "发行版升级"