sync with code

1 files changed, 67 insertions, 85 deletions

diff --git a/perl-install/install/share/po/zh_TW.po b/perl-install/install/share/po/zh_TW.po
index af1696801..38b0a861c 100644
--- a/perl-install/install/share/po/zh_TW.po
+++ b/perl-install/install/share/po/zh_TW.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-02 16:49+0200\n"
+"POT-Creation-Date: 2008-09-11 18:46+0200\n"
 "PO-Revision-Date: 2008-08-07 09:00+0800\n"
 "Last-Translator: # You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 "Language-Team: Traditional Chinese <zh@li.org>\n"
@@ -32,6 +32,31 @@ msgstr ""
 "X-Poedit-Country: TAIWAN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ../../advertising/IM_flash.pl:1
+#, c-format
+msgid "Your desktop on a USB key"
+msgstr "您的桌面就在 USB 隨身碟中"
+
+#: ../../advertising/IM_free09.pl:1
+#, c-format
+msgid "The 100%% open source Mandriva Linux distribution"
+msgstr "100%% 開放原始碼的 Mandriva Linux 發行版"
+
+#: ../../advertising/IM_one09.pl:1
+#, c-format
+msgid "Explore Linux easily with Mandriva One"
+msgstr "利用 Mandriva One 方便地探索 Linux"
+
+#: ../../advertising/IM_pwp09.pl:1
+#, c-format
+msgid "A full Mandriva Linux desktop, with support"
+msgstr "完整的 Mandriva Linux 桌面，包含技術支援"
+
+#: ../../advertising/IM_range09.pl:1
+#, c-format
+msgid "Mandriva: distributions for everybody's needs"
+msgstr "Mandriva: 適合所有人需求的發行版"
+
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -953,17 +978,17 @@ msgstr "複製整張光碟"
 msgid "An error occurred"
 msgstr "發生一個錯誤"
 
-#: steps_interactive.pm:98
-#, c-format
-msgid "Here is the full list of available keyboards"
-msgstr "以下是所有可用的的鍵盤"
-
 #: steps_interactive.pm:102
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "請選取鍵盤排列的樣式。"
 
-#: steps_interactive.pm:135
+#: steps_interactive.pm:105
+#, c-format
+msgid "Here is the full list of available keyboards"
+msgstr "以下是所有可用的的鍵盤"
+
+#: steps_interactive.pm:136
 #, c-format
 msgid "Install/Upgrade"
 msgstr "安裝/升級"
@@ -980,22 +1005,12 @@ msgid ""
 "Install"
 msgstr "安裝"
 
-#: steps_interactive.pm:140
+#: steps_interactive.pm:144
 #, c-format
 msgid "Upgrade %s"
 msgstr "升級 %s"
 
-#: steps_interactive.pm:144
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "不支援從 32 位元升級至 64 位元的發行版"
-
-#: steps_interactive.pm:148
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "不支援從 64 位元升級至 32 位元的發行版"
-
-#: steps_interactive.pm:167
+#: steps_interactive.pm:162
 #, c-format
 msgid "Encryption key for %s"
 msgstr "加密金鑰於 %s"
@@ -1242,17 +1257,7 @@ msgstr ""
 "\n"
 "您想要安裝更新嗎？"
 
-#: steps_interactive.pm:768
-#, c-format
-msgid "Contacting the mirror to get the list of available packages..."
-msgstr "聯繫映射站台以取得可用的程式套件列表..."
-
-#: steps_interactive.pm:774
-#, c-format
-msgid "Unable to contact mirror %s"
-msgstr "無法聯繫映射站台 %s"
-
-#: steps_interactive.pm:879
+#: steps_interactive.pm:849
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s 上的 %1$s"
@@ -1386,41 +1391,6 @@ msgstr "恭喜"
 msgid "Reboot"
 msgstr "重新開機"
 
-#: steps_interactive.pm:1151 steps_interactive.pm:1152
-#, c-format
-msgid "Generate auto install floppy"
-msgstr "製作自動安裝磁片"
-
-#: steps_interactive.pm:1153
-#, c-format
-msgid ""
-"The auto install can be fully automated if wanted,\n"
-"in that case it will take over the hard drive!!\n"
-"(this is meant for installing on another box).\n"
-"\n"
-"You may prefer to replay the installation.\n"
-msgstr ""
-"需要的話，自動安裝可以完全自動化的安裝系統，在這種\n"
-"情況下它將接管硬碟！\n"
-"(這是設計來安裝於另一台機器上的)。\n"
-"\n"
-"您可以重演安裝過程。\n"
-
-#: steps_interactive.pm:1158
-#, c-format
-msgid "Replay"
-msgstr "重播"
-
-#: steps_interactive.pm:1158
-#, c-format
-msgid "Automated"
-msgstr "自動化"
-
-#: steps_interactive.pm:1161
-#, c-format
-msgid "Save packages selection"
-msgstr "儲存套件選擇"
-
 #. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
 #: steps_list.pm:16
 #, c-format
@@ -1560,30 +1530,42 @@ msgid ""
 "Exit"
 msgstr "離開"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "您的桌面就在 USB 隨身碟中"
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "不支援從 32 位元升級至 64 位元的發行版"
 
-#: ../../advertising/IM_free08S.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% 開放原始碼的 Mandriva Linux 發行版"
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "不支援從 64 位元升級至 32 位元的發行版"
 
-#: ../../advertising/IM_one08S.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "利用 Mandriva One 方便地探索 Linux"
+#~ msgid "Contacting the mirror to get the list of available packages..."
+#~ msgstr "聯繫映射站台以取得可用的程式套件列表..."
 
-#: ../../advertising/IM_pwp08S.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "完整的 Mandriva Linux 桌面，包含技術支援"
+#~ msgid "Unable to contact mirror %s"
+#~ msgstr "無法聯繫映射站台 %s"
 
-#: ../../advertising/IM_range08S.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: 適合所有人需求的發行版"
+#~ msgid "Generate auto install floppy"
+#~ msgstr "製作自動安裝磁片"
+
+#~ msgid ""
+#~ "The auto install can be fully automated if wanted,\n"
+#~ "in that case it will take over the hard drive!!\n"
+#~ "(this is meant for installing on another box).\n"
+#~ "\n"
+#~ "You may prefer to replay the installation.\n"
+#~ msgstr ""
+#~ "需要的話，自動安裝可以完全自動化的安裝系統，在這種\n"
+#~ "情況下它將接管硬碟！\n"
+#~ "(這是設計來安裝於另一台機器上的)。\n"
+#~ "\n"
+#~ "您可以重演安裝過程。\n"
+
+#~ msgid "Replay"
+#~ msgstr "重播"
+
+#~ msgid "Automated"
+#~ msgstr "自動化"
+
+#~ msgid "Save packages selection"
+#~ msgstr "儲存套件選擇"
 
 #~ msgid "Do you want to use aboot?"
 #~ msgstr "您要使用 aboot 嗎？"