merge

1 files changed, 28 insertions, 23 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 27623d4d..ad563ad4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-03 17:51+0100\n"
+"POT-Creation-Date: 2004-03-04 16:55+0100\n"
 "PO-Revision-Date: 2004-03-02 04:28+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -67,76 +67,76 @@ msgstr "配置网络"
 msgid "Configure Now!"
 msgstr "立即配置!"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:123
 msgid "Mandrake Updates Applet"
 msgstr "Madrake Update 小程序"
 
-#: ../mdkapplet:128
+#: ../mdkapplet:130
 msgid "Actions"
 msgstr "动作"
 
-#: ../mdkapplet:130
+#: ../mdkapplet:132
 msgid "Install updates"
 msgstr "安装更新"
 
-#: ../mdkapplet:131
+#: ../mdkapplet:133
 msgid "Configure"
 msgstr "配置"
 
-#: ../mdkapplet:132
+#: ../mdkapplet:134
 msgid "Check updates"
 msgstr "检查更新"
 
-#: ../mdkapplet:133
+#: ../mdkapplet:135
 msgid "See logs"
 msgstr "查看日志"
 
-#: ../mdkapplet:136
+#: ../mdkapplet:138
 msgid "Status"
 msgstr "状态"
 
-#: ../mdkapplet:139
+#: ../mdkapplet:141
 msgid "Network Connection: "
 msgstr "网络连接："
 
-#: ../mdkapplet:140
+#: ../mdkapplet:142
 msgid "Down"
 msgstr "向下"
 
-#: ../mdkapplet:140
+#: ../mdkapplet:142
 msgid "Up"
 msgstr "向上"
 
-#: ../mdkapplet:143
+#: ../mdkapplet:145
 msgid "New Updates: "
 msgstr "新更新："
 
-#: ../mdkapplet:144
+#: ../mdkapplet:146
 msgid "Available"
 msgstr "可用"
 
-#: ../mdkapplet:144
+#: ../mdkapplet:146
 msgid "Not Available"
 msgstr "不可用"
 
-#: ../mdkapplet:147
+#: ../mdkapplet:149
 msgid "Last check: "
 msgstr "上次检查："
 
-#: ../mdkapplet:153
+#: ../mdkapplet:155
 msgid "Close"
 msgstr "关闭"
 
-#: ../mdkapplet:220
+#: ../mdkapplet:222
 #, fuzzy
 msgid "No check"
 msgstr "上次检查："
 
-#: ../mdkapplet:280
+#: ../mdkapplet:287
 msgid "About.."
 msgstr "关于..."
 
-#: ../mdkapplet:281
+#: ../mdkapplet:288
 msgid "Quit"
 msgstr "退出"
 
@@ -203,6 +203,11 @@ msgstr "请输入您的 MandrakeOnline 登录名, 密码和机器名:"
 msgid "Machine name:"
 msgstr "机器名:"
 
+#: ../mdkonline:138
+#, fuzzy
+msgid "Send Configuration"
+msgstr "配置"
+
 #: ../mdkonline:139
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
@@ -234,6 +239,10 @@ msgstr ""
 "到支持服务的付费折扣。\n"
 "最后，您还能得到一个 username@mandrakeonline.net 的电子邮件别名。"
 
+#: ../mdkonline:144 ../mdkonline:247 ../mdkonline:275
+msgid "Finish"
+msgstr "完成"
+
 #: ../mdkonline:145
 msgid ""
 "From now you will receive on security and updates \n"
@@ -338,10 +347,6 @@ msgstr "不是有效的电子邮件地址!\n"
 msgid "Sending configuration..."
 msgstr "正在发送配置..."
 
-#: ../mdkonline:247 ../mdkonline:275
-msgid "Finish"
-msgstr "完成"
-
 #: ../mdkonline:251 ../mdkonline:326 ../mdkupdate:77
 msgid "Connection problem"
 msgstr "连接问题"