merge

1 files changed, 28 insertions, 23 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6b8c99bf..1f25736b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-zh_TW\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: 2003-11-30 19:38+0800\n"
 "Last-Translator: hilbert <freehil@yahoo.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -73,75 +73,75 @@ msgstr ""
 msgid "Configure Now!"
 msgstr "正在讀取組態設定\n"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:123
 msgid "Mandrake Updates Applet"
 msgstr ""
 
-#: ../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
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:280
+#: ../mdkapplet:287
 msgid "About.."
 msgstr ""
 
-#: ../mdkapplet:281
+#: ../mdkapplet:288
 msgid "Quit"
 msgstr "結束"
 
@@ -213,6 +213,11 @@ msgstr "請輸入您在 MandrakeOnline 上的帳號 ID 與密碼"
 msgid "Machine name:"
 msgstr "機器名稱："
 
+#: ../mdkonline:138
+#, fuzzy
+msgid "Send Configuration"
+msgstr "正在讀取組態設定\n"
+
 #: ../mdkonline:139
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
@@ -249,6 +254,10 @@ msgstr ""
 "當整個步驟都完成後，Mandrake 將回提供一個 username@mandrakeonline.net\n"
 "的使用者帳好提供給您使用。"
 
+#: ../mdkonline:144 ../mdkonline:247 ../mdkonline:275
+msgid "Finish"
+msgstr "完成"
+
 #: ../mdkonline:145
 msgid ""
 "From now you will receive on security and updates \n"
@@ -351,10 +360,6 @@ msgstr ""
 msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:247 ../mdkonline:275
-msgid "Finish"
-msgstr "完成"
-
 #: ../mdkonline:251 ../mdkonline:326 ../mdkupdate:77
 msgid "Connection problem"
 msgstr "連線問題"