merge

1 files changed, 47 insertions, 64 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 858df30f..43d0da3b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-21 18:52+0100\n"
+"POT-Creation-Date: 2004-01-22 12:55+0100\n"
 "PO-Revision-Date: 2004-01-22 08:12+0800\n"
 "Last-Translator: Hilbert <h@mandrake.org>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -30,7 +30,8 @@ msgstr "Per Oyvind Karlsen"
 msgid ""
 "massive packages rebuilding and cleaning, Norwegian Bokmaal (nb) "
 "translation, i18n work, games"
-msgstr "大量套件重建與清理, Norwegian Bokmaal (nb) translation, i18n work, games"
+msgstr ""
+"大量套件重建與清理, Norwegian Bokmaal (nb) translation, i18n work, games"
 
 #: ../contributors.pl:12
 #, c-format
@@ -133,7 +134,8 @@ msgstr "Goetz Waschk"
 msgid ""
 "many multimedia packages (xine, mplayer, vlc, vcdimager), gnome-python, rox "
 "desktop"
-msgstr "許多多媒體套件 (xine, mplayer, vlc, vcdimager), gnome-python, rox desktop"
+msgstr ""
+"許多多媒體套件 (xine, mplayer, vlc, vcdimager), gnome-python, rox desktop"
 
 #: ../contributors.pl:21
 #, c-format
@@ -214,7 +216,7 @@ msgstr "自動登入"
 msgid "Backups"
 msgstr "備份"
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr "開機載入程式"
@@ -229,7 +231,7 @@ msgstr "開機佈景主題"
 msgid "Boot floppy"
 msgstr "開機軟片"
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, c-format
 msgid "Internet connection sharing"
 msgstr "網際網路連線共享"
@@ -284,7 +286,7 @@ msgstr "字型"
 msgid "Graphical server"
 msgstr "圖形伺服器"
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr "分割"
@@ -299,7 +301,7 @@ msgstr "硬體"
 msgid "Install"
 msgstr "安裝"
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr "鍵盤"
@@ -324,7 +326,7 @@ msgstr "選單"
 msgid "Monitor"
 msgstr "監視器"
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr "滑鼠"
@@ -389,7 +391,7 @@ msgstr "層級與檢查"
 msgid "Permissions"
 msgstr "權限"
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr "服務"
@@ -404,7 +406,7 @@ msgstr "媒體管理員"
 msgid "TV card"
 msgstr "電視卡"
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr "使用者與群組"
@@ -661,7 +663,7 @@ msgid ""
 "current one):"
 msgstr "要建立的型號名稱 (新的型號被建立為現在的型號之一副本):"
 
-#: ../control-center:369 ../control-center:402 ../control-center:528
+#: ../control-center:369 ../control-center:402 ../control-center:527
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -738,7 +740,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "請稍候..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr "上一頁"
@@ -865,66 +867,31 @@ msgstr "Mandrake 控制中心 %s\n"
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
 msgstr "版權所有 (C) 1999-2004 Mandrakesoft SA"
 
-#: ../control-center:996
+#: ../control-center:998
 #, c-format
 msgid "Authors"
 msgstr "作者"
 
-#: ../control-center:997
+#: ../control-center:999
 #, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Mandrake Linux 貢獻者"
 
 #: ../drakxconf:25
 #, c-format
-msgid "Display Configuration"
+msgid "Display"
 msgstr "顯示設定"
 
-#: ../drakxconf:26
-#, c-format
-msgid "KeyBoard Configuration"
-msgstr "鍵盤設定"
-
-#: ../drakxconf:27
-#, c-format
-msgid "Mouse Configuration"
-msgstr "滑鼠設定"
-
 #: ../drakxconf:28
 #, c-format
 msgid "Internet & Network"
 msgstr "網際網路 & 網路"
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr "新增使用者"
-
-#: ../drakxconf:30
-#, c-format
-msgid "Service Configuration"
-msgstr "服務設定"
-
-#: ../drakxconf:32
-#, c-format
-msgid "Boot Configuration"
-msgstr "開機設定"
-
 #: ../drakxconf:33
 #, c-format
 msgid "Auto Install"
 msgstr "自動安裝"
 
-#: ../drakxconf:34
-#, c-format
-msgid "Connection Sharing"
-msgstr "連線共享"
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr "磁碟分割"
-
 #: ../drakxconf:38
 #, c-format
 msgid "Control Center"
@@ -935,16 +902,6 @@ msgstr "控制中心"
 msgid "Choose the tool you want to use"
 msgstr "選取您想要使用的工具"
 
-#: ../gecko.pm:52
-#, c-format
-msgid "Next"
-msgstr "下一步"
-
-#: ../gecko.pm:60
-#, c-format
-msgid "Skip Wizard"
-msgstr "略過精靈"
-
 #: ../menus_launcher.pl:19 ../menus_launcher.pl:41
 #, c-format
 msgid "Menu Configuration Center"
@@ -991,6 +948,36 @@ msgstr "請點選這邊來設定列印系統"
 msgid "Done"
 msgstr "完成"
 
+#~ msgid "Display Configuration"
+#~ msgstr "顯示設定"
+
+#~ msgid "KeyBoard Configuration"
+#~ msgstr "鍵盤設定"
+
+#~ msgid "Mouse Configuration"
+#~ msgstr "滑鼠設定"
+
+#~ msgid "Add new users"
+#~ msgstr "新增使用者"
+
+#~ msgid "Service Configuration"
+#~ msgstr "服務設定"
+
+#~ msgid "Boot Configuration"
+#~ msgstr "開機設定"
+
+#~ msgid "Connection Sharing"
+#~ msgstr "連線共享"
+
+#~ msgid "Disk Partionning"
+#~ msgstr "磁碟分割"
+
+#~ msgid "Next"
+#~ msgstr "下一步"
+
+#~ msgid "Skip Wizard"
+#~ msgstr "略過精靈"
+
 #~ msgid "DrakAutoInst helps you produce an Auto Install floppy"
 #~ msgstr "DrakAutoInst 幫助您產生一自動安裝軟片"
 
@@ -1414,9 +1401,6 @@ msgstr "完成"
 #~ msgid "/Themes"
 #~ msgstr "/佈景主題 (_T)"
 
-#~ msgid "Display"
-#~ msgstr "顯示設定"
-
 #~ msgid "DrakConf: error"
 #~ msgstr "DrakConf：錯誤"
 
@@ -1645,4 +1629,3 @@ msgstr "完成"
 
 #~ msgid "/Mandrake_Campus"
 #~ msgstr "/Mandrake 校園 (_C)"
-