More s/Mandrake/Mandriva, fix mdk bug#16077.

1 files changed, 37 insertions, 45 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 24adc640..eda50d8a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-11 11:06+0200\n"
+"POT-Creation-Date: 2005-07-07 06:30+0800\n"
 "PO-Revision-Date: 2004-11-20 22:06+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -15,115 +15,115 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:63
+#: ../mdkapplet:62
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "您的系统已为最新"
 
-#: ../mdkapplet:69
+#: ../mdkapplet:68
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.net"
 msgstr "服务配置问题。请检查日志并发送邮件到 support@mandrivaonline.net"
 
-#: ../mdkapplet:75
+#: ../mdkapplet:74
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "系统正忙。请稍候..."
 
-#: ../mdkapplet:81
+#: ../mdkapplet:80
 #, c-format
 msgid "New updates are available for your system"
 msgstr "您的系统没有可用的更新"
 
-#: ../mdkapplet:87
+#: ../mdkapplet:86
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "服务未配置。请点击“配置服务”"
 
-#: ../mdkapplet:93
+#: ../mdkapplet:92
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "网络已掉线。请配置您的网络"
 
-#: ../mdkapplet:99
+#: ../mdkapplet:98
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "服务未激活。请点击“在线网站”"
 
-#: ../mdkapplet:105
+#: ../mdkapplet:104
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "版本不支持(太旧，或者为开发版本)"
 
-#: ../mdkapplet:110 ../mdkapplet:163
+#: ../mdkapplet:109 ../mdkapplet:162
 #, c-format
 msgid "Install updates"
 msgstr "安装更新"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:110
 #, c-format
 msgid "Configure the service"
 msgstr "配置服务"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:111
 #, c-format
 msgid "Check Updates"
 msgstr "检查更新"
 
-#: ../mdkapplet:113 ../mdkapplet:166 ../mdkonline:93 ../mdkonline:97
+#: ../mdkapplet:112 ../mdkapplet:165 ../mdkonline:93 ../mdkonline:97
 #: ../mdkonline:135 ../mdkupdate:171
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
 
-#: ../mdkapplet:113 ../mdkapplet:165 ../mdkapplet:166
+#: ../mdkapplet:112 ../mdkapplet:164 ../mdkapplet:165
 #, c-format
 msgid "Check updates"
 msgstr "检查更新"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:114
 #, c-format
 msgid "Online WebSite"
 msgstr "在线网站"
 
-#: ../mdkapplet:116
+#: ../mdkapplet:115
 #, c-format
 msgid "Configure Network"
 msgstr "配置网络"
 
-#: ../mdkapplet:117
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Now!"
 msgstr "立即配置!"
 
-#: ../mdkapplet:151 ../mdkapplet:232
+#: ../mdkapplet:150 ../mdkapplet:232
 #, c-format
 msgid "Mandriva Linux Updates Applet"
 msgstr "Mandriva Linux 更新小程序"
 
-#: ../mdkapplet:161
+#: ../mdkapplet:160
 #, c-format
 msgid "Actions"
 msgstr "动作"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:163
 #, c-format
 msgid "Configure"
 msgstr "配置"
 
-#: ../mdkapplet:168
+#: ../mdkapplet:167
 #, c-format
 msgid "See logs"
 msgstr "查看日志"
 
-#: ../mdkapplet:171
+#: ../mdkapplet:170
 #, c-format
 msgid "Status"
 msgstr "状态"
 
-#: ../mdkapplet:175 ../mdkapplet:385
+#: ../mdkapplet:174 ../mdkapplet:392
 #, c-format
 msgid "Close"
 msgstr "关闭"
@@ -257,27 +257,27 @@ msgstr "检查配置文件：不存在\n"
 msgid "Checking Network: seems disabled\n"
 msgstr "检查网络：似乎已禁用\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:382
 #, c-format
 msgid "Logs"
 msgstr "日志"
 
-#: ../mdkapplet:391
+#: ../mdkapplet:398
 #, c-format
 msgid "Clear"
 msgstr "清除"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:425
 #, c-format
 msgid "About..."
 msgstr "关于..."
 
-#: ../mdkapplet:419
+#: ../mdkapplet:426
 #, c-format
 msgid "Always launch on startup"
 msgstr "在启动时自动调用"
 
-#: ../mdkapplet:421
+#: ../mdkapplet:428
 #, c-format
 msgid "Quit"
 msgstr "退出"
@@ -314,7 +314,7 @@ msgid ""
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
-"您需要在本步骤中提供您在 Mandriva Online 的账户。而本助手将会帮助您将您的配置"
+"本助手将会帮助您将您的配置"
 "(软件包、硬件配置)上传到中央数据库中，这样可以保证您能够时刻收到安全更新和有"
 "用的升级。\n"
 
@@ -558,13 +558,13 @@ msgstr "  --help        - 打印本帮助信息。\n"
 
 #: ../mdkupdate:66
 #, c-format
-msgid "  --auto         - Mandrakeupdate launched automatically.\n"
-msgstr "  --auto        - 自动调用 Mandrakeupdate。\n"
+msgid "  --auto         - Mandriva Update launched automatically.\n"
+msgstr "  --auto        - 自动调用 Mandriva 更新。\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --applet       - launch Mandrakeupdate.\n"
-msgstr "  --applet      - 调用 Mandrakeupdate。\n"
+msgid "  --applet       - launch Mandriva Update.\n"
+msgstr "  --applet      - 调用 Mandriva 更新。\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -573,8 +573,8 @@ msgstr "  --mnf          - 调用 mnf 指定的脚本。\n"
 
 #: ../mdkupdate:69
 #, c-format
-msgid "  --noX          - text mode version of MandrakeUpdate.\n"
-msgstr "  --noX          - Mandrakeupdate 的文本模式版本。\n"
+msgid "  --noX          - text mode version of Mandriva Update.\n"
+msgstr "  --noX          - Mandriva 更新的文本模式版本。\n"
 
 #: ../mdkupdate:77
 #, c-format
@@ -583,8 +583,8 @@ msgstr "未找到 %s 文件。请先运行 Mandriva Online 向导"
 
 #: ../mdkupdate:141
 #, c-format
-msgid "Mandrakeupdate could not contact the site, we will try again."
-msgstr "Mandrakeupdate 无法连接网站，请稍后再试一次。"
+msgid "Mandriva Update could not contact the site, we will try again."
+msgstr "Mandriva 更新无法连接网站，请稍后再试一次。"
 
 #: ../mdkupdate:149
 #, c-format
@@ -601,11 +601,3 @@ msgstr "正在安装软件包...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "无法从 update_source 介质更新软件包。\n"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "无法从 mdkupdate 介质更新软件包。\n"
-
-#~ msgid ""
-#~ "Mandrakeupdate could not upload the diff files. Send a mail to support "
-#~ "[at] mandrivaonline [dot] net"
-#~ msgstr ""
-#~ "Mandrakeupdate 无法上传差异文件。请给 support@mandrivaonline.net 发送邮件"