sync with code

1 files changed, 42 insertions, 36 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4328fc78..90152839 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: 2008-11-20 16:49+0100\n"
+"POT-Creation-Date: 2008-12-03 15:28+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"
@@ -131,67 +131,67 @@ msgstr "配置网络"
 msgid "Upgrade the system"
 msgstr "升级系统"
 
-#: ../mdkapplet:356
+#: ../mdkapplet:357
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "调用 Mandriva 网络中心\n"
 
-#: ../mdkapplet:361 ../mdkapplet:382
+#: ../mdkapplet:362 ../mdkapplet:383
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "新版本的 Mandriva Linux 发行版"
 
-#: ../mdkapplet:365
+#: ../mdkapplet:366
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Mandriva Linux 发行版已经发布了新版本。"
 
-#: ../mdkapplet:367
+#: ../mdkapplet:368
 #, c-format
 msgid "More info about this new version"
 msgstr "关于此版本的更多信息"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:370
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "您是否想要升级到“%s”发行版?"
 
-#: ../mdkapplet:371 ../mdkapplet-restricted-helper:67
+#: ../mdkapplet:372 ../mdkapplet-restricted-helper:68
 #, c-format
 msgid "Do not ask me next time"
 msgstr "下次不要再询问"
 
-#: ../mdkapplet:372 ../mdkapplet:408 ../mdkapplet-restricted-helper:68
-#: ../mdkapplet-restricted-helper:96
+#: ../mdkapplet:373 ../mdkapplet:409 ../mdkapplet-restricted-helper:69
+#: ../mdkapplet-restricted-helper:104
 #, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: ../mdkapplet:372 ../mdkapplet:408 ../mdkapplet-restricted-helper:68
-#: ../mdkapplet-restricted-helper:96 ../mdkapplet-upgrade-helper:126
+#: ../mdkapplet:373 ../mdkapplet:409 ../mdkapplet-restricted-helper:69
+#: ../mdkapplet-restricted-helper:104 ../mdkapplet-upgrade-helper:126
 #: ../mdkapplet-upgrade-helper:145
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:400
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr "本升级需要宽带连接，可能需要几小时才能完成。"
 
-#: ../mdkapplet:401
+#: ../mdkapplet:402
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "估计将下载数据为 %s"
 
-#: ../mdkapplet:402
+#: ../mdkapplet:403
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "在继续之前，您应该关闭正在运行的其它应用程序。"
 
-#: ../mdkapplet:405
+#: ../mdkapplet:406
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -274,24 +274,26 @@ msgstr "在启动时自动调用"
 msgid "Quit"
 msgstr "退出"
 
-#: ../mdkapplet-restricted-helper:59
+#: ../mdkapplet-restricted-helper:58
 #, c-format
 msgid "New medium available"
 msgstr ""
 
 #: ../mdkapplet-restricted-helper:65
-#, fuzzy, c-format
-msgid "You are using '%s' distribution."
-msgstr "您是否想要升级到“%s”发行版?"
+#, c-format
+msgid ""
+"You use '%s' distribution and therefore have privileged access to additional "
+"software."
+msgstr ""
 
-#: ../mdkapplet-restricted-helper:65
+#: ../mdkapplet-restricted-helper:66
 #, c-format
 msgid "Mandriva PowerPack"
 msgstr ""
 
-#: ../mdkapplet-restricted-helper:66
+#: ../mdkapplet-restricted-helper:67
 #, fuzzy, c-format
-msgid "Do you want to add an additional package medium?"
+msgid "Do you want to install this additional software repository?"
 msgstr "您是否想要升级到“%s”发行版?"
 
 #: ../mdkapplet-restricted-helper:77
@@ -299,39 +301,39 @@ msgstr "您是否想要升级到“%s”发行版?"
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-restricted-helper:90
 #, c-format
 msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-restricted-helper:90
+#: ../mdkapplet-restricted-helper:94
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet-restricted-helper:92
+#: ../mdkapplet-restricted-helper:97
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-restricted-helper:93
+#: ../mdkapplet-restricted-helper:98
 #, c-format
 msgid "Your password"
 msgstr ""
 
-#: ../mdkapplet-restricted-helper:95
+#: ../mdkapplet-restricted-helper:102
 #, c-format
 msgid "Forgotten password"
 msgstr ""
 
-#: ../mdkapplet-restricted-helper:121 ../mdkapplet-upgrade-helper:79
+#: ../mdkapplet-restricted-helper:129 ../mdkapplet-upgrade-helper:79
 #: ../mdkapplet-upgrade-helper:120 ../mdkapplet-upgrade-helper:172
 #: ../mdkapplet-upgrade-helper:208
 #, c-format
 msgid "Error"
 msgstr "错误"
 
-#: ../mdkapplet-restricted-helper:121
+#: ../mdkapplet-restricted-helper:129
 #, c-format
 msgid "An error occurred"
 msgstr ""
@@ -399,7 +401,7 @@ msgstr "添加介质失败"
 msgid "Distribution Upgrade"
 msgstr "发行版升级"
 
-#: ../mdkupdate:62
+#: ../mdkupdate:59
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -415,36 +417,40 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../mdkupdate:67
+#: ../mdkupdate:64
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- 打印本帮助信息。\n"
 
-#: ../mdkupdate:68
+#: ../mdkupdate:65
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
 msgstr "  --auto\t\t- 自动调用 Mandriva Update。\n"
 
-#: ../mdkupdate:69
+#: ../mdkupdate:66
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- 调用 mnf 指定的脚本。\n"
 
-#: ../mdkupdate:70
+#: ../mdkupdate:67
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
 msgstr "  --noX\t\t\t- Mandriva 更新的文本模式版本。\n"
 
-#: ../mdkupdate:71
+#: ../mdkupdate:68
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- 记录所执行的操作\n"
 
-#: ../mdkupdate:102
+#: ../mdkupdate:99
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "无法从 update_source 介质更新软件包。\n"
 
+#, fuzzy
+#~ msgid "You are using '%s' distribution."
+#~ msgstr "您是否想要升级到“%s”发行版?"
+
 #~ msgid "Do you want to upgrade?"
 #~ msgstr "您是否想要升级?"