Updated POT file

1 files changed, 201 insertions, 228 deletions

diff --git a/perl-install/install/share/po/zh_TW.po b/perl-install/install/share/po/zh_TW.po
index cbb3d3b3d..0304325e4 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: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2008-10-01 10:02+0800\n"
 "Last-Translator: # You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 "Language-Team: Traditional Chinese <zh@li.org>\n"
@@ -32,31 +32,6 @@ 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?"
@@ -96,92 +71,92 @@ msgstr "網路 (FTP)"
 msgid "Network (NFS)"
 msgstr "網路 (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "映像站的 URL？"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL 開頭必須是 ftp:// 或 http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "正在連結到 Mandriva Linux 網站查詢可用的映射站台..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
 "mirrors"
 msgstr "無法連結到 Mandriva Linux 網站取得可用的映射站台"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "選取要用來抓取程式套件檔的 FTP 映射站台"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "設定 NFS"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "請輸入您的 NFS 媒介的主機和目錄名稱"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "沒有主機名稱"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "目錄必須以「/」開始"
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS 掛載點的主機名稱？"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "目錄"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "補充"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "無法在這個映像站上找到套件列表檔。請確定位址是正確的。"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "正在查看已經安裝過的套件..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "正在搜尋要升級的套件..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "移除套件以更新..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -198,18 +173,18 @@ msgstr ""
 "要升級為 KDE 3.5 並保留您的個人設定，請重新啟動您的系統\n"
 "並使用 Mandriva 更新軟體升級。"
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "重新開機"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "進行"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -222,72 +197,72 @@ msgstr ""
 "\n"
 "您確定要移除這些套件嗎？\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "讀取檔案 %s 時發生錯誤"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "下列磁碟已經改名："
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (原本為 %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "網路"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "請選擇一個媒介"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "檔案已經存在了。要覆蓋它嗎？"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "權限不足"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "錯誤的 NFS 名稱"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "損壞的媒介 %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "在尚未進行分割前無法提供畫面捕捉功能"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "在安裝後您可以於 %s 取得螢幕截圖"
@@ -298,11 +273,15 @@ msgid "Installation"
 msgstr "安裝"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "組態設定"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -327,22 +306,22 @@ msgstr "啟動網路"
 msgid "Bringing down the network"
 msgstr "關閉網路"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "請稍候，正在取回檔案"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "正在下載檔案 %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "正在複製一些程式套件到磁碟以供稍後使用"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "複製進行中"
@@ -386,27 +365,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "發生一個錯誤"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "有 %d 個安裝業務失敗"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "正在安裝套件 %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "工作站"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "辦公軟體平台"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -415,7 +394,7 @@ msgstr ""
 "辦公軟體：文書處理軟體 (OpenOffice.org Writer、Kword)、試算表 (OpenOffice."
 "org Calc、Kspread)、PDF 檢視器等等"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -424,262 +403,244 @@ msgstr ""
 "辦公軟體：文書處理軟體 (kword、abiword)、試算表 (kspread、gnumeric)、PDF 檢視"
 "器等等"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "遊戲平台"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "娛樂的一些程式：紙牌、益智、動作、策略等"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "多媒體平台"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "音效以及影像撥放編輯程式"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "網際網路平台"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "包含讀信、寄信和閱讀新聞群組 (mutt、tin ..) 以及網路瀏覽的工具"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "網路電腦 (客戶端)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "包含 ssh 等其他不同通訊協定的用戶端程式"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "讓您方便設定您系統的工具"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Console 工具"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "編輯器、shell、檔案工具、終端機"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "程式開發"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C/C++ 發展環境，包含編譯器、程式庫與及一些引入檔"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "文件檔案"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Linux 系統與自由軟體的書籍、HOWTO 文件"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "LSB 的支援，包含第三類協力廠商軟體支援"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "網頁伺服器 (Web)"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "群組軟體"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab 伺服器"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "防火牆/路由器"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "網際網路閘道器"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "郵件/新聞"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix 郵件伺服器，Inn 新聞伺服器"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "目錄伺服器"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP 伺服器"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "網域名稱與網路資訊伺服器"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "檔案與列印分享伺服器"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS 伺服器、Samba 伺服器"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "資料庫軟體"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL 與 MySQL 資料庫伺服器"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache、ProFTPD"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "電子郵件"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix 郵件伺服器"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL、MySQL 資料庫"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "網路伺服器"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS 伺服器、SMB 伺服器、Proxy 伺服器、SSH 伺服器"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "圖形環境"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE 工作站"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "K 桌面環境，包含許多好用的圖型介面工具程式"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME 工作站"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "包含友善的應用程式、桌面軟體的圖型化使用環境"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE 桌面"
@@ -691,54 +652,52 @@ msgid ""
 "applications and desktop tools"
 msgstr "包含友善的應用程式、桌面軟體的圖型化使用環境"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "其他圖型桌面軟體"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker、Enlightenment、Fvwm 等"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "工具軟體"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH 伺服主機"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin 遠端設定伺服器"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "網路工具/監控"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "監控工具、程序管理、tcpdump、nmap..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva 精靈"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "用來設定伺服器的精靈"
@@ -836,17 +795,17 @@ msgstr "這是 '%s' 桌面的預覽。"
 msgid "Click on images in order to see a bigger preview"
 msgstr "在影像上點選以觀看較大的預覽畫面"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "套件群組選擇"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "單一套件選取"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "總共大小： %d / %d MB"
@@ -963,12 +922,12 @@ msgstr "最小安裝"
 msgid "Software Management"
 msgstr "軟體套件管理"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "選擇您想要安裝的套件"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "正在安裝"
@@ -994,7 +953,7 @@ msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d 個套件"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "總結"
@@ -1004,7 +963,7 @@ msgstr "總結"
 msgid "Configure"
 msgstr "設定"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "未被設定"
@@ -1014,7 +973,7 @@ msgstr "未被設定"
 msgid "Media Selection"
 msgstr "選擇安裝媒介"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1023,7 +982,7 @@ msgstr ""
 "已經找到下列的安裝媒介。\n"
 "如果您想略過它們，您現在可以將它們取消選取。"
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1034,7 +993,7 @@ msgstr ""
 "您可以選擇在安裝前先將光碟的內容複製到硬碟。\n"
 "接著將會由硬碟繼續安裝，而且這些套件在安裝完畢之後仍然可以繼續使用。"
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "複製整張光碟"
@@ -1054,59 +1013,49 @@ msgstr "請選取鍵盤排列的樣式。"
 msgid "Here is the full list of available keyboards:"
 msgstr "以下是所有可用的鍵盤清單："
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "安裝/升級"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "這是安裝或是升級？"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "安裝"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "升級 %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "不支援從 32 位元升級至 64 位元的發行版"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "不支援從 64 位元升級至 32 位元的發行版"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "加密金鑰於 %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "取消安裝，重新開機"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "新的安裝"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "升級之前的安裝 (不建議)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1123,17 +1072,17 @@ msgstr ""
 "\n"
 "警告：您應該在選擇「新的安裝」之前先備份所有個人資料。"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "正在設定 IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1142,7 +1091,7 @@ msgstr ""
 "沒有足夠的可用空間安裝 bootstrap！安裝還是會繼續，但是您必須在 DiskDrake\n"
 "中建立 bootstrap 分割來啟動您的系統"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1152,7 +1101,7 @@ msgstr ""
 "您需要建立一個 PPC PReP 開機 bootstrap！安裝還是會繼續，但是您必須在 "
 "DiskDrake 中建立 bootstrap 分割來啟動您的系統"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1164,19 +1113,19 @@ msgstr ""
 "請插入標示為 \"%s\" 的光碟於您的光碟機中，完成後請按下確定。\n"
 "若是您沒有這片光碟，請點選取消以略過這一片光碟的安裝。"
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "正在搜尋可以用的套件..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr "您的系統剩餘的空間不足以安裝或升級 (%dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1185,52 +1134,52 @@ msgstr ""
 "請選擇要載入或者儲存套件選擇到磁片上。\n"
 "它使用與自動安裝所產生的磁片相同的格式。"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "載入"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "儲存"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "損壞的檔案"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "桌面環境選擇"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "您可以選擇您工作站的桌面環境："
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "所選取的大小超過可用的空間"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "安裝類型"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1239,82 +1188,82 @@ msgstr ""
 "您並未選取任何套件群組。\n"
 "請選擇您想要的最小安裝："
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "包含 X 環境"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "包含基本的說明文件 (建議的！)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "真正最小安裝 (尤其無 urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "正在準備安裝"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "正在安裝套件 %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "排列套件時發生錯誤："
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "無論如何都要繼續嗎？"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "重試"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "略過這個套件"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "略過所有 %s 媒體的套件"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "回到媒體與套件選擇"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "安裝 %s 套件時發生錯誤。"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "安裝後的設定"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "請確定更新模組媒介位於磁碟機 %s 中"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "更新"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1333,95 +1282,95 @@ msgstr ""
 "\n"
 "您想要安裝更新嗎？"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s 上的 %1$s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "硬體"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "音效卡"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "您有 ISA 音效卡嗎？"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "請在安裝完畢後，執行 \"alsaconf\" 或 \"sndconfig\" 來設定您的音效卡"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "沒偵測到任何音效卡。請在安裝後嘗試 \"harddrake\" 進行設定"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "圖形介面"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "網路與網際網路"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "代理伺服器"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "已設定"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "安全層級"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "防火牆"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "已啟用"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "已停用"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "您尚未設定 X。您確定您真的要這樣做？"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "正在準備開機載入程式..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "請耐心等候，這要花一些時間..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1434,24 +1383,24 @@ msgstr ""
 "安裝還是會繼續下去，不過您將需要使用 bootX 或某些其他方法來啟動您的機器。"
 "root fs 的核心參數是：root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr "在這個安全層級中，只有管理者能夠存取位於 Windows 分割區的檔案。"
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "請在 %s 中插入一片空白磁片"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "正在製作自動安裝磁片..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1462,7 +1411,7 @@ msgstr ""
 "\n"
 "您確定要結束安裝程式？"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "恭喜"
@@ -1605,3 +1554,27 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "離開"
+
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "您的桌面就在 USB 隨身碟中"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% 開放原始碼的 Mandriva Linux 發行版"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "利用 Mandriva One 方便地探索 Linux"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "完整的 Mandriva Linux 桌面，包含技術支援"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva：適合所有人需求的發行版"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "正在下載檔案 %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "不支援從 32 位元升級至 64 位元的發行版"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "不支援從 64 位元升級至 32 位元的發行版"