further improve this string by spliting out the rpmdrake substring in order to ease futur changes; add quotes

1 files changed, 117 insertions, 118 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2093a44b..5586e00f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 2006\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:18+0200\n"
+"POT-Creation-Date: 2007-08-09 16:26+0200\n"
 "PO-Revision-Date: 2006-08-10 22:31+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -27,63 +27,68 @@ msgstr "检查更新"
 msgid "Your system is up-to-date"
 msgstr "您的系统已为最新"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:109
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr "服务配置问题。请检查日志并发送邮件到 support@mandrivaonline.com"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:115
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../mdkapplet:109
+#: ../mdkapplet:121
 #, c-format
 msgid "New updates are available for your system"
 msgstr "您的系统没有可用的更新"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:127
 #, c-format
 msgid "New bundles are available for your system"
 msgstr "您的系统没有可用的捆绑包"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:133
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "服务未配置。请点击“配置服务”"
 
-#: ../mdkapplet:127
+#: ../mdkapplet:139
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "网络已掉线。请配置您的网络"
 
-#: ../mdkapplet:133
+#: ../mdkapplet:145
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "服务未激活。请点击“在线网站”"
 
-#: ../mdkapplet:139
+#: ../mdkapplet:151 ../mdkapplet:182
+#, c-format
+msgid "urpmi database locked"
+msgstr "urpmi 数据库已锁定"
+
+#: ../mdkapplet:157
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "版本不支持(太旧，或者为开发版本)"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:163
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr "未找到介质。您必须通过“软件介质管理器”添加介质。"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:169
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
-"Media Manager to enable at least one (check it in the \"Enabled\"\n"
+"Media Manager to enable at least one (check it in the \"%s\"\n"
 "column).\n"
 "\n"
-"Then, restart %s."
+"Then, restart \"%s\"."
 msgstr ""
 "你已经至少配置了一个升级介质，但是它们现在全部都不\n"
 "可用。你需要运行“软件介质管理器”来启用其中的至少\n"
@@ -91,267 +96,267 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../mdkapplet:161 ../mdkapplet:260
+#: ../mdkapplet:174
+#, c-format
+msgid "Enabled"
+msgstr ""
+
+#: ../mdkapplet:187
+#, c-format
+msgid "Error updating media"
+msgstr "更新介质出错"
+
+#: ../mdkapplet:202
+#, c-format
+msgid "Checking... Updates are available\n"
+msgstr "正在检查... 有可用的更新\n"
+
+#: ../mdkapplet:207
+#, c-format
+msgid "Packages are up to date"
+msgstr "软件包已为最新"
+
+#: ../mdkapplet:212
+#, c-format
+msgid "Failed to open urpmi database"
+msgstr "打开 urpmi 数据库出错"
+
+#: ../mdkapplet:217 ../mdkapplet:324
 #, c-format
 msgid "Install updates"
 msgstr "安装更新"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:218
 #, c-format
 msgid "Configure the service"
 msgstr "配置服务"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:219
 #, c-format
 msgid "Check Updates"
 msgstr "检查更新"
 
-#: ../mdkapplet:147 ../mdkapplet:241 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:165 ../mdkupdate:216 ../mdkupdate:285
+#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
 
-#: ../mdkapplet:147 ../mdkapplet:240 ../mdkapplet:241
+#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
 #, c-format
 msgid "Check updates"
 msgstr "检查更新"
 
-#: ../mdkapplet:150 ../mdkapplet:554
+#: ../mdkapplet:223 ../mdkapplet:648
 #, c-format
 msgid "Online WebSite"
 msgstr "在线网站"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:224
 #, c-format
 msgid "Configure Network"
 msgstr "配置网络"
 
-#: ../mdkapplet:152
+#: ../mdkapplet:225
 #, c-format
 msgid "Configure Now!"
 msgstr "立即配置!"
 
-#: ../mdkapplet:227 ../mdkapplet:306
+#: ../mdkapplet:313 ../mdkapplet:392
 #, c-format
 msgid "Mandriva Linux Updates Applet"
 msgstr "Mandriva Linux 更新小程序"
 
-#: ../mdkapplet:236
+#: ../mdkapplet:322
 #, c-format
 msgid "Actions"
 msgstr "动作"
 
-#: ../mdkapplet:239
+#: ../mdkapplet:325
 #, c-format
 msgid "Configure"
 msgstr "配置"
 
-#: ../mdkapplet:243
+#: ../mdkapplet:329
 #, c-format
 msgid "See logs"
 msgstr "查看日志"
 
-#: ../mdkapplet:246
+#: ../mdkapplet:332
 #, c-format
 msgid "Status"
 msgstr "状态"
 
-#: ../mdkapplet:250 ../mdkapplet:503
+#: ../mdkapplet:336 ../mdkapplet:597
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../mdkapplet:279
+#: ../mdkapplet:365
 #, c-format
 msgid "Network Connection: "
 msgstr "网络连接: "
 
-#: ../mdkapplet:279
+#: ../mdkapplet:365
 #, c-format
 msgid "Up"
 msgstr "通"
 
-#: ../mdkapplet:279
+#: ../mdkapplet:365
 #, c-format
 msgid "Down"
 msgstr "断"
 
-#: ../mdkapplet:280
+#: ../mdkapplet:366
 #, c-format
 msgid "Last check: "
 msgstr "上次检查: "
 
-#: ../mdkapplet:281 ../mdkonline:145
+#: ../mdkapplet:367 ../mdkonline:145
 #, c-format
 msgid "Machine name:"
 msgstr "机器名: "
 
-#: ../mdkapplet:282
+#: ../mdkapplet:368
 #, c-format
 msgid "Updates: "
 msgstr "更新: "
 
-#: ../mdkapplet:286
+#: ../mdkapplet:372
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "调用 Drak 连接\n"
 
-#: ../mdkapplet:289
+#: ../mdkapplet:375
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online 似乎重新安装了，正在重新装入小程序..."
 
-#: ../mdkapplet:297
+#: ../mdkapplet:383
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "调用 MandrivaUpdate\n"
 
-#: ../mdkapplet:312 ../mdkapplet:352
+#: ../mdkapplet:398
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "正在检查更新...\n"
 
-#: ../mdkapplet:313
+#: ../mdkapplet:399
 #, c-format
 msgid "Connecting to"
 msgstr "正在连接到"
 
-#: ../mdkapplet:330
-#, c-format
-msgid "urpmi database locked"
-msgstr "urpmi 数据库已锁定"
-
-#: ../mdkapplet:341
-#, c-format
-msgid "Error updating media"
-msgstr "更新介质出错"
-
-#: ../mdkapplet:359 ../mdkapplet:373
-#, c-format
-msgid "Checking... Updates are available\n"
-msgstr "正在检查... 有可用的更新\n"
-
-#: ../mdkapplet:363
-#, c-format
-msgid "Packages are up to date"
-msgstr "软件包已为最新"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Failed to open urpmi database"
-msgstr "打开 urpmi 数据库出错"
-
-#: ../mdkapplet:379 ../mdkupdate:201 ../mdkupdate:230
+#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
 #, c-format
 msgid "An error occurred"
 msgstr "发生了一个错误"
 
-#: ../mdkapplet:387
+#: ../mdkapplet:475
 #, c-format
 msgid "Development release not supported by service"
 msgstr "此服务不支持开发版本"
 
-#: ../mdkapplet:388
+#: ../mdkapplet:476
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "此服务器不支持太旧的版本"
 
-#: ../mdkapplet:389
+#: ../mdkapplet:477
 #, c-format
 msgid "Unknown state"
 msgstr "未知状态"
 
-#: ../mdkapplet:390
+#: ../mdkapplet:478
 #, c-format
 msgid "Online services disabled. Contact Mandriva Online site\n"
 msgstr "在线服务已禁用。请浏览 Mandriva Online 网站\n"
 
-#: ../mdkapplet:391
+#: ../mdkapplet:479
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "密码错误。\n"
 
-#: ../mdkapplet:392
+#: ../mdkapplet:480
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "动作、主机或用户名错误。\n"
 
-#: ../mdkapplet:393
+#: ../mdkapplet:481
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr "您的网络设置可能有错(请检查您的路由器、防火墙或代理服务器设置)\n"
 
-#: ../mdkapplet:395
+#: ../mdkapplet:483
 #, c-format
 msgid ""
 "Problem occured while connecting to the server, please contact the support "
 "team"
 msgstr "连接到服务器时发生问题，请联系支持团队"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:487
 #, c-format
 msgid "Response from Mandriva Online server\n"
 msgstr "Mandriva Online 服务器的响应\n"
 
-#: ../mdkapplet:402
+#: ../mdkapplet:490
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "系统已为最新\n"
 
-#: ../mdkapplet:433
+#: ../mdkapplet:527
 #, c-format
 msgid "No check"
 msgstr "不检查"
 
-#: ../mdkapplet:447
+#: ../mdkapplet:541
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "检查配置文件：不存在\n"
 
-#: ../mdkapplet:450
+#: ../mdkapplet:544
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "检查网络：似乎已禁用\n"
 
-#: ../mdkapplet:493
+#: ../mdkapplet:587
 #, c-format
 msgid "Logs"
 msgstr "日志"
 
-#: ../mdkapplet:509
+#: ../mdkapplet:603
 #, c-format
 msgid "Clear"
 msgstr "清除"
 
-#: ../mdkapplet:535
+#: ../mdkapplet:629
 #, c-format
 msgid "About..."
 msgstr "关于..."
 
-#: ../mdkapplet:537
+#: ../mdkapplet:631
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:541
+#: ../mdkapplet:635
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权 (C) %s Mandriva"
 
-#: ../mdkapplet:553
+#: ../mdkapplet:647
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online 可让您访问 Mandriva 的 Web 服务。"
 
-#: ../mdkapplet:561
+#: ../mdkapplet:655
 #, c-format
 msgid "Always launch on startup"
 msgstr "在启动时自动调用"
 
-#: ../mdkapplet:563
+#: ../mdkapplet:657
 #, c-format
 msgid "Quit"
 msgstr "退出"
@@ -372,7 +377,7 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../mdkonline:63 ../mdkupdate:74
+#: ../mdkonline:63 ../mdkupdate:73
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- 打印本帮助信息。\n"
@@ -489,8 +494,8 @@ msgid "(Ex: My Home Office's Computer)"
 msgstr "(如: 我家里的电脑)"
 
 #: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:152
-#: ../mdkupdate:183 ../mdkupdate:201 ../mdkupdate:230 ../mdkupdate:249
+#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
+#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
 #, c-format
 msgid "Error"
 msgstr "错误"
@@ -785,7 +790,7 @@ msgstr "连接错误"
 msgid "Mandriva web services not reachable"
 msgstr "无法连接到 Mandriva Web 服务"
 
-#: ../mdkupdate:69
+#: ../mdkupdate:68
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -801,32 +806,27 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../mdkupdate:75
+#: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
 msgstr "  --auto\t\t- 自动调用 Mandriva Update。\n"
 
-#: ../mdkupdate:76
-#, c-format
-msgid "  --applet\t\t- launch Mandriva Update.\n"
-msgstr "  --applet\t\t- 调用 Mandriva Update。\n"
-
-#: ../mdkupdate:77
+#: ../mdkupdate:75
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- 调用 mnf 指定的脚本。\n"
 
-#: ../mdkupdate:78
+#: ../mdkupdate:76
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
 msgstr "  --noX\t\t\t- Mandriva 更新的文本模式版本。\n"
 
-#: ../mdkupdate:79
+#: ../mdkupdate:77
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- 记录所执行的操作\n"
 
-#: ../mdkupdate:80
+#: ../mdkupdate:78
 #, c-format
 msgid ""
 "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -834,30 +834,25 @@ msgid ""
 msgstr ""
 "  --bundle file.bundle\t- 分析并安装 .bundle 元信息文件中附带的软件包。\n"
 
-#: ../mdkupdate:152
-#, c-format
-msgid "Cannot get list of updates: %s"
-msgstr "无法获得更新列表：%s"
-
-#: ../mdkupdate:160 ../mdkupdate:206
+#: ../mdkupdate:118 ../mdkupdate:164
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
-#: ../mdkupdate:162
+#: ../mdkupdate:120
 #, c-format
 msgid ""
 "You first need to install the system on your harddrive with the 'Live "
 "Install' wizard."
 msgstr "您需要先使用“Live Install”将系统安装到硬盘上。"
 
-#: ../mdkupdate:165 ../mdkupdate:216
+#: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../mdkupdate:183
+#: ../mdkupdate:141
 #, c-format
 msgid ""
 "Failed to authenticate to the bundle server:\n"
@@ -868,7 +863,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../mdkupdate:206
+#: ../mdkupdate:164
 #, c-format
 msgid ""
 "The version of the Mandriva Online client is too old.\n"
@@ -880,26 +875,30 @@ msgstr ""
 "\n"
 "您需要更新到较新版本。您可以从 http://start.mandriva.com 获得新版本。"
 
-#: ../mdkupdate:249
+#: ../mdkupdate:207
 #, c-format
 msgid "This bundle is not well formated. Aborting."
 msgstr "此捆绑包的格式不对。"
 
-#: ../mdkupdate:261
-#, c-format
-msgid "Choose which packages should be installed and Press Ok"
-msgstr "选择要安装的软件包，然后单击确定"
-
-#: ../mdkupdate:285
+#: ../mdkupdate:219
 #, c-format
 msgid "Installing packages ...\n"
 msgstr "正在安装软件包...\n"
 
-#: ../mdkupdate:297 ../mdkupdate:359
+#: ../mdkupdate:231 ../mdkupdate:271
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "无法从 update_source 介质更新软件包。\n"
 
+#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
+#~ msgstr "  --applet\t\t- 调用 Mandriva Update。\n"
+
+#~ msgid "Cannot get list of updates: %s"
+#~ msgstr "无法获得更新列表：%s"
+
+#~ msgid "Choose which packages should be installed and Press Ok"
+#~ msgstr "选择要安装的软件包，然后单击确定"
+
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "系统正忙。请稍候..."