fixed very serious i18n bug (a sentence must never be split in translations)

1 files changed, 52 insertions, 54 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index f52b7505..d5736b3e 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: 2004-09-27 23:33+0200\n"
+"POT-Creation-Date: 2004-09-29 15:47+0200\n"
 "PO-Revision-Date: 2004-09-28 23:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -57,7 +57,7 @@ msgstr "服务未激活。请点击“在线网站”"
 msgid "Release not supported (too old release, or development release)"
 msgstr "版本不支持(太旧，或者为开发版本)"
 
-#: ../mdkapplet:108 ../mdkapplet:157
+#: ../mdkapplet:108 ../mdkapplet:158
 #, c-format
 msgid "Install updates"
 msgstr "安装更新"
@@ -87,174 +87,174 @@ msgstr "配置网络"
 msgid "Configure Now!"
 msgstr "立即配置!"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:146
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux 更新小程序"
 
-#: ../mdkapplet:155
+#: ../mdkapplet:156
 #, c-format
 msgid "Actions"
 msgstr "动作"
 
-#: ../mdkapplet:158
+#: ../mdkapplet:159
 #, c-format
 msgid "Configure"
 msgstr "配置"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:160
 #, c-format
 msgid "Check updates"
 msgstr "检查更新"
 
-#: ../mdkapplet:160
+#: ../mdkapplet:161
 #, c-format
 msgid "See logs"
 msgstr "查看日志"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:164
 #, c-format
 msgid "Status"
 msgstr "状态"
 
-#: ../mdkapplet:167 ../mdkapplet:356
+#: ../mdkapplet:168 ../mdkapplet:363
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:203
 #, c-format
 msgid "Network Connection: "
 msgstr "网络连接: "
 
-#: ../mdkapplet:202
+#: ../mdkapplet:203
 #, c-format
 msgid "Up"
 msgstr "通"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:203
 #, c-format
 msgid "Down"
 msgstr "断"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:204
 #, c-format
 msgid "Last check: "
 msgstr "上次检查: "
 
-#: ../mdkapplet:204
+#: ../mdkapplet:205
 #, c-format
 msgid "Updates: "
 msgstr "更新: "
 
-#: ../mdkapplet:208
+#: ../mdkapplet:209
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "调用 Drak 连接\n"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:213
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "调用 mdkupdate --applet\n"
 
-#: ../mdkapplet:216
+#: ../mdkapplet:217
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline 似乎重新安装了，正在重新装入小程序..."
 
-#: ../mdkapplet:224
+#: ../mdkapplet:225
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "正在检查更新...\n"
 
-#: ../mdkapplet:226
+#: ../mdkapplet:227
 #, c-format
 msgid "Connecting to"
 msgstr "正在连接到"
 
-#: ../mdkapplet:249
+#: ../mdkapplet:250
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "正在检查... 有可用的更新\n"
 
-#: ../mdkapplet:253
+#: ../mdkapplet:254
 #, c-format
 msgid "Development release not supported by service"
 msgstr "此服务不支持开发版本"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:255
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "此服务器不支持太旧的版本"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:256
 #, c-format
 msgid "Unknown state"
 msgstr "未知状态"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:257
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "在线服务已禁用。请浏览 Mandrakeonline 网站\n"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:258
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "密码错误。\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:259
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "动作、主机或用户名错误。\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:260
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr "您的网络设置可能有错(请检查您的路由器、防火墙或代理服务器设置)\n"
 
-#: ../mdkapplet:263
+#: ../mdkapplet:264
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "系统已为最新\n"
 
-#: ../mdkapplet:299
+#: ../mdkapplet:303
 #, c-format
 msgid "No check"
 msgstr "不检查"
 
-#: ../mdkapplet:312
+#: ../mdkapplet:316
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "检查网络：似乎已禁用\n"
 
-#: ../mdkapplet:315
+#: ../mdkapplet:319
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "检查配置文件：不存在\n"
 
-#: ../mdkapplet:346
+#: ../mdkapplet:353
 #, c-format
 msgid "Logs"
 msgstr "日志"
 
-#: ../mdkapplet:362
+#: ../mdkapplet:369
 #, c-format
 msgid "Clear"
 msgstr "清除"
 
-#: ../mdkapplet:389
+#: ../mdkapplet:396
 #, c-format
 msgid "About..."
 msgstr "关于..."
 
-#: ../mdkapplet:390
+#: ../mdkapplet:397
 #, c-format
 msgid "Always launch on startup"
 msgstr "在启动时自动调用"
 
-#: ../mdkapplet:392
+#: ../mdkapplet:399
 #, c-format
 msgid "Quit"
 msgstr "退出"
@@ -296,15 +296,10 @@ msgid "Create a Mandrakeonline Account"
 msgstr "创建一个 Mandrakeonline 账户"
 
 #: ../mdkonline:108
-#, c-format
-msgid "I don't have a Mandrakeonline account and I want to "
+#, fuzzy, c-format
+msgid "I don't have a Mandrakeonline account and I want to subscribe"
 msgstr "我没有 Mandrakeonline 账户, 我要"
 
-#: ../mdkonline:108
-#, c-format
-msgid "Subscribe"
-msgstr "订阅"
-
 #: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:113 ../mdkonline_tui:144
 #, c-format
 msgid "Login:"
@@ -384,12 +379,12 @@ msgstr ""
 msgid "Finish"
 msgstr "完成"
 
-#: ../mdkonline:146 ../mdkonline_tui:171
+#: ../mdkonline:146 ../mdkonline_tui:166
 #, c-format
 msgid "Your upload was successful!"
 msgstr "您的上传已经成功!"
 
-#: ../mdkonline:146 ../mdkonline_tui:171
+#: ../mdkonline:146 ../mdkonline_tui:166
 #, c-format
 msgid ""
 "From now you will receive on security and updates \n"
@@ -398,7 +393,7 @@ msgstr ""
 "从现在开始，您将能够收到 Mandrakeonline 发出的安全\n"
 "和更新通知了。"
 
-#: ../mdkonline:146 ../mdkonline_tui:171
+#: ../mdkonline:146 ../mdkonline_tui:166
 #, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
@@ -422,7 +417,7 @@ msgstr "国家:"
 msgid "Error"
 msgstr "出错"
 
-#: ../mdkonline:184 ../mdkonline_tui:152
+#: ../mdkonline:184 ../mdkonline_tui:151
 #, c-format
 msgid "Please provide a login"
 msgstr "请提供有效的登录名"
@@ -436,28 +431,28 @@ msgstr ""
 "密码不匹配\n"
 " 请再试一次\n"
 
-#: ../mdkonline:188 ../mdkonline_tui:153
+#: ../mdkonline:188 ../mdkonline_tui:151
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "不是有效的电子邮件地址!\n"
 
-#: ../mdkonline:200 ../mdkonline_tui:77 ../mdkonline_tui:81
+#: ../mdkonline:200 ../mdkonline_tui:77
 #, c-format
 msgid "Reading configuration\n"
 msgstr "正在读取配置\n"
 
-#: ../mdkonline:205
+#: ../mdkonline:205 ../mdkonline_tui:81
 #, c-format
 msgid "Sending configuration..."
 msgstr "正在发送配置..."
 
-#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:129 ../mdkonline_tui:173
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:129 ../mdkonline_tui:168
 #: ../mdkupdate:124 ../mdkupdate:195
 #, c-format
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: ../mdkonline:214 ../mdkonline_tui:173
+#: ../mdkonline:214 ../mdkonline_tui:168
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "上传文件时发生了错误，请重试"
@@ -564,7 +559,7 @@ msgstr "或"
 msgid "wrong password:"
 msgstr "密码错误:"
 
-#: ../mdkonline_tui:162
+#: ../mdkonline_tui:157
 #, c-format
 msgid ""
 "Mandrakeonline Account successfully created.\n"
@@ -573,7 +568,7 @@ msgstr ""
 "Mandrakeonline 账户创建成功。\n"
 "请单击“下一步”进行身份验证并上传您的配置\n"
 
-#: ../mdkonline_tui:179
+#: ../mdkonline_tui:174
 #, c-format
 msgid "Country"
 msgstr "国家"
@@ -636,3 +631,6 @@ msgid ""
 "mandrakeonline [dot] net"
 msgstr ""
 "Mandrakeupdate 无法上传差异文件。请给 support@mandrakeonline.net 发送邮件"
+
+#~ msgid "Subscribe"
+#~ msgstr "订阅"