Merge new strings

1 files changed, 231 insertions, 100 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6ceec329..d0293f61 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-03 13:52+0100\n"
+"POT-Creation-Date: 2005-01-06 15:42+0100\n"
 "PO-Revision-Date: 2004-04-17 21:32+0800\n"
 "Last-Translator: Hilbert <h@mandrake.org>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -84,6 +84,232 @@ msgstr " (Y/n) (是/否) "
 msgid "%s: command not found\n"
 msgstr "%s:找不到指令\n"
 
+#: ../gurpmi:99
+#, c-format
+msgid "Please wait..."
+msgstr ""
+
+#: ../gurpmi:110
+#, fuzzy, c-format
+msgid "Unknown option %s"
+msgstr ""
+"\n"
+"未知選項 '%s'\n"
+
+#: ../gurpmi:114
+#, fuzzy, c-format
+msgid "No packages specified"
+msgstr "沒有套件命名為 %s"
+
+#: ../gurpmi:118
+#, c-format
+msgid "Must be root"
+msgstr ""
+
+#: ../gurpmi:128
+#, fuzzy, c-format
+msgid "RPM installation"
+msgstr "套件安裝..."
+
+#: ../gurpmi:141
+#, fuzzy, c-format
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"你已經選擇一個來源套件:\n"
+"\n"
+"%s\n"
+"\n"
+"您大概不想安裝它於您的電腦上 (安裝它會允許您對它的原始碼做出更改\n"
+"然後編譯它).\n"
+"\n"
+"您想怎麼做?"
+
+#: ../gurpmi:149
+#, c-format
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"您正要安裝下列軟體套件於您的電腦上:\n"
+"\n"
+"%s\n"
+"\n"
+"您或許寧願只是儲存它. 您的選擇是什麼?"
+
+#: ../gurpmi:154
+#, fuzzy, c-format
+msgid ""
+"You are about to install the following software packages on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"Proceed?"
+msgstr ""
+"您正要安裝下列軟體套件於您的電腦上:\n"
+"\n"
+"%s\n"
+"\n"
+"您或許寧願只是儲存它. 您的選擇是什麼?"
+
+#: ../gurpmi:164
+#, fuzzy, c-format
+msgid "_Install"
+msgstr "安裝它"
+
+#: ../gurpmi:165
+#, c-format
+msgid "_Save"
+msgstr ""
+
+#: ../gurpmi:166 ../gurpmi:229
+#, fuzzy, c-format
+msgid "_Cancel"
+msgstr "取消"
+
+#: ../gurpmi:170
+#, c-format
+msgid "Choose location to save file"
+msgstr "選擇存檔的位置"
+
+#: ../gurpmi:220
+#, c-format
+msgid " (to upgrade)"
+msgstr ""
+
+#: ../gurpmi:221
+#, fuzzy, c-format
+msgid " (to install)"
+msgstr "為了要安裝 %s"
+
+#: ../gurpmi:225 ../urpmi:350
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "需要下列其中一個套件:"
+
+#: ../gurpmi:230 ../gurpmi:246
+#, fuzzy, c-format
+msgid "_Ok"
+msgstr "確定"
+
+#: ../gurpmi:247
+#, c-format
+msgid "_Abort"
+msgstr ""
+
+#: ../gurpmi:276
+#, fuzzy, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s\n"
+"Continue?"
+msgstr ""
+"某些要求的套件不能被安裝:\n"
+"%s"
+
+#: ../gurpmi:287
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s\n"
+"Continue?"
+msgstr ""
+"下列套件必須移除給其他套件來升級:\n"
+"%s"
+
+#: ../gurpmi:300
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be "
+"installed:\n"
+"%s\n"
+msgstr "為了滿足相依性, 下列套件將要被安裝. (%d MB)"
+
+#: ../gurpmi:307
+#, c-format
+msgid "Package installation..."
+msgstr "套件安裝..."
+
+#: ../gurpmi:309 ../urpmi:483 ../urpmq:302
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "無法取得原始碼套件, 放棄"
+
+#: ../gurpmi:323 ../urpmi:494
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "請將具有名稱 \"%s\" 的媒體放入到裝置 [%s] 內"
+
+#: ../gurpmi:350
+#, c-format
+msgid "Downloading package `%s'..."
+msgstr "正在下載套件 `%s'..."
+
+#: ../gurpmi:365
+#, fuzzy, c-format
+msgid ""
+"The following packages have bad signatures:\n"
+"%s\n"
+"\n"
+"Do you want to continue installation ?"
+msgstr "下列套件有壞的簽名"
+
+#: ../gurpmi:372 ../gurpmi:421 ../urpmi:556 ../urpmi:672
+#, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"安裝失敗, 某些檔案遺失:\n"
+"%s\n"
+"您或許要更新您的 urpmi 資料庫"
+
+#: ../gurpmi:379 ../urpme:111 ../urpmi:597
+#, c-format
+msgid "removing %s"
+msgstr "正在移除 %s"
+
+#: ../gurpmi:387 ../urpm.pm:2751
+#, c-format
+msgid "Preparing..."
+msgstr "準備中..."
+
+#: ../gurpmi:389
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "正在安裝套件 `%s' (%s/%s)..."
+
+#: ../gurpmi:407 ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
+#, c-format
+msgid "Installation failed"
+msgstr "安裝失敗"
+
+#: ../gurpmi:416
+#, c-format
+msgid "_Done"
+msgstr ""
+
+#: ../gurpmi:424 ../urpmi:688
+#, c-format
+msgid "The package(s) are already installed"
+msgstr "每一個東西都已經安裝了"
+
+#: ../gurpmi:426
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "安裝失敗"
+
 #: ../rpm-find-leaves:12
 #, c-format
 msgid ""
@@ -698,11 +924,6 @@ msgstr "不合格式的輸入:[%s]"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在由媒體 \"%s\" 擷取 rpm 檔案..."
 
-#: ../urpm.pm:2751
-#, c-format
-msgid "Preparing..."
-msgstr "準備中..."
-
 #: ../urpm.pm:2789
 #, c-format
 msgid "using process %d for executing transaction"
@@ -924,11 +1145,6 @@ msgstr "為了滿足相依性, 下列套件將會被移除 (%d MB)"
 msgid " (y/N) "
 msgstr " (y/N) (是/否) "
 
-#: ../urpme:111 ../urpmi:597
-#, c-format
-msgid "removing %s"
-msgstr "正在移除 %s"
-
 #: ../urpme:115
 #, c-format
 msgid "Removing failed"
@@ -1424,11 +1640,6 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:350
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "需要下列其中一個套件:"
-
 #: ../urpmi:353
 #, c-format
 msgid "What is your choice? (1-%d) "
@@ -1500,16 +1711,6 @@ msgstr ""
 "您需要為 root 以安裝下列相依性項目:\n"
 "%s\n"
 
-#: ../urpmi:483 ../urpmq:302
-#, c-format
-msgid "unable to get source packages, aborting"
-msgstr "無法取得原始碼套件, 放棄"
-
-#: ../urpmi:494
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "請將具有名稱 \"%s\" 的媒體放入到裝置 [%s] 內"
-
 #: ../urpmi:495
 #, c-format
 msgid "Press Enter when ready..."
@@ -1525,22 +1726,6 @@ msgstr "下列套件有壞的簽名"
 msgid "Do you want to continue installation ?"
 msgstr "您要繼續進行安裝嗎?"
 
-#: ../urpmi:556 ../urpmi:672
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"安裝失敗, 某些檔案遺失:\n"
-"%s\n"
-"您或許要更新您的 urpmi 資料庫"
-
-#: ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
-#, c-format
-msgid "Installation failed"
-msgstr "安裝失敗"
-
 #: ../urpmi:581
 #, c-format
 msgid "distributing %s"
@@ -1576,12 +1761,7 @@ msgstr "%d 安裝處理失敗"
 msgid "Installation is possible"
 msgstr "安裝為可能的"
 
-#: ../urpmi:688
-#, c-format
-msgid "The package(s) are already installed"
-msgstr "每一個東西都已經安裝了"
-
-#: ../urpmi:702
+#: ../urpmi:703
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新開始 urpmi"
@@ -1863,7 +2043,7 @@ msgstr "移除媒體 \"%s\""
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
-"Copyright (C) 2000-2004 Mandrakesoft.\n"
+"Copyright (C) 2000-2005 Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -2006,12 +2186,12 @@ msgstr "--list-nodes 只能夠與 --parallel 一同使用"
 msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpmq:401
+#: ../urpmq:399
 #, fuzzy, c-format
 msgid "No filelist found\n"
 msgstr "找不到全部的媒介清單"
 
-#: ../urpmq:411
+#: ../urpmq:409
 #, c-format
 msgid "No changelog found\n"
 msgstr ""
@@ -2026,29 +2206,6 @@ msgstr ""
 #~ "  --best-output  - 按照環境選擇最佳的界面:\n"
 #~ "                   X 或文字模式.\n"
 
-#~ msgid "Choose location to save file"
-#~ msgstr "選擇存檔的位置"
-
-#~ msgid ""
-#~ "You have selected a source package:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "You probably didn't want to install it on your computer (installing it\n"
-#~ "would allow you to make modifications to its sourcecode then compile "
-#~ "it).\n"
-#~ "\n"
-#~ "What would you like to do?"
-#~ msgstr ""
-#~ "你已經選擇一個來源套件:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "您大概不想安裝它於您的電腦上 (安裝它會允許您對它的原始碼做出更改\n"
-#~ "然後編譯它).\n"
-#~ "\n"
-#~ "您想怎麼做?"
-
 #~ msgid "Do nothing"
 #~ msgstr "不進行任何動作"
 
@@ -2058,38 +2215,12 @@ msgstr ""
 #~ msgid "Save file"
 #~ msgstr "儲存檔案"
 
-#~ msgid ""
-#~ "You are about to install the following software package on your "
-#~ "computer:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "You may prefer to just save it. What is your choice?"
-#~ msgstr ""
-#~ "您正要安裝下列軟體套件於您的電腦上:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "您或許寧願只是儲存它. 您的選擇是什麼?"
-
-#~ msgid "Install it"
-#~ msgstr "安裝它"
-
-#~ msgid "Package installation..."
-#~ msgstr "套件安裝..."
-
 #~ msgid "Initializing..."
 #~ msgstr "初始化中..."
 
 #~ msgid "do you agree ?"
 #~ msgstr "你同意嗎?"
 
-#~ msgid "Downloading package `%s'..."
-#~ msgstr "正在下載套件 `%s'..."
-
-#~ msgid "Installing package `%s' (%s/%s)..."
-#~ msgstr "正在安裝套件 `%s' (%s/%s)..."
-
 #~ msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 #~ msgstr "        %s%% of %s 完成, ETA = %s, 速度 = %s"