sync with code

1 files changed, 338 insertions, 344 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index c8896f2c..ed6ee02e 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: 2012-09-01 01:15+0200\n"
+"POT-Creation-Date: 2012-09-01 19:38+0200\n"
 "PO-Revision-Date: 2008-11-01 10:40+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -119,59 +119,37 @@ msgstr "取消 (_C)"
 msgid "Choose location to save file"
 msgstr "選擇存檔的位置"
 
-#: ../gurpmi.pm:39 ../urpmi:66
-#, c-format
-msgid ""
-"%s version %s\n"
-"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"%s 版本號 %s\n"
-"%s\n"
-"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
-"\n"
-"用法：\n"
-
-#: ../gurpmi.pm:44 ../urpme:47 ../urpme:48 ../urpmf:35 ../urpmf:36 ../urpmi:72
-#: ../urpmi:73 ../urpmi.recover:34 ../urpmq:46 ../urpmq:47
-#, c-format
-msgid "Copyright (C) %s by %s"
-msgstr "Copyright (C) %s by %s"
-
-#: ../gurpmi.pm:46
+#: ../gurpmi.pm:41
 #, c-format
 msgid "Options:"
 msgstr "選項："
 
-#: ../gurpmi.pm:47 ../urpme:49 ../urpmf:38 ../urpmi:74 ../urpmi.addmedia:55
-#: ../urpmi.recover:35 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../gurpmi.pm:42 ../urpme:42 ../urpmf:30 ../urpmi:67 ../urpmi.addmedia:55
+#: ../urpmi.recover:29 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:41
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 顯示此說明訊息。\n"
 
-#: ../gurpmi.pm:48 ../urpmi:81
+#: ../gurpmi.pm:43 ../urpmi:74
 #, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr "  --auto         - 非互動式模式，對問題使用預設的回答。\n"
 
-#: ../gurpmi.pm:49 ../urpmi:82 ../urpmq:55
+#: ../gurpmi.pm:44 ../urpmi:75 ../urpmq:48
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自動選擇要用來升級系統的套件。\n"
 
-#: ../gurpmi.pm:50 ../urpme:53 ../urpmi:105 ../urpmq:71
+#: ../gurpmi.pm:45 ../urpme:46 ../urpmi:98 ../urpmq:64
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 即使某些套件不存在仍然強制執行。\n"
 
-#: ../gurpmi.pm:51 ../urpmi:136
+#: ../gurpmi.pm:46 ../urpmi:129
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -180,40 +158,40 @@ msgstr ""
 "  --verify-rpm   - 安裝前檢驗 RPM 檔案的簽章。\n"
 "                   (--no-verify-rpm 會停用它，預設值為啟用)。\n"
 
-#: ../gurpmi.pm:53 ../urpmf:44 ../urpmi:75 ../urpmq:50
+#: ../gurpmi.pm:48 ../urpmf:36 ../urpmi:68 ../urpmq:43
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用給定的媒體，不同媒體間請以逗號分隔。\n"
 
-#: ../gurpmi.pm:54 ../urpmi:153
+#: ../gurpmi.pm:49 ../urpmi:146
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允許於 provides 中搜尋套件。\n"
 
-#: ../gurpmi.pm:55 ../urpmi:154
+#: ../gurpmi.pm:50 ../urpmi:147
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 中搜尋套件。\n"
 
-#: ../gurpmi.pm:56 ../urpmi:112 ../urpmq:74
+#: ../gurpmi.pm:51 ../urpmi:105 ../urpmq:67
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一個根目錄進行 RPM 套件的安裝。\n"
 
-#: ../gurpmi.pm:57 ../urpmi:138
+#: ../gurpmi.pm:52 ../urpmi:131
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - 僅確認安裝是否能夠正確完成。\n"
 
-#: ../gurpmi.pm:58 ../urpmi:78
+#: ../gurpmi.pm:53 ../urpmi:71
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --searchmedia  - 只使用指定的媒體來搜尋需要的套件。\n"
 
-#: ../gurpmi.pm:101
+#: ../gurpmi.pm:96
 #, c-format
 msgid "No packages specified"
 msgstr "未指定套件"
@@ -243,7 +221,7 @@ msgstr "套件安裝"
 msgid "Preparing packages installation..."
 msgstr "正在準備套件安裝..."
 
-#: ../gurpmi2:113 ../urpmi:512
+#: ../gurpmi2:113 ../urpmi:505
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -309,13 +287,13 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:277 ../urpmi:612
+#: ../gurpmi2:277 ../urpmi:605
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "為了滿足相依性，將會安裝下列套件："
 
-#: ../gurpmi2:278 ../urpmi:613
+#: ../gurpmi2:278 ../urpmi:606
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -342,7 +320,7 @@ msgstr "準備中..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../gurpmi2:344 ../urpmi:640
+#: ../gurpmi2:344 ../urpmi:633
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "請置入名為 \"%s\" 的媒體"
@@ -393,12 +371,12 @@ msgstr "每個套件都已經安裝了"
 msgid "Installation finished"
 msgstr "安裝完畢"
 
-#: ../gurpmi2:419 ../urpme:172
+#: ../gurpmi2:419 ../urpme:165
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../gurpmi2:430 ../urpmi:698
+#: ../gurpmi2:430 ../urpmi:691
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新啟動 urpmi"
@@ -437,7 +415,7 @@ msgstr "                    預設為 %s。\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - 輸出 RPM 的完整名稱 (NVRA)\n"
 
-#: ../rurpmi:11 ../urpmi:272
+#: ../rurpmi:11 ../urpmi:265
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只有擁有管理者權限的使用者才能安裝套件"
@@ -472,7 +450,7 @@ msgstr "無法下載套件至 %s"
 msgid "Environment directory %s does not exist"
 msgstr "環境目錄 %s 不存在"
 
-#: ../urpm.pm:151 ../urpmf:251 ../urpmq:170
+#: ../urpm.pm:151 ../urpmf:243 ../urpmq:163
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "正在 %s 上使用特定的環境\n"
@@ -572,7 +550,7 @@ msgstr "chroot 目錄不存在"
 msgid "Can't use %s without %s"
 msgstr "使用 %s 時不能沒有 %s"
 
-#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:162
+#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:155
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s 不能跟 %s 一起用"
@@ -582,7 +560,28 @@ msgstr "%s 不能跟 %s 一起用"
 msgid "Too many arguments\n"
 msgstr "參數太多\n"
 
-#: ../urpm/bug_report.pm:67 ../urpmi:262
+#: ../urpm/args.pm:523
+#, c-format
+msgid ""
+"%s version %s\n"
+"%s\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"%s 版本號 %s\n"
+"%s\n"
+"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
+"\n"
+"用法：\n"
+
+#: ../urpm/args.pm:529
+#, c-format
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s by %s"
+
+#: ../urpm/bug_report.pm:67 ../urpmi:255
 #, c-format
 msgid "Copying failed"
 msgstr "複製失敗"
@@ -1269,7 +1268,7 @@ msgstr "找到 geolocalisation %s %.2f %.2f，於時區 %s"
 msgid "getting mirror list from %s"
 msgstr "正由 %s 取得鏡像站列表"
 
-#: ../urpm/msg.pm:76 ../urpmi:498 ../urpmi:516 ../urpmi:632
+#: ../urpm/msg.pm:76 ../urpmi:491 ../urpmi:509 ../urpmi:625
 #, c-format
 msgid "Nn"
 msgstr "Nn否"
@@ -1280,7 +1279,7 @@ msgstr "Nn否"
 msgid "Yy"
 msgstr "Yy是"
 
-#: ../urpm/msg.pm:107 ../urpme:166 ../urpmi.addmedia:136
+#: ../urpm/msg.pm:107 ../urpme:159 ../urpmi.addmedia:136
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) (是/否) "
@@ -1475,7 +1474,7 @@ msgstr "urpmi 已經重新啟動，套件的優先順序列表發生改變：%s
 msgid "No package named %s"
 msgstr "沒有套件命名為 %s"
 
-#: ../urpm/select.pm:219 ../urpme:120
+#: ../urpm/select.pm:219 ../urpme:113
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "以下套件包含 %s：%s"
@@ -1618,69 +1617,53 @@ msgstr "無法開啟檔案"
 msgid "Can't move file %s to %s"
 msgstr "無法移動檔案 %s 至 %s"
 
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme 版本號 %s\n"
-"%s\n"
-"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
-"\n"
-"用法：\n"
-
-#: ../urpme:50
+#: ../urpme:43
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自動選擇套件。\n"
 
-#: ../urpme:51
+#: ../urpme:44
 #, c-format
 msgid "  --auto-orphans - remove orphans\n"
 msgstr ""
 
-#: ../urpme:52
+#: ../urpme:45
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 確認刪除是否能夠正確進行。\n"
 
-#: ../urpme:54 ../urpmi:111 ../urpmq:73
+#: ../urpme:47 ../urpmi:104 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在同步管理的機器上分散式的執行 urpmi。\n"
 
-#: ../urpme:55 ../urpmi:145
+#: ../urpme:48 ../urpmi:138
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - 在移除前重新打包檔案\n"
 
-#: ../urpme:56
+#: ../urpme:49
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一個根目錄移除 rpm 套件。\n"
 
-#: ../urpme:57 ../urpmf:43 ../urpmi:113 ../urpmi.addmedia:73
-#: ../urpmi.recover:38 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:75
+#: ../urpme:50 ../urpmf:35 ../urpmi:106 ../urpmi.addmedia:73
+#: ../urpmi.recover:32 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:68
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr "  --urpmi-root   - 使用另一個根目錄存放 urpmi 資料庫與 RPM 的安裝。\n"
 
-#: ../urpme:58 ../urpmi:103
+#: ../urpme:51 ../urpmi:96
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr "  --justdb       - 只更新 RPM 資料庫，而非檔案系統。\n"
 
-#: ../urpme:59
+#: ../urpme:52
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - 不執行套件中的命令稿。\n"
 
-#: ../urpme:60
+#: ../urpme:53
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1689,402 +1672,386 @@ msgstr ""
 "  --use-distrib  - 立即由一個散佈套件樹設定 urpme，在搭配 --root 選項來安\n"
 "                   裝/移除一個 chroot 時很方便。\n"
 
-#: ../urpme:62 ../urpmi:156 ../urpmq:94
+#: ../urpme:55 ../urpmi:149 ../urpmq:87
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 詳細訊息模式。\n"
 
-#: ../urpme:63
+#: ../urpme:56
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 選擇所有符合描述的套件。\n"
 
-#: ../urpme:78
+#: ../urpme:71
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "只有擁有管理者權限的使用者才能移除套件"
 
-#: ../urpme:111
+#: ../urpme:104
 #, c-format
 msgid "unknown packages"
 msgstr "未知的套件"
 
-#: ../urpme:111
+#: ../urpme:104
 #, c-format
 msgid "unknown package"
 msgstr "未知的套件"
 
-#: ../urpme:126
+#: ../urpme:119
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "移除套件 %s 將破壞您的系統"
 
-#: ../urpme:131
+#: ../urpme:124
 #, c-format
 msgid "Nothing to remove"
 msgstr "沒有東西可移除"
 
-#: ../urpme:148
+#: ../urpme:141
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "沒有東西可移除"
 
-#: ../urpme:154
+#: ../urpme:147
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
 "To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "為了滿足相依性，下列 %d 個套件將被移除"
 
-#: ../urpme:159
+#: ../urpme:152
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "未知的套件"
 
-#: ../urpme:166
+#: ../urpme:159
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "要移除這 %d 個套件嗎？"
 
-#: ../urpme:171
+#: ../urpme:164
 #, c-format
 msgid "testing removal of %s"
 msgstr "測試移除 %s"
 
-#: ../urpme:188
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "移除失敗"
 
-#: ../urpme:190
+#: ../urpme:183
 #, c-format
 msgid "Removal is possible"
 msgstr "無法移除"
 
-#: ../urpmf:29
-#, fuzzy, c-format
-msgid ""
-"urpmf version %s\n"
-"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage: urpmf [options] pattern-expression\n"
-msgstr ""
-"urpmf 版本號 %s\n"
-"%s\n"
-"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
-"\n"
-"用法：urpmf [選項] pattern-expression\n"
-
-#: ../urpmf:39
+#: ../urpmf:31
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 印出這個工具的版本編號。\n"
 
-#: ../urpmf:40 ../urpmi:135 ../urpmq:85
+#: ../urpmf:32 ../urpmi:128 ../urpmq:78
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用特定環境 (一般用於臭蟲回報)。\n"
 
-#: ../urpmf:41 ../urpmi:76 ../urpmq:52
+#: ../urpmf:33 ../urpmi:69 ../urpmq:45
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用給定的媒體，不同媒體間請以逗號分隔。\n"
 
-#: ../urpmf:42
+#: ../urpmf:34
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - 不比對樣版，把參數當作一般字串。\n"
 
-#: ../urpmf:45 ../urpmi:79 ../urpmq:53
+#: ../urpmf:37 ../urpmi:72 ../urpmq:46
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - 依據子字串排序媒體，以逗號分開。\n"
 
-#: ../urpmf:46
+#: ../urpmf:38
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用指定的路徑來存取媒體\n"
 
-#: ../urpmf:47 ../urpmi:80 ../urpmq:54
+#: ../urpmf:39 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的 synthesis 檔而非 urpmi 資料庫。\n"
 
-#: ../urpmf:48
+#: ../urpmf:40
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不顯示相同的訊息。\n"
 
-#: ../urpmf:49 ../urpmi:77 ../urpmq:49
+#: ../urpmf:41 ../urpmi:70 ../urpmq:42
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用更新媒體。\n"
 
-#: ../urpmf:50
+#: ../urpmf:42
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - 完整訊息模式。\n"
 
-#: ../urpmf:51
+#: ../urpmf:43
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - 忽略樣版中的大小寫差異。\n"
 
-#: ../urpmf:52
+#: ../urpmf:44
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - 分辨樣版中的大小寫差異 (預設值)。\n"
 
-#: ../urpmf:53
+#: ../urpmf:45
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<字串>       - 更改字串分隔符號 (預設為“:”)。\n"
 
-#: ../urpmf:54
+#: ../urpmf:46
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "樣版表示式：\n"
 
-#: ../urpmf:55
+#: ../urpmf:47
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr "  文字           - 任何文字都將被分析為正規表示式，除非使用了 -l。\n"
 
-#: ../urpmf:56
+#: ../urpmf:48
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接包含 perl 原始碼，類似 perl -e。\n"
 
-#: ../urpmf:57
+#: ../urpmf:49
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - 二元 AND 運算子。\n"
 
-#: ../urpmf:58
+#: ../urpmf:50
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - 二元 OR 運算子。\n"
 
-#: ../urpmf:59
+#: ../urpmf:51
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - 一元 NOT 運算子。\n"
 
-#: ../urpmf:60
+#: ../urpmf:52
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - 左右括弧。\n"
 
-#: ../urpmf:61
+#: ../urpmf:53
 #, c-format
 msgid "List of tags:\n"
 msgstr "標籤清單：\n"
 
-#: ../urpmf:62
+#: ../urpmf:54
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - 使用類似 printf 的輸出格式\n"
 
-#: ../urpmf:63
+#: ../urpmf:55
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   範例：'%%name:%%files'\n"
 
-#: ../urpmf:64
+#: ../urpmf:56
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - 硬體架構\n"
 
-#: ../urpmf:65
+#: ../urpmf:57
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - 建立主機\n"
 
-#: ../urpmf:66
+#: ../urpmf:58
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - 建立時間\n"
 
-#: ../urpmf:67
+#: ../urpmf:59
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - 組態檔\n"
 
-#: ../urpmf:68
+#: ../urpmf:60
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - 衝突標籤\n"
 
-#: ../urpmf:69
+#: ../urpmf:61
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - 套件描述\n"
 
-#: ../urpmf:70
+#: ../urpmf:62
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - 發行版\n"
 
-#: ../urpmf:71
+#: ../urpmf:63
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - 時期\n"
 
-#: ../urpmf:72
+#: ../urpmf:64
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - 套件檔案名稱\n"
 
-#: ../urpmf:73
+#: ../urpmf:65
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - 列出套件內包含的檔案\n"
 
-#: ../urpmf:74
+#: ../urpmf:66
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - 群組\n"
 
-#: ../urpmf:75
+#: ../urpmf:67
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - 授權\n"
 
-#: ../urpmf:76
+#: ../urpmf:68
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - 套件名稱\n"
 
-#: ../urpmf:77
+#: ../urpmf:69
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - 淘汰標籤\n"
 
-#: ../urpmf:78
+#: ../urpmf:70
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - 打包者\n"
 
-#: ../urpmf:79
+#: ../urpmf:71
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - 提供標籤\n"
 
-#: ../urpmf:80
+#: ../urpmf:72
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - 需要標籤\n"
 
-#: ../urpmf:81
+#: ../urpmf:73
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - 安裝大小\n"
 
-#: ../urpmf:82
+#: ../urpmf:74
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 原始碼套件名稱\n"
 
-#: ../urpmf:83
+#: ../urpmf:75
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - 建議標籤\n"
 
-#: ../urpmf:84
+#: ../urpmf:76
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - 摘要\n"
 
-#: ../urpmf:85
+#: ../urpmf:77
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:86
+#: ../urpmf:78
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - 提供者\n"
 
-#: ../urpmf:87
+#: ../urpmf:79
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 這個套件被找到的媒介\n"
 
-#: ../urpmf:88 ../urpmq:104
+#: ../urpmf:80 ../urpmq:97
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 顯示版本、發行編號與平台。\n"
 
-#: ../urpmf:156
+#: ../urpmf:148
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "樣版表示式：\n"
 
-#: ../urpmf:201
+#: ../urpmf:193
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式錯誤：您只能使用一個多值標籤"
 
-#: ../urpmf:294
+#: ../urpmf:286
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 hdlist"
 
-#: ../urpmf:301
+#: ../urpmf:293
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 synthesis"
 
-#: ../urpmf:310
+#: ../urpmf:302
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 xml-info"
 
-#: ../urpmi:83
+#: ../urpmi:76
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
 msgstr "  --auto-update  - 當升級系統時更新媒體。\n"
 
-#: ../urpmi:84
+#: ../urpmi:77
 #, c-format
 msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "    --no-md5sum    - 不使用 MD5SUM 檔案檢查功能。\n"
 
-#: ../urpmi:85
+#: ../urpmi:78
 #, c-format
 msgid "    --force-key    - force update of gpg key.\n"
 msgstr "    --force-key    - 強制更新 gpg 金鑰。\n"
 
-#: ../urpmi:86
+#: ../urpmi:79
 #, c-format
 msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:59
+#: ../urpmi:80 ../urpmq:52
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
 msgstr "  --no-suggests  - 不要自動選取 \"建議的\" 套件。\n"
 
-#: ../urpmi:88
+#: ../urpmi:81
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 絕不要求移除套件，直接中斷安裝。\n"
 
-#: ../urpmi:89
+#: ../urpmi:82
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - 不安裝套件 (只下載)。\n"
 
-#: ../urpmi:90 ../urpmq:61
+#: ../urpmi:83 ../urpmq:54
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2093,7 +2060,7 @@ msgstr ""
 "  --keep         - 盡可能的保留現存的套件，拒絕安裝會導致移除其他套件的\n"
 "                   套件。\n"
 
-#: ../urpmi:92
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -2104,52 +2071,52 @@ msgstr ""
 "                   分割為幾個小的安裝程序。\n"
 "                   預設值為 %d。\n"
 
-#: ../urpmi:96
+#: ../urpmi:89
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小型安裝程序大小，預設值為 %d。\n"
 
-#: ../urpmi:98
+#: ../urpmi:91
 #, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - 加上模糊搜尋。\n"
 
-#: ../urpmi:99
+#: ../urpmi:92
 #, c-format
 msgid "  --buildrequires - install the buildrequires of the packages\n"
 msgstr ""
 "  --buildrequires - 安裝建構此套件所需的套件\n"
 "\n"
 
-#: ../urpmi:100
+#: ../urpmi:93
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安裝原始碼套件 (不安裝二進位檔)。\n"
 
-#: ../urpmi:101
+#: ../urpmi:94
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - 在執行任何事前先由快取中移除 RPM 檔案。\n"
 
-#: ../urpmi:102
+#: ../urpmi:95
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不清除快取中的 RPM 檔案。\n"
 
-#: ../urpmi:104
+#: ../urpmi:97
 #, c-format
 msgid ""
 "  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr "  --replacepkgs  - 強制安裝已經安裝過的套件。\n"
 
-#: ../urpmi:106
+#: ../urpmi:99
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允許要求使用者不檢查相依性就安裝套件。\n"
 
-#: ../urpmi:108
+#: ../urpmi:101
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -2158,12 +2125,12 @@ msgstr ""
 "  --allow-force  - 允許要求使用者安裝套件而不檢查相依性與完整\n"
 "                   性。\n"
 
-#: ../urpmi:110
+#: ../urpmi:103
 #, c-format
 msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
 msgstr "  --allow-suggests - 自動選取 \"建議的\" 套件。\n"
 
-#: ../urpmi:114
+#: ../urpmi:107
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -2172,19 +2139,19 @@ msgstr ""
 "  --use-distrib  - 立即由一個散佈套件樹設定 urpmi，在搭配 --root 選項來安\n"
 "                   裝/移除一個 chroot 時很方便。\n"
 
-#: ../urpmi:116 ../urpmi.addmedia:60 ../urpmi.update:37
+#: ../urpmi:109 ../urpmi.addmedia:60 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
 msgstr ""
 
-#: ../urpmi:117
+#: ../urpmi:110
 #, c-format
 msgid ""
 "  --download-all - download all needed packages before trying to install "
 "them\n"
 msgstr ""
 
-#: ../urpmi:118
+#: ../urpmi:111
 #, c-format
 msgid ""
 "  --downloader   - program to use to retrieve distant files. \n"
@@ -2193,37 +2160,37 @@ msgstr ""
 "  --downloader   - 用來取得遠端檔案的程式。\n"
 "                   已知的程式有：%s\n"
 
-#: ../urpmi:121
+#: ../urpmi:114
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr " --curl-options - 要額外傳給 curl 的參數\n"
 
-#: ../urpmi:122
+#: ../urpmi:115
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- 要額外傳給 rsync 的參數\n"
 
-#: ../urpmi:123
+#: ../urpmi:116
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - 要額外傳給 wget 的參數\n"
 
-#: ../urpmi:124
+#: ../urpmi:117
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - 要額外傳給 prozilla 的參數\n"
 
-#: ../urpmi:125
+#: ../urpmi:118
 #, c-format
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - 要額外傳給 aria2 的參數\n"
 
-#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:38
+#: ../urpmi:119 ../urpmi.addmedia:61 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 限制下載的速度。\n"
 
-#: ../urpmi:127
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -2232,7 +2199,7 @@ msgstr ""
 "  --resume       - 接著傳送下載到一半的檔案\n"
 "                   (--no-resume 選項停用它，預設值為停用)。\n"
 
-#: ../urpmi:129 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:122 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:74
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -2241,7 +2208,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理伺服器，通訊埠假設為預設值 1080 \n"
 "                   (格式為 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:83
+#: ../urpmi:124 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2250,54 +2217,54 @@ msgstr ""
 "  --proxy-user   - 指定代理伺服器認證的使用者帳號與密碼\n"
 "                   (格式為 <user:password>)。\n"
 
-#: ../urpmi:133
+#: ../urpmi:126
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr "  --bug          - 輸出臭蟲回報到下一個參數所指定的目錄。\n"
 
-#: ../urpmi:139
+#: ../urpmi:132
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除以逗號分隔的路徑。\n"
 
-#: ../urpmi:140
+#: ../urpmi:133
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除說明文件檔案。\n"
 
-#: ../urpmi:141
+#: ../urpmi:134
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - 安裝前不檢查剩餘的磁碟空間。\n"
 
-#: ../urpmi:142
+#: ../urpmi:135
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允許安裝硬體架構不相符的 RPM 檔。\n"
 
-#: ../urpmi:143
+#: ../urpmi:136
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - 不執行套件中的命令稿\n"
 
-#: ../urpmi:144
+#: ../urpmi:137
 #, c-format
 msgid "  --replacefiles - ignore file conflicts\n"
 msgstr "  --replacefiles - 忽略檔案衝突\n"
 
-#: ../urpmi:146
+#: ../urpmi:139
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安裝時應該略過的套件\n"
 
-#: ../urpmi:147
+#: ../urpmi:140
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - 應該要優先考慮的套件\n"
 
-#: ../urpmi:148
+#: ../urpmi:141
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2305,82 +2272,82 @@ msgid ""
 msgstr ""
 "  --more-choices - 當找到不只一個套件時，提供除了預設值之外的多個選擇。\n"
 
-#: ../urpmi:150
+#: ../urpmi:143
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - 不鎖定 RPM 資料庫。\n"
 
-#: ../urpmi:151
+#: ../urpmi:144
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 只升級相同平台的套件。\n"
 
-#: ../urpmi:152 ../urpmq:102
+#: ../urpmi:145 ../urpmq:95
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 選擇命令列中所有符合的項目。\n"
 
-#: ../urpmi:155
+#: ../urpmi:148
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - 安靜模式。\n"
 
-#: ../urpmi:157
+#: ../urpmi:150
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  --debug        - 非常詳細模式。\n"
 
-#: ../urpmi:158
+#: ../urpmi:151
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  將會安裝於命令列指定的名稱或 RPM 檔案。\n"
 
-#: ../urpmi:186
+#: ../urpmi:179
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "錯誤：無法與套件列表一起使用 --auto-select。\n"
 
-#: ../urpmi:193
+#: ../urpmi:186
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "錯誤：要生成一個臭蟲回報，請指定平常的命令列參數另外再加上 --bug。\n"
 
-#: ../urpmi:223
+#: ../urpmi:216
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "當使用 --install-src 時您無法安裝二進制 RPM 檔案"
 
-#: ../urpmi:224
+#: ../urpmi:217
 #, c-format
 msgid "You can't install spec files"
 msgstr "您無法安裝 spec 檔案"
 
-#: ../urpmi:231
+#: ../urpmi:224
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr "--buildrequires 的預設值"
 
-#: ../urpmi:236
+#: ../urpmi:229
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr "請使用 --buildrequires 或者 --install-src，預設為 --buildrequires"
 
-#: ../urpmi:256
+#: ../urpmi:249
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目錄 [%s] 已經存在，請指定另一個目錄給臭蟲回報或刪除它"
 
-#: ../urpmi:257
+#: ../urpmi:250
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "無法建立 [%s] 目錄給臭蟲回報使用"
 
-#: ../urpmi:278
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2390,42 +2357,42 @@ msgstr ""
 "使用 --allow-force 標籤來強制執行。"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:432
+#: ../urpmi:425
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s：%s (升級用)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:434
+#: ../urpmi:427
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (升級用)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:438
+#: ../urpmi:431
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s：%s (安裝用)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:440
+#: ../urpmi:433
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (安裝用)"
 
-#: ../urpmi:446
+#: ../urpmi:439
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "為了滿足 '%s' 的相依性，需要下列套件之一："
 
-#: ../urpmi:449
+#: ../urpmi:442
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "您要選擇何者？ (1-%d) "
 
-#: ../urpmi:491
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2435,7 +2402,7 @@ msgstr ""
 "下列套件無法安裝，因為它需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:493
+#: ../urpmi:486
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2445,7 +2412,7 @@ msgstr ""
 "下列套件無法安裝，因為它們需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:499 ../urpmi:517
+#: ../urpmi:492 ../urpmi:510
 #, c-format
 msgid ""
 "\n"
@@ -2454,12 +2421,12 @@ msgstr ""
 "\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../urpmi:500 ../urpmi:518 ../urpmi:633 ../urpmi.addmedia:136
+#: ../urpmi:493 ../urpmi:511 ../urpmi:626 ../urpmi.addmedia:136
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (是/否) "
 
-#: ../urpmi:511
+#: ../urpmi:504
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2468,12 +2435,12 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../urpmi:532
+#: ../urpmi:525
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "移除套件 %s 將破壞您的系統"
 
-#: ../urpmi:540
+#: ../urpmi:533
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2483,7 +2450,7 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:542
+#: ../urpmi:535
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2493,12 +2460,12 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:550
+#: ../urpmi:543
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(僅測試，移除動作並不會真的執行)"
 
-#: ../urpmi:569
+#: ../urpmi:562
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2508,44 +2475,44 @@ msgstr ""
 "您必須先呼叫 urpmi --buildrequires 來安裝下列相依性套件：\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:572
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "為了滿足相依性，下列 %d 個套件將被移除"
 
-#: ../urpmi:603
+#: ../urpmi:596
 #, c-format
 msgid "WARNING: %s option is in use. Some strange problems may happen"
 msgstr ""
 
-#: ../urpmi:615
+#: ../urpmi:608
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(僅測試，安裝動作並不會真的執行)"
 
-#: ../urpmi:621
+#: ../urpmi:614
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "將使用 %s 額外磁碟空間。"
 
-#: ../urpmi:622
+#: ../urpmi:615
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "將釋放 %s 磁碟空間。"
 
-#: ../urpmi:623
+#: ../urpmi:616
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "將取得 %s 軟體套件。"
 
-#: ../urpmi:624
+#: ../urpmi:617
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "繼續安裝這 %d 個套件？"
 
-#: ../urpmi:646
+#: ../urpmi:639
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "掛載好後請按 Enter..."
@@ -2594,17 +2561,17 @@ msgstr ""
 "\n"
 "而 [選項] 是來自\n"
 
-#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:78
+#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:71
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 使用 wget 擷取遠端檔案。\n"
 
-#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:79
+#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:72
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 使用 curl 擷取遠端檔案。\n"
 
-#: ../urpmi.addmedia:58 ../urpmi.update:35 ../urpmq:80
+#: ../urpmi.addmedia:58 ../urpmi.update:35 ../urpmq:73
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla     - 使用 prozilla 擷取遠端檔案。\n"
@@ -2755,137 +2722,121 @@ msgstr "<synthesis 檔案的相對路徑> 遺失\n"
 msgid "Can't use %s with remote medium"
 msgstr "遠端媒體無法使用 %s"
 
-#: ../urpmi.recover:28
-#, fuzzy, c-format
-msgid ""
-"urpmi.recover version %s\n"
-"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmq 版本號 %s\n"
-"%s\n"
-"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
-"\n"
-"用法：\n"
-
-#: ../urpmi.recover:36
+#: ../urpmi.recover:30
 #, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - 設定現在開始重新打包\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:31
 #, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - 不清除快取中的 RPM 檔案。\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:33
 #, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr "  --list         - 列出給定的日期至今或給定的期間內的交易\n"
 
-#: ../urpmi.recover:40
+#: ../urpmi.recover:34
 #, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-url     - 列出可用的媒體與其 URL。\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:35
 #, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-safe    - 列出檢查點至今的交易\n"
 
-#: ../urpmi.recover:42
+#: ../urpmi.recover:36
 #, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr "  --rollback     - 回復到特定的日期，或者回復特定的交易\n"
 
-#: ../urpmi.recover:44
+#: ../urpmi.recover:38
 #, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --filename     - 套件檔案名稱\n"
 
-#: ../urpmi.recover:59
+#: ../urpmi.recover:53
 #, fuzzy, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "%s 目錄的擁有者無效"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:61
 #, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "沒有找到套件 %s。"
 
-#: ../urpmi.recover:70
+#: ../urpmi.recover:64
 #, fuzzy, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "無法建立目錄 %s"
 
-#: ../urpmi.recover:72
+#: ../urpmi.recover:66
 #, fuzzy, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "無法建立目錄 %s"
 
-#: ../urpmi.recover:74
+#: ../urpmi.recover:68
 #, c-format
 msgid "%d file removed\n"
 msgid_plural "%d files removed\n"
 msgstr[0] "移除了 %d 個檔案\n"
 
-#: ../urpmi.recover:84
+#: ../urpmi.recover:78
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "不合理的命令列參數 [%s]\n"
 
-#: ../urpmi.recover:86
+#: ../urpmi.recover:80
 #, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr "您不能同時指定 --checkpoint 以及 --rollback\n"
 
-#: ../urpmi.recover:88
+#: ../urpmi.recover:82
 #, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr "您不能同時指定 --checkpoint 以及 --list\n"
 
-#: ../urpmi.recover:90
+#: ../urpmi.recover:84
 #, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "您不能同時指定 --rollback 以及 --list\n"
 
-#: ../urpmi.recover:92
+#: ../urpmi.recover:86
 #, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "您不能在指定 --disable 的同時加上其他任何選項"
 
-#: ../urpmi.recover:117
+#: ../urpmi.recover:111
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "從 %s 至今沒有找到任何交易\n"
 
-#: ../urpmi.recover:132
+#: ../urpmi.recover:126
 #, c-format
 msgid "You must be superuser to do this"
 msgstr "您必須是超級使用者才能執行"
 
-#: ../urpmi.recover:145 ../urpmi.recover:211
+#: ../urpmi.recover:139 ../urpmi.recover:205
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "正在擷取 rpm 檔案 [%s] ..."
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:181
 #, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "沒有找到更新紀錄\n"
 
-#: ../urpmi.recover:190
+#: ../urpmi.recover:184
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "回復到 %s...\n"
 
-#: ../urpmi.recover:197
+#: ../urpmi.recover:191
 #, fuzzy, c-format
 msgid "Disabling repackaging\n"
 msgstr "[正在重新打包]"
@@ -3011,93 +2962,77 @@ msgstr "略過媒體 %s"
 msgid "enabling media %s"
 msgstr "啟用媒體 %s"
 
-#: ../urpmq:40
-#, fuzzy, c-format
-msgid ""
-"urpmq version %s\n"
-"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmq 版本號 %s\n"
-"%s\n"
-"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
-"\n"
-"用法：\n"
-
-#: ../urpmq:51
+#: ../urpmq:44
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr "  --searchmedia  - 只使用指定的媒體來搜尋或升級套件。\n"
 
-#: ../urpmq:56
+#: ../urpmq:49
 #, c-format
 msgid "  --auto-orphans - list orphans\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:50
 #, c-format
 msgid ""
 "  --not-available\n"
 "                 - list installed packages not available on any media.\n"
 msgstr ""
 
-#: ../urpmq:60
+#: ../urpmq:53
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 加上模糊搜尋 (與 -y 相同)。\n"
 
-#: ../urpmq:63
+#: ../urpmq:56
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - 列出可用的的套件。\n"
 
-#: ../urpmq:64
+#: ../urpmq:57
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - 列出可用的媒體。\n"
 
-#: ../urpmq:65
+#: ../urpmq:58
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - 列出可用的媒體與其 URL。\n"
 
-#: ../urpmq:66
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - 當使用 --parallel 選項時列出可用的節點。\n"
 
-#: ../urpmq:67
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - 列出可用的同步管理別名。\n"
 
-#: ../urpmq:68
+#: ../urpmq:61
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - 以 urpmi.addmedia 的參數形式的匯出設定值。\n"
 
-#: ../urpmq:69
+#: ../urpmq:62
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下個套件是原始碼套件 (與 -s 相同)。\n"
 
-#: ../urpmq:70
+#: ../urpmq:63
 #, fuzzy, c-format
 msgid "  --sources      - print source URLs of selected packages\n"
 msgstr "  --sourcerpm    - 顯示原始碼套件。\n"
 
-#: ../urpmq:72
+#: ../urpmq:65
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允許查詢硬體架構不相符的 RPM 檔。\n"
 
-#: ../urpmq:76
+#: ../urpmq:69
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -3106,47 +3041,47 @@ msgstr ""
 "  --use-distrib  - 立即由一個散佈套件樹設定 urpmi。可用來查詢散佈\n"
 "                   套件。\n"
 
-#: ../urpmq:86
+#: ../urpmq:79
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 顯示更新紀錄。\n"
 
-#: ../urpmq:87
+#: ../urpmq:80
 #, c-format
 msgid "  --conflicts    - print conflicts.\n"
 msgstr "  --conflicts    - 顯示衝突。\n"
 
-#: ../urpmq:88
+#: ../urpmq:81
 #, c-format
 msgid "  --obsoletes    - print obsoletes.\n"
 msgstr "  --obsoletes    - 顯示淘汰。\n"
 
-#: ../urpmq:89
+#: ../urpmq:82
 #, c-format
 msgid "  --provides     - print provides.\n"
 msgstr "  --provides     - 顯示提供。\n"
 
-#: ../urpmq:90
+#: ../urpmq:83
 #, c-format
 msgid "  --requires     - print requires.\n"
 msgstr "  --requires     - 顯示需求。\n"
 
-#: ../urpmq:91
+#: ../urpmq:84
 #, c-format
 msgid "  --suggests     - print suggests.\n"
 msgstr "  --suggests     - 顯示建議。\n"
 
-#: ../urpmq:92
+#: ../urpmq:85
 #, c-format
 msgid "  --sourcerpm    - print sourcerpm.\n"
 msgstr "  --sourcerpm    - 顯示原始碼套件。\n"
 
-#: ../urpmq:93
+#: ../urpmq:86
 #, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - 顯示摘要。\n"
 
-#: ../urpmq:95
+#: ../urpmq:88
 #, c-format
 msgid ""
 "  --requires-recursive, -d\n"
@@ -3155,12 +3090,12 @@ msgstr ""
 "  --requires-recursive, -d\n"
 "                   - 查詢套件相依性。\n"
 
-#: ../urpmq:97
+#: ../urpmq:90
 #, c-format
 msgid "  --whatrequires - reverse search to what requires package.\n"
 msgstr "  --whatrequires - 逆向搜尋何者需要此套件。\n"
 
-#: ../urpmq:98
+#: ../urpmq:91
 #, c-format
 msgid ""
 "  --whatrequires-recursive\n"
@@ -3169,112 +3104,112 @@ msgstr ""
 "  --whatrequires-recursive\n"
 "                   - 進階逆向搜尋 (包含虛擬套件)。\n"
 
-#: ../urpmq:100
+#: ../urpmq:93
 #, fuzzy, c-format
 msgid ""
 "  --whatprovides, -p\n"
 "                   - search in provides to find package.\n"
 msgstr "  -p             - 於 provides 中搜尋套件。\n"
 
-#: ../urpmq:103
+#: ../urpmq:96
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 完整輸出要移除的套件。\n"
 
-#: ../urpmq:105
+#: ../urpmq:98
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 顯示群組名稱。\n"
 
-#: ../urpmq:106
+#: ../urpmq:99
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人類可讀的形式顯示有用資訊。\n"
 
-#: ../urpmq:107
+#: ../urpmq:100
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出套件內包含的檔案。\n"
 
-#: ../urpmq:108
+#: ../urpmq:101
 #, c-format
 msgid "  -m             - equivalent to -du\n"
 msgstr "  -m             - 與 -du 參數效果相同\n"
 
-#: ../urpmq:109
+#: ../urpmq:102
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 顯示名稱時一併顯示版本號與發行編號。\n"
 
-#: ../urpmq:110
+#: ../urpmq:103
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下個套件是原始碼套件 (與 --src 相同)。\n"
 
-#: ../urpmq:111
+#: ../urpmq:104
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 若已經安裝較新的版本則移除套件。\n"
 
-#: ../urpmq:112
+#: ../urpmq:105
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 加上模糊搜尋 (與 --fuzzy 相同)。\n"
 
-#: ../urpmq:113
+#: ../urpmq:106
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - 類似 -y 參數，但強制比對大小寫。\n"
 
-#: ../urpmq:114
+#: ../urpmq:107
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  查詢命令列給予的套件名稱或 RPM 檔案。\n"
 
-#: ../urpmq:161
+#: ../urpmq:154
 #, c-format
 msgid "usage: \"urpmq --auto-orphans\" with no argument"
 msgstr ""
 
-#: ../urpmq:214
+#: ../urpmq:207
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 參數只能夠配合 --parallel 參數一起使用"
 
-#: ../urpmq:238
+#: ../urpmq:231
 #, c-format
 msgid "use -l to list files"
 msgstr "使用 -l 列出檔案"
 
-#: ../urpmq:423
+#: ../urpmq:416
 #, fuzzy, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmq:424
+#: ../urpmq:417
 #, fuzzy, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmq:427
+#: ../urpmq:420
 #, fuzzy, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmq:428
+#: ../urpmq:421
 #, fuzzy, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmq:495
+#: ../urpmq:488
 #, c-format
 msgid "No changelog found\n"
 msgstr "沒有找到更新紀錄\n"
@@ -3288,6 +3223,65 @@ msgid "Graphical front end to install RPM files"
 msgstr "RPM 檔案安裝的圖形化前端"
 
 #~ msgid ""
+#~ "urpme version %s\n"
+#~ "%s\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpme 版本號 %s\n"
+#~ "%s\n"
+#~ "這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
+#~ "\n"
+#~ "用法：\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "urpmf version %s\n"
+#~ "%s\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage: urpmf [options] pattern-expression\n"
+#~ msgstr ""
+#~ "urpmf 版本號 %s\n"
+#~ "%s\n"
+#~ "這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
+#~ "\n"
+#~ "用法：urpmf [選項] pattern-expression\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "urpmi.recover version %s\n"
+#~ "%s\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpmq 版本號 %s\n"
+#~ "%s\n"
+#~ "這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
+#~ "\n"
+#~ "用法：\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "urpmq version %s\n"
+#~ "%s\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpmq 版本號 %s\n"
+#~ "%s\n"
+#~ "這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
+#~ "\n"
+#~ "用法：\n"
+
+#~ msgid ""
 #~ "Installation failed, some files are missing:\n"
 #~ "%s\n"
 #~ "You may want to update your urpmi database"