sync with code

1 files changed, 38 insertions, 28 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7d3091fd..73cb8a6f 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-02-27 21:09+0100\n"
+"POT-Creation-Date: 2012-03-21 08:44+0100\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"
@@ -262,7 +262,7 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:155 ../urpmi:632
+#: ../gurpmi2:155 ../urpmi:642
 #, c-format
 msgid "Ok"
 msgstr "確定"
@@ -303,13 +303,13 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:276 ../urpmi:599
+#: ../gurpmi2:276 ../urpmi:609
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "為了滿足相依性，將會安裝下列套件："
 
-#: ../gurpmi2:277 ../urpmi:600
+#: ../gurpmi2:277 ../urpmi:610
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -336,7 +336,7 @@ msgstr "準備中..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../gurpmi2:343 ../urpmi:627
+#: ../gurpmi2:343 ../urpmi:637
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "請置入名為 \"%s\" 的媒體"
@@ -389,7 +389,7 @@ msgstr "安裝完畢"
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../gurpmi2:427 ../urpmi:695
+#: ../gurpmi2:427 ../urpmi:705
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新啟動 urpmi"
@@ -600,22 +600,22 @@ msgstr "媒體 \"%s\" 無法使用"
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "無法由媒體 \"%2$s\" 讀取 [%1$s] rpm 檔"
 
-#: ../urpm/cfg.pm:81
+#: ../urpm/cfg.pm:82
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "設定檔第 %s 行語法錯誤"
 
-#: ../urpm/cfg.pm:114
+#: ../urpm/cfg.pm:115
 #, c-format
 msgid "unable to read config file [%s]"
 msgstr "無法讀取設定檔 [%s]"
 
-#: ../urpm/cfg.pm:140
+#: ../urpm/cfg.pm:141
 #, c-format
 msgid "medium `%s' is defined twice, aborting"
 msgstr "媒體 '%s' 被定義了兩次，正在取消"
 
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:541
+#: ../urpm/cfg.pm:252 ../urpm/media.pm:541
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "無法寫入設定檔 [%s]"
@@ -796,27 +796,27 @@ msgstr "無法安裝套件 %s"
 msgid "removing bad rpm (%s) from %s"
 msgstr "正在由 %2$s 移除不良的 RPM (%1$s)"
 
-#: ../urpm/install.pm:213 ../urpm/install.pm:277
+#: ../urpm/install.pm:213 ../urpm/install.pm:278
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "移除 %s 失敗：%s"
 
-#: ../urpm/install.pm:258
+#: ../urpm/install.pm:259
 #, c-format
 msgid "Removing package %s"
 msgstr "正在移除套件 %s"
 
-#: ../urpm/install.pm:259
+#: ../urpm/install.pm:260
 #, c-format
 msgid "removing package %s"
 msgstr "正在移除套件 %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:276
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "正在由 %2$s 移除已安裝的 RPM (%1$s)"
 
-#: ../urpm/install.pm:284
+#: ../urpm/install.pm:285
 #, c-format
 msgid "More information on package %s"
 msgstr "更多關於套件 %s 的資訊"
@@ -1024,6 +1024,11 @@ msgstr ""
 "--synthesis 不能夠與 --media、--excludemedia、--sortmedia、--update、--use-"
 "distrib 以及 --parallel 一起使用"
 
+#: ../urpm/media.pm:719
+#, c-format
+msgid "Search start: %s end: %s"
+msgstr ""
+
 #: ../urpm/media.pm:736
 #, c-format
 msgid "skipping package %s"
@@ -1264,7 +1269,7 @@ msgstr "找到 geolocalisation %s %.2f %.2f，於時區 %s"
 msgid "getting mirror list from %s"
 msgstr "正由 %s 取得鏡像站列表"
 
-#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:619
+#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:629
 #, c-format
 msgid "Nn"
 msgstr "Nn否"
@@ -2429,7 +2434,7 @@ msgstr ""
 "\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../urpmi:497 ../urpmi:515 ../urpmi:620 ../urpmi.addmedia:136
+#: ../urpmi:497 ../urpmi:515 ../urpmi:630 ../urpmi.addmedia:136
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (是/否) "
@@ -2489,38 +2494,43 @@ msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "為了滿足相依性，下列 %d 個套件將被移除"
 
-#: ../urpmi:602
+#: ../urpmi:600
+#, c-format
+msgid "WARNING: %s option is in use. Some strange problems may happen"
+msgstr ""
+
+#: ../urpmi:612
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(僅測試，安裝動作並不會真的執行)"
 
-#: ../urpmi:608
+#: ../urpmi:618
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "將使用 %s 額外磁碟空間。"
 
-#: ../urpmi:609
+#: ../urpmi:619
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "將釋放 %s 磁碟空間。"
 
-#: ../urpmi:610
+#: ../urpmi:620
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "將取得 %s 軟體套件。"
 
-#: ../urpmi:611
+#: ../urpmi:621
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "繼續安裝這 %d 個套件？"
 
-#: ../urpmi:632
+#: ../urpmi:642
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:640
+#: ../urpmi:650
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "掛載好後請按 Enter..."
@@ -3255,13 +3265,13 @@ msgid "No changelog found\n"
 msgstr "沒有找到更新紀錄\n"
 
 #: ../gurpmi.desktop.in.h:1
-msgid "Graphical front end to install RPM files"
-msgstr "RPM 檔案安裝的圖形化前端"
-
-#: ../gurpmi.desktop.in.h:2
 msgid "Software Installer"
 msgstr "軟體安裝程式"
 
+#: ../gurpmi.desktop.in.h:2
+msgid "Graphical front end to install RPM files"
+msgstr "RPM 檔案安裝的圖形化前端"
+
 #, fuzzy
 #~ msgid ""
 #~ "# Here are logs of your DUDF uploads.\n"