sync with code

1 files changed, 85 insertions, 76 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3d34aff2..ad527a00 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
 "PO-Revision-Date: 2013-04-11 15:16+0800\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -73,7 +73,7 @@ msgstr "正在安裝套件 `%s' (%s/%s)..."
 msgid "Downloading package `%s'..."
 msgstr "正在下載套件 `%s'..."
 
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -85,22 +85,22 @@ msgstr "取消"
 msgid "...retrieving failed: %s"
 msgstr "...擷取失敗：%s"
 
-#: ../gurpmi:45
+#: ../gurpmi:49
 #, c-format
 msgid "RPM installation"
 msgstr "RPM 套件安裝"
 
-#: ../gurpmi:59
+#: ../gurpmi:63
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "錯誤：無法找到檔案 %s，作業將取消"
 
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
 #, c-format
 msgid "_Ok"
 msgstr "確定 (_O)"
 
-#: ../gurpmi:80
+#: ../gurpmi:84
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "您想怎麼做？"
 
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -136,7 +136,7 @@ msgstr ""
 "\n"
 "要繼續嗎？"
 
-#: ../gurpmi:94
+#: ../gurpmi:98
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -151,26 +151,31 @@ msgstr ""
 "\n"
 "您或許傾向儲存而非安裝它。您的選擇是什麼？"
 
-#: ../gurpmi:112
+#: ../gurpmi:116
 #, c-format
 msgid "_Install"
 msgstr "安裝 (_I)"
 
-#: ../gurpmi:113
+#: ../gurpmi:117
 #, c-format
 msgid "_Save"
 msgstr "儲存 (_S)"
 
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
 #, c-format
 msgid "_Cancel"
 msgstr "取消 (_C)"
 
-#: ../gurpmi:122
+#: ../gurpmi:126
 #, c-format
 msgid "Choose location to save file"
 msgstr "選擇存檔的位置"
 
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "確定"
+
 #: ../gurpmi.pm:56
 #, c-format
 msgid "Options:"
@@ -248,17 +253,17 @@ msgstr "  --searchmedia  - 只使用指定的媒體來搜尋需要的套件。\n
 msgid "No packages specified"
 msgstr "未指定套件"
 
-#: ../gurpmi2:42
+#: ../gurpmi2:46
 #, c-format
 msgid "Must be root"
 msgstr "必須擁有管理者權限"
 
-#: ../gurpmi2:72
+#: ../gurpmi2:76
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "正在準備套件安裝..."
 
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -267,7 +272,7 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../gurpmi2:95
+#: ../gurpmi2:99
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -278,42 +283,37 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:115
+#: ../gurpmi2:119
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "確定"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
 #, c-format
 msgid " (to upgrade)"
 msgstr " (升級用)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:170
 #, c-format
 msgid " (to install)"
 msgstr " (安裝用)"
 
-#: ../gurpmi2:169
+#: ../gurpmi2:173
 #, c-format
 msgid "Package choice"
 msgstr "套件選擇"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:174
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列套件之一："
 
-#: ../gurpmi2:200
+#: ../gurpmi2:204
 #, c-format
 msgid "_Abort"
 msgstr "放棄 (_A)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:239
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -324,60 +324,60 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "將使用 %s 額外磁碟空間。"
 
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "將釋放 %s 磁碟空間。"
 
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "將取得 %s 軟體套件。"
 
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "繼續安裝這 %d 個套件？"
 
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "為了滿足相依性，將會安裝下列套件："
 
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "為了滿足相依性，將會一併安裝下列套件："
 
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "無法取得原始碼套件，放棄"
 
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "請置入名為 \"%s\" 的媒體"
 
-#: ../gurpmi2:303
+#: ../gurpmi2:307
 #, c-format
 msgid "An error occurred:"
 msgstr ""
 
-#: ../gurpmi2:315
+#: ../gurpmi2:319
 #, c-format
 msgid "_Done"
 msgstr "完成 (_D)"
 
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -386,27 +386,27 @@ msgstr ""
 "安裝失敗，某些檔案遺失：\n"
 "%s"
 
-#: ../gurpmi2:335
+#: ../gurpmi2:339
 #, c-format
 msgid "You may want to update your urpmi database."
 msgstr "您可能需要更新您的 urpmi 資料庫。"
 
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
 #, c-format
 msgid "Installation failed:"
 msgstr "安裝失敗；"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:348
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../gurpmi2:346
+#: ../gurpmi2:350
 #, c-format
 msgid "Installation finished"
 msgstr "安裝完畢"
 
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新啟動 urpmi"
@@ -480,7 +480,7 @@ msgstr "無法下載套件至 %s"
 msgid "Environment directory %s does not exist"
 msgstr "環境目錄 %s 不存在"
 
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "正在 %s 上使用特定的環境\n"
@@ -535,62 +535,62 @@ msgstr "註冊本地端套件錯誤"
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "使用限制模式執行時禁止該操作程序"
 
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令列傳入的代理伺服器宣告錯誤\n"
 
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq：無法讀取 rpm 檔案 \"%s\"\n"
 
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
 #, c-format
 msgid "unexpected expression %s"
 msgstr "未預期的表示式 %s"
 
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
 #, c-format
 msgid "missing expression before %s"
 msgstr "在 %s 前找不到表示式"
 
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "非預期的表示式 %s（建議：使用 -a 或 -o？）"
 
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "樣版表示式：\n"
 
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "預設 urpmf 需要正規表示式。您應該使用 \"--literal\" 選項"
 
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目錄不存在"
 
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "使用 %s 時不能沒有 %s"
 
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s 不能跟 %s 一起用"
 
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
 #, c-format
 msgid "Too many arguments\n"
 msgstr "參數太多\n"
 
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
 #, c-format
 msgid ""
 "%s version %s\n"
@@ -606,7 +606,7 @@ msgstr ""
 "\n"
 "用法：\n"
 
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s by %s"
@@ -653,7 +653,7 @@ msgstr "無法讀取設定檔 [%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "媒體 '%s' 被定義了兩次，正在取消"
 
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "無法寫入設定檔 [%s]"
@@ -1341,8 +1341,8 @@ msgstr "硬體架構"
 
 #: ../urpm/msg.pm:170
 #, c-format
-msgid "(suggested)"
-msgstr "(建議)"
+msgid "(recommended)"
+msgstr ""
 
 #: ../urpm/msg.pm:185
 #, c-format
@@ -1985,9 +1985,9 @@ msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 原始碼套件名稱\n"
 
 #: ../urpmf:75
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - 建議標籤\n"
+#, fuzzy, c-format
+msgid "  --recommends   - recommends tags\n"
+msgstr "  --requires     - 需要標籤\n"
 
 #: ../urpmf:76
 #, c-format
@@ -2014,27 +2014,27 @@ msgstr "  -m             - 這個套件被找到的媒介\n"
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 顯示版本、發行編號與平台。\n"
 
-#: ../urpmf:148
+#: ../urpmf:149
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "樣版表示式：\n"
 
-#: ../urpmf:193
+#: ../urpmf:194
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式錯誤：您只能使用一個多值標籤"
 
-#: ../urpmf:286
+#: ../urpmf:287
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 hdlist"
 
-#: ../urpmf:293
+#: ../urpmf:294
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 synthesis"
 
-#: ../urpmf:302
+#: ../urpmf:303
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 xml-info"
@@ -2060,8 +2060,8 @@ msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr ""
 
 #: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid "  --no-recommends - do not auto select \"recommended\" packages.\n"
 msgstr "  --no-suggests  - 不要自動選取 \"建議的\" 套件。\n"
 
 #: ../urpmi:81
@@ -2158,8 +2158,8 @@ msgstr ""
 "                   性。\n"
 
 #: ../urpmi:105
-#, c-format
-msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid "  --allow-recommends - auto select \"recommended\" packages.\n"
 msgstr "  --allow-suggests - 自動選取 \"建議的\" 套件。\n"
 
 #: ../urpmi:109
@@ -2959,9 +2959,9 @@ msgid "  --requires     - print requires.\n"
 msgstr "  --requires     - 顯示需求。\n"
 
 #: ../urpmq:84
-#, c-format
-msgid "  --suggests     - print suggests.\n"
-msgstr "  --suggests     - 顯示建議。\n"
+#, fuzzy, c-format
+msgid "  --recommends   - print recommends.\n"
+msgstr "  --requires     - 顯示需求。\n"
 
 #: ../urpmq:85
 #, c-format
@@ -3122,6 +3122,15 @@ msgstr ""
 msgid "Authentication is required to run Mageia Package Installer"
 msgstr ""
 
+#~ msgid "(suggested)"
+#~ msgstr "(建議)"
+
+#~ msgid "  --suggests     - suggests tags\n"
+#~ msgstr "  --suggests     - 建議標籤\n"
+
+#~ msgid "  --suggests     - print suggests.\n"
+#~ msgstr "  --suggests     - 顯示建議。\n"
+
 #~ msgid "(%d package, %d MB)"
 #~ msgid_plural "(%d packages, %d MB)"
 #~ msgstr[0] "(%d 個套件，共 %d MB)"