sync with code

1 files changed, 132 insertions, 57 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b0124f56..2ba6b884 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-01-27 18:22+0100\n"
+"POT-Creation-Date: 2010-02-01 15:19+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"
@@ -106,7 +106,7 @@ msgstr "启用"
 msgid "Error updating media"
 msgstr "更新介质出错"
 
-#: ../mdkapplet:219 ../mdkapplet:880
+#: ../mdkapplet:219 ../mdkapplet:881
 #, c-format
 msgid "Install updates"
 msgstr "安装更新"
@@ -131,7 +131,7 @@ msgstr "配置网络"
 msgid "Upgrade the system"
 msgstr "升级系统"
 
-#: ../mdkapplet:378
+#: ../mdkapplet:379
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -139,94 +139,96 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:400
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "调用 Mandriva 网络中心\n"
 
-#: ../mdkapplet:412 ../mdkapplet:571
+#: ../mdkapplet:413 ../mdkapplet:572
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "新版本的 Mandriva Linux 发行版"
 
-#: ../mdkapplet:417
+#: ../mdkapplet:418
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:426
+#: ../mdkapplet:427
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Mandriva Linux 发行版已经发布了新版本。"
 
-#: ../mdkapplet:428 ../mdkapplet:517
+#: ../mdkapplet:429 ../mdkapplet:518
 #, c-format
 msgid "More info about this new version"
 msgstr "关于此版本的更多信息"
 
-#: ../mdkapplet:430 ../mdkapplet:515
+#: ../mdkapplet:431 ../mdkapplet:516
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "您是否想要升级到“%s”发行版?"
 
-#: ../mdkapplet:432 ../mdkapplet:525 ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:433 ../mdkapplet:526 ../mdkapplet:966 ../mdkapplet:992
 #, c-format
 msgid "Do not ask me next time"
 msgstr "下次不要再询问"
 
-#: ../mdkapplet:434
+#: ../mdkapplet:435
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:436
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:441
+#: ../mdkapplet:442
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:445 ../mdkapplet:530 ../mdkapplet:597 ../mdkapplet:966
-#: ../mdkapplet:992 ../mdkapplet-enterprise-update-helper:89
+#: ../mdkapplet:446 ../mdkapplet:531 ../mdkapplet:598 ../mdkapplet:967
+#: ../mdkapplet:993 ../mdkapplet-enterprise-update-helper:89
+#: ../mdkapplet-extended-maintenance-helper:131
 #: ../mdkapplet-restricted-helper:95
 #, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: ../mdkapplet:445 ../mdkapplet:530 ../mdkapplet:597 ../mdkapplet:966
-#: ../mdkapplet:992 ../mdkapplet-enterprise-update-helper:89
+#: ../mdkapplet:446 ../mdkapplet:531 ../mdkapplet:598 ../mdkapplet:967
+#: ../mdkapplet:993 ../mdkapplet-enterprise-update-helper:89
+#: ../mdkapplet-extended-maintenance-helper:131
 #: ../mdkapplet-restricted-helper:95 ../mdkapplet-upgrade-helper:131
 #: ../mdkapplet-upgrade-helper:150
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../mdkapplet:460
+#: ../mdkapplet:461
 #, c-format
 msgid ""
 "This Mandriva Linux system maintenance has ended. It means it will not "
 "receive any new software update."
 msgstr ""
 
-#: ../mdkapplet:466
+#: ../mdkapplet:467
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:472
+#: ../mdkapplet:473
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
-#: ../mdkapplet:478
+#: ../mdkapplet:479
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:480
+#: ../mdkapplet:481
 #, fuzzy, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -235,148 +237,149 @@ msgstr ""
 "这一版本的发行版不再受支持。此后也不会有任何更新。您应该升级到 %s 发行版的新"
 "版本。"
 
-#: ../mdkapplet:484
+#: ../mdkapplet:485
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "您是否想要升级到“%s”发行版?"
 
-#: ../mdkapplet:494
+#: ../mdkapplet:495
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:504
+#: ../mdkapplet:505
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until."
 msgstr ""
 
-#: ../mdkapplet:588
+#: ../mdkapplet:589
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr "本升级需要宽带连接，可能需要几小时才能完成。"
 
-#: ../mdkapplet:590
+#: ../mdkapplet:591
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "估计将下载数据为 %s"
 
-#: ../mdkapplet:591
+#: ../mdkapplet:592
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "在继续之前，您应该关闭正在运行的其它应用程序。"
 
-#: ../mdkapplet:594
+#: ../mdkapplet:595
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr "如果可能的话，您应该将您的笔记本转为用电源供电，并且使用高速有线连接。"
 
-#: ../mdkapplet:626
+#: ../mdkapplet:627
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "调用 MandrivaUpdate\n"
 
-#: ../mdkapplet:658
+#: ../mdkapplet:659
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "正在检查更新...\n"
 
-#: ../mdkapplet:765
+#: ../mdkapplet:766
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "系统已为最新\n"
 
-#: ../mdkapplet:805
+#: ../mdkapplet:806
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "检查网络：似乎已禁用\n"
 
-#: ../mdkapplet:832
+#: ../mdkapplet:833
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:834
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权 (C) %s Mandriva"
 
-#: ../mdkapplet:836
+#: ../mdkapplet:837
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online 可让您访问 Mandriva 的 Web 服务。"
 
-#: ../mdkapplet:838
+#: ../mdkapplet:839
 #, c-format
 msgid "Online WebSite"
 msgstr "在线网站"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:843
+#: ../mdkapplet:844
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "汤诗语 <shiyu@mandriva.org>\n"
 
-#: ../mdkapplet:871
+#: ../mdkapplet:872
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../mdkapplet:874 ../mdkapplet:882 ../mdkapplet:884
+#: ../mdkapplet:875 ../mdkapplet:883 ../mdkapplet:885
 #: ../mdkapplet-enterprise-update-helper:150
+#: ../mdkapplet-extended-maintenance-helper:196
 #: ../mdkapplet-restricted-helper:156
 #, c-format
 msgid "More Information"
 msgstr "更多信息"
 
-#: ../mdkapplet:886
+#: ../mdkapplet:887
 #, c-format
 msgid "Add media"
 msgstr "添加介质"
 
-#: ../mdkapplet:901
+#: ../mdkapplet:902
 #, c-format
 msgid "About..."
 msgstr "关于..."
 
-#: ../mdkapplet:903 ../mdkapplet-config:68
+#: ../mdkapplet:904 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "更新配置"
 
-#: ../mdkapplet:905
+#: ../mdkapplet:906
 #, c-format
 msgid "Always launch on startup"
 msgstr "在启动时自动调用"
 
-#: ../mdkapplet:907
+#: ../mdkapplet:908
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../mdkapplet:955 ../mdkapplet:960 ../mdkapplet:981 ../mdkapplet:986
+#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
 #, c-format
 msgid "New medium available"
 msgstr "有新介质"
 
-#: ../mdkapplet:962 ../mdkapplet:988
+#: ../mdkapplet:963 ../mdkapplet:989
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr "您正在使用“%s”发行版，所以有权访问额外的软件。"
 
-#: ../mdkapplet:964 ../mdkapplet:990
+#: ../mdkapplet:965 ../mdkapplet:991
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "您是否想要安装这一额外的软件仓库?"
 
-#: ../mdkapplet:989 ../mdkonline.pm:168
+#: ../mdkapplet:990 ../mdkonline.pm:168
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr "Mandriva 企业服务器"
@@ -384,9 +387,11 @@ msgstr "Mandriva 企业服务器"
 #: ../mdkapplet-config:43 ../mdkapplet-enterprise-update-helper:61
 #: ../mdkapplet-enterprise-update-helper:74
 #: ../mdkapplet-enterprise-update-helper:140
-#: ../mdkapplet-enterprise-update-helper:145 ../mdkapplet-restricted-helper:68
-#: ../mdkapplet-restricted-helper:80 ../mdkapplet-restricted-helper:146
-#: ../mdkapplet-restricted-helper:151
+#: ../mdkapplet-enterprise-update-helper:145
+#: ../mdkapplet-extended-maintenance-helper:76
+#: ../mdkapplet-extended-maintenance-helper:186
+#: ../mdkapplet-restricted-helper:68 ../mdkapplet-restricted-helper:80
+#: ../mdkapplet-restricted-helper:146 ../mdkapplet-restricted-helper:151
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "添加额外的软件包介质"
@@ -431,22 +436,30 @@ msgstr ""
 msgid "Please fill in your account ID to add an additional package medium"
 msgstr "请填入您的账户 ID，以便添加额外的软件包介质"
 
-#: ../mdkapplet-enterprise-update-helper:79 ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-enterprise-update-helper:79
+#: ../mdkapplet-extended-maintenance-helper:121
+#: ../mdkapplet-restricted-helper:85
 #, c-format
 msgid "More information on your user account"
 msgstr "关于您用户账户的更多信息"
 
-#: ../mdkapplet-enterprise-update-helper:82 ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-enterprise-update-helper:82
+#: ../mdkapplet-extended-maintenance-helper:124
+#: ../mdkapplet-restricted-helper:88
 #, c-format
 msgid "Your email"
 msgstr "您的电子邮件"
 
-#: ../mdkapplet-enterprise-update-helper:83 ../mdkapplet-restricted-helper:89
+#: ../mdkapplet-enterprise-update-helper:83
+#: ../mdkapplet-extended-maintenance-helper:125
+#: ../mdkapplet-restricted-helper:89
 #, c-format
 msgid "Your password"
 msgstr "您的密码"
 
-#: ../mdkapplet-enterprise-update-helper:87 ../mdkapplet-restricted-helper:93
+#: ../mdkapplet-enterprise-update-helper:87
+#: ../mdkapplet-extended-maintenance-helper:129
+#: ../mdkapplet-restricted-helper:93
 #, c-format
 msgid "Forgotten password"
 msgstr "忘记密码"
@@ -454,6 +467,10 @@ msgstr "忘记密码"
 #: ../mdkapplet-enterprise-update-helper:97
 #: ../mdkapplet-enterprise-update-helper:121
 #: ../mdkapplet-enterprise-update-helper:158
+#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:141
+#: ../mdkapplet-extended-maintenance-helper:160
+#: ../mdkapplet-extended-maintenance-helper:204
 #: ../mdkapplet-restricted-helper:103 ../mdkapplet-restricted-helper:122
 #: ../mdkapplet-restricted-helper:164 ../mdkapplet-upgrade-helper:82
 #: ../mdkapplet-upgrade-helper:125 ../mdkapplet-upgrade-helper:177
@@ -462,12 +479,15 @@ msgstr "忘记密码"
 msgid "Error"
 msgstr "错误"
 
-#: ../mdkapplet-enterprise-update-helper:97 ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-enterprise-update-helper:97
+#: ../mdkapplet-extended-maintenance-helper:141
+#: ../mdkapplet-restricted-helper:103
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "密码和电子邮件不能为空。"
 
 #: ../mdkapplet-enterprise-update-helper:121
+#: ../mdkapplet-extended-maintenance-helper:160
 #: ../mdkapplet-restricted-helper:122
 #, c-format
 msgid "An error occurred"
@@ -475,12 +495,15 @@ msgstr "发生了错误"
 
 #: ../mdkapplet-enterprise-update-helper:132
 #: ../mdkapplet-enterprise-update-helper:133
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
 #, c-format
 msgid "Successfully added media %s."
 msgstr "成功添加了介质 %s。"
 
 #: ../mdkapplet-enterprise-update-helper:133
+#: ../mdkapplet-extended-maintenance-helper:179
 #: ../mdkapplet-restricted-helper:139
 #, c-format
 msgid "Ok"
@@ -492,17 +515,69 @@ msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr "您的 Mandriva 账户没有启用 %s 下载订阅服务。"
 
 #: ../mdkapplet-enterprise-update-helper:152
+#: ../mdkapplet-extended-maintenance-helper:198
 #: ../mdkapplet-restricted-helper:158
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
 #: ../mdkapplet-enterprise-update-helper:158
+#: ../mdkapplet-extended-maintenance-helper:204
 #: ../mdkapplet-restricted-helper:164
 #, c-format
 msgid "An error occurred while adding medium"
 msgstr "添加介质时发生了错误"
 
+#: ../mdkapplet-extended-maintenance-helper:91
+#, c-format
+msgid "Failure while retrieving distributions list:"
+msgstr ""
+
+#: ../mdkapplet-extended-maintenance-helper:101
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+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:107
+#, 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 ""
+
+#: ../mdkapplet-extended-maintenance-helper:110
+#, c-format
+msgid ""
+"Extended maintenance is now available to get 18 months of additional updates "
+"(until %s)."
+msgstr ""
+
+#: ../mdkapplet-extended-maintenance-helper:112
+#, c-format
+msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+msgstr ""
+
+#: ../mdkapplet-extended-maintenance-helper:115
+#, fuzzy, c-format
+msgid "Online subscription"
+msgstr "在线网站"
+
+#: ../mdkapplet-extended-maintenance-helper:117
+#, fuzzy, c-format
+msgid ""
+"Please fill in your account ID to add an additional package medium once you "
+"have subscribed online"
+msgstr "请填入您的账户 ID，以便添加额外的软件包介质"
+
+#: ../mdkapplet-extended-maintenance-helper:192
+#, fuzzy, c-format
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "您的 Mandriva 账户没有启用 %s 下载订阅服务。"
+
 #: ../mdkapplet-restricted-helper:152
 #, c-format
 msgid ""