- disable prerendered titles until I have the new banner

- don't update when no source is selected for updates...
- new ugtk without BEGIN so that we can have an OK error message when X is not available
- use parenthesis for as much functions as seen since when requir'ing modules sometimes a function call is considered a bareword

1 files changed, 171 insertions, 142 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 21e59ed2..34162145 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-09-03 18:58+0200\n"
+"POT-Creation-Date: 2002-09-03 20:08+0200\n"
 "PO-Revision-Date: 2002-09-02 15:20-+800\n"
 "Last-Translator: Kenduest Lee <kenduest@i18n.linux.org.tw>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
@@ -56,7 +56,7 @@ msgstr "路徑或是掛載點："
 msgid "Removable device"
 msgstr "可移除裝置"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:462
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:464
 msgid "Security updates"
 msgstr "安全更新"
 
@@ -106,15 +106,15 @@ msgstr "來源類別："
 
 #: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
 #: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
-#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:319 ../rpmdrake_.c:805
-#: ../rpmdrake_.c:831
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:319 ../rpmdrake_.c:818
+#: ../rpmdrake_.c:844
 msgid "Ok"
 msgstr "確定"
 
 #: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
 #: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
 #: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:319
-#: ../rpmdrake_.c:831
+#: ../rpmdrake_.c:844
 msgid "Cancel"
 msgstr "取消"
 
@@ -200,7 +200,7 @@ msgstr "開啟"
 msgid "Source"
 msgstr "來源"
 
-#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:610
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:615
 msgid "Remove"
 msgstr "移除"
 
@@ -224,11 +224,11 @@ msgstr "代理..."
 msgid "Save and quit"
 msgstr "儲存並離開"
 
-#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:613
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:618
 msgid "Quit"
 msgstr "離開"
 
-#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:930
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -433,7 +433,7 @@ msgstr "請選擇更新的地址項目"
 msgid "Other"
 msgstr "其他"
 
-#: ../rpmdrake_.c:131 ../rpmdrake_.c:422 ../rpmdrake_.c:423
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:423 ../rpmdrake_.c:424
 msgid "(Not available)"
 msgstr "(無法使用)"
 
@@ -557,7 +557,7 @@ msgstr ""
 "抱歉，下面的套件項目將不能夠被選取：\n"
 "\n"
 
-#: ../rpmdrake_.c:390 ../rpmdrake_.c:572
+#: ../rpmdrake_.c:390 ../rpmdrake_.c:576
 msgid "Some packages need to be removed"
 msgstr "某些套件需要順便移除"
 
@@ -571,136 +571,128 @@ msgstr "已選擇：%d MB / 可用磁碟空間：%d MB"
 msgid "Selected size: %d MB"
 msgstr "選取的大小：%d MB"
 
-#: ../rpmdrake_.c:420
-#, c-format
-msgid ""
-"%sFiles:\n"
-"%s\n"
-"\n"
-"Changelog:\n"
-"%s"
-msgstr ""
-"%s檔案：\n"
-"%s\n"
-"\n"
-"變更紀錄：\n"
-"%s"
+#: ../rpmdrake_.c:422
+#, fuzzy
+msgid "Source: "
+msgstr "來源"
 
-#: ../rpmdrake_.c:421
-#, c-format
-msgid "Source: %s\n"
-msgstr "來源：%s\n"
+#: ../rpmdrake_.c:423
+#, fuzzy
+msgid "Files:\n"
+msgstr "/檔案 (_F)"
 
-#: ../rpmdrake_.c:426
-#, c-format
-msgid ""
-"Name: %s\n"
-"Version: %s\n"
-"Size: %s KB\n"
-"Importance: %s\n"
-"\n"
-"Summary: %s\n"
-"\n"
-"%s\n"
+#: ../rpmdrake_.c:424
+msgid "Changelog:\n"
+msgstr ""
+
+#: ../rpmdrake_.c:427
+msgid "Reason for update: "
 msgstr ""
-"名稱：%s\n"
-"版本：%s\n"
-"大小：%s KB\n"
-"重要性：%s\n"
-"\n"
-"簡介：%s\n"
-"\n"
-"%s\n"
+
+#: ../rpmdrake_.c:429
+#, fuzzy
+msgid "Name: "
+msgstr "名稱："
 
 #: ../rpmdrake_.c:430
-#, c-format
-msgid ""
-"Name: %s\n"
-"Version: %s\n"
-"Size: %s KB\n"
-"\n"
-"Summary: %s\n"
-"\n"
-"%s\n"
+#, fuzzy
+msgid "Version: "
+msgstr "版本："
+
+#: ../rpmdrake_.c:431
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%.1f KB"
+
+#: ../rpmdrake_.c:431
+#, fuzzy
+msgid "Size: "
+msgstr "大小"
+
+#: ../rpmdrake_.c:432
+msgid "Importance: "
 msgstr ""
-"名稱：%s\n"
-"版本：%s\n"
-"大小：%s KB\n"
-"\n"
-"簡介：%s\n"
-"\n"
-"%s\n"
 
-#: ../rpmdrake_.c:441
+#: ../rpmdrake_.c:433
+#, fuzzy
+msgid "Summary: "
+msgstr "摘要"
+
+#: ../rpmdrake_.c:434
+#, fuzzy
+msgid "Description: "
+msgstr "依照描述"
+
+#: ../rpmdrake_.c:443
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:462
+#: ../rpmdrake_.c:464
 msgid "Bugfixes updates"
 msgstr "臭蟲更新"
 
-#: ../rpmdrake_.c:462
+#: ../rpmdrake_.c:464
 msgid "Normal updates"
 msgstr "一般更新"
 
-#: ../rpmdrake_.c:481
+#: ../rpmdrake_.c:483
 msgid "Mandrake choices"
 msgstr "Mandrake 選擇"
 
-#: ../rpmdrake_.c:482
+#: ../rpmdrake_.c:484
 msgid "All packages, alphabetical"
 msgstr "所有套件，依照字母順序分類"
 
-#: ../rpmdrake_.c:483
+#: ../rpmdrake_.c:485
 msgid "All packages,"
 msgstr "所有套件，"
 
-#: ../rpmdrake_.c:506
+#: ../rpmdrake_.c:508
 msgid "by group"
 msgstr "依群組分類"
 
-#: ../rpmdrake_.c:506
+#: ../rpmdrake_.c:508
 msgid "by size"
 msgstr "依大小分類"
 
-#: ../rpmdrake_.c:507
+#: ../rpmdrake_.c:509
 msgid "by selection state"
 msgstr "依選擇狀態分類"
 
-#: ../rpmdrake_.c:508
+#: ../rpmdrake_.c:510
 msgid "by source repository"
 msgstr "依來源倉儲分類"
 
-#: ../rpmdrake_.c:508
+#: ../rpmdrake_.c:510
 msgid "by update availability"
 msgstr "依可供更新分類"
 
-#: ../rpmdrake_.c:529
+#: ../rpmdrake_.c:531
 msgid "in descriptions"
 msgstr "依照描述"
 
-#: ../rpmdrake_.c:529
+#: ../rpmdrake_.c:531
 msgid "in names"
 msgstr "依照名稱"
 
-#: ../rpmdrake_.c:530
+#: ../rpmdrake_.c:532
 msgid "in files"
 msgstr "依照檔案"
 
-#: ../rpmdrake_.c:541
+#: ../rpmdrake_.c:543
 msgid "Maximum information"
 msgstr "完整資訊"
 
-#: ../rpmdrake_.c:541
+#: ../rpmdrake_.c:543
 msgid "Normal information"
 msgstr "一般資訊"
 
-#: ../rpmdrake_.c:562
+#: ../rpmdrake_.c:566
 #, fuzzy
 msgid "Too many packages are selected"
 msgstr "某些套件無法安裝上"
 
-#: ../rpmdrake_.c:563
+#: ../rpmdrake_.c:567
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -710,7 +702,7 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr ""
 
-#: ../rpmdrake_.c:573
+#: ../rpmdrake_.c:577
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -725,35 +717,35 @@ msgstr ""
 "\n"
 "您確定要繼續嗎？"
 
-#: ../rpmdrake_.c:594
+#: ../rpmdrake_.c:599
 msgid "Find:"
 msgstr "尋找："
 
-#: ../rpmdrake_.c:599
+#: ../rpmdrake_.c:604
 msgid "Search"
 msgstr "尋找"
 
-#: ../rpmdrake_.c:611
+#: ../rpmdrake_.c:616
 msgid "Install"
 msgstr "安裝"
 
-#: ../rpmdrake_.c:637
+#: ../rpmdrake_.c:642
 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 
-#: ../rpmdrake_.c:638
+#: ../rpmdrake_.c:643
 msgid "Mandrake Update"
 msgstr "Mandrake 更新"
 
-#: ../rpmdrake_.c:638
+#: ../rpmdrake_.c:643
 msgid "Software Packages Removal"
 msgstr "移除套件程式"
 
-#: ../rpmdrake_.c:639
+#: ../rpmdrake_.c:644
 msgid "Software Packages Installation"
 msgstr "安裝套件程式"
 
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:677
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -765,23 +757,23 @@ msgstr ""
 "\n"
 "您現在要繼續嗎？"
 
-#: ../rpmdrake_.c:676
+#: ../rpmdrake_.c:681
 msgid "Please wait, contacting mirror to update packages information."
 msgstr "請稍後，正在取得可供更新的套件清單資訊"
 
-#: ../rpmdrake_.c:678
+#: ../rpmdrake_.c:683
 msgid "Error updating medium"
 msgstr "更新媒介時發生錯誤"
 
-#: ../rpmdrake_.c:679
+#: ../rpmdrake_.c:684
 msgid "There was an unrecoverable error while updating packages information."
 msgstr "在更新套件資訊時發生了無法更正的錯誤情況。"
 
-#: ../rpmdrake_.c:685
+#: ../rpmdrake_.c:690
 msgid "How to choose manually your mirror"
 msgstr "如何手動選擇您需要的映射站台"
 
-#: ../rpmdrake_.c:686
+#: ../rpmdrake_.c:691
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Sources Manager, and then add a `Security\n"
@@ -794,15 +786,15 @@ msgstr ""
 "\n"
 "完成後，請重新啟動 MandrakeUpdate 程式。"
 
-#: ../rpmdrake_.c:692
+#: ../rpmdrake_.c:697
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr "請稍後，正連線到映射站台初始畫提供更新的套件項目。"
 
-#: ../rpmdrake_.c:696
+#: ../rpmdrake_.c:701
 msgid "Error adding update medium"
 msgstr "新增更新媒介時發生錯誤"
 
-#: ../rpmdrake_.c:697
+#: ../rpmdrake_.c:702
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -821,50 +813,50 @@ msgstr ""
 "\n"
 "您要另外嘗試使用其他更新站台嗎？"
 
-#: ../rpmdrake_.c:726
+#: ../rpmdrake_.c:731
 msgid "Please wait, finding available packages..."
 msgstr "請稍後，正在尋找可用的套件清單..."
 
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:754
 msgid "All requested packages were installed successfully."
 msgstr "已經成功地安裝您需要的套件。"
 
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:754
 msgid "Everything installed successfully"
 msgstr "所有項目已經都安裝成功了。"
 
-#: ../rpmdrake_.c:752
+#: ../rpmdrake_.c:757
 msgid "Installation finished"
 msgstr "安裝完成"
 
-#: ../rpmdrake_.c:755
+#: ../rpmdrake_.c:760
 #, c-format
 msgid "Inspecting %s"
 msgstr "正在檢查 %s"
 
-#: ../rpmdrake_.c:771
+#: ../rpmdrake_.c:776
 #, c-format
 msgid "Remove .%s"
 msgstr "移除 .%s"
 
-#: ../rpmdrake_.c:773
+#: ../rpmdrake_.c:778
 #, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 為主要檔案"
 
-#: ../rpmdrake_.c:775
+#: ../rpmdrake_.c:780
 msgid "Do nothing"
 msgstr "沒有進行任何動作"
 
-#: ../rpmdrake_.c:778
+#: ../rpmdrake_.c:783
 msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 
-#: ../rpmdrake_.c:787
+#: ../rpmdrake_.c:800
 msgid "Inspect..."
 msgstr "檢查..."
 
-#: ../rpmdrake_.c:800
+#: ../rpmdrake_.c:813
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -878,38 +870,38 @@ msgstr ""
 "或者是把原本設定檔案重新命名為 '.rpmsave'，為了能夠讓程式\n"
 "能夠正常執行工作，您需要檢視下面的步驟："
 
-#: ../rpmdrake_.c:801
+#: ../rpmdrake_.c:814
 msgid ""
 "some packages failed to install\n"
 "correctly"
 msgstr "某些套件無法安裝上"
 
-#: ../rpmdrake_.c:802
+#: ../rpmdrake_.c:815
 msgid "everything was installed correctly"
 msgstr "所有項目已經都安裝成功了。"
 
-#: ../rpmdrake_.c:821
+#: ../rpmdrake_.c:834
 msgid "Unable to get source packages."
 msgstr "大件事，無法取得原始套件"
 
-#: ../rpmdrake_.c:822
+#: ../rpmdrake_.c:835
 msgid "Unable to get source packages, sorry."
 msgstr "真抱歉，無法取得原始套件"
 
-#: ../rpmdrake_.c:829
+#: ../rpmdrake_.c:842
 msgid "Change medium"
 msgstr "變更媒介"
 
-#: ../rpmdrake_.c:830
+#: ../rpmdrake_.c:843
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "請置入媒介名稱為 \"%s\" 的項目放置於 %s 裝置"
 
-#: ../rpmdrake_.c:838
+#: ../rpmdrake_.c:851
 msgid "Installation failed"
 msgstr "安裝失敗"
 
-#: ../rpmdrake_.c:839
+#: ../rpmdrake_.c:852
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -917,35 +909,35 @@ msgstr ""
 "安裝失敗，安裝程式找不到一些要安裝上的程式套件。\n"
 "也許是系統資料庫太舊了，請先更新資料庫後再繼續。"
 
-#: ../rpmdrake_.c:842
+#: ../rpmdrake_.c:855
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr "請稍後，移除一些套件項目，以便於能夠進行其他套件的更新..."
 
-#: ../rpmdrake_.c:851
+#: ../rpmdrake_.c:864
 msgid "Program missing"
 msgstr "找不到所需要的程式"
 
-#: ../rpmdrake_.c:852
+#: ../rpmdrake_.c:865
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr "無法呼叫 grpmi 程式，也許程式遺失或者是不正確。"
 
-#: ../rpmdrake_.c:870
+#: ../rpmdrake_.c:883
 msgid "Everything already installed."
 msgstr "所有套件已經安裝上。"
 
-#: ../rpmdrake_.c:871
+#: ../rpmdrake_.c:884
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "所有套件已經安裝上。"
 
-#: ../rpmdrake_.c:881
+#: ../rpmdrake_.c:894
 msgid "Please wait, reading packages database..."
 msgstr "請稍後，讀取套件資料庫資訊中..."
 
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:932
 msgid "Please wait, removing packages..."
 msgstr "請稍候，正在移除套件..."
 
-#: ../rpmdrake_.c:934
+#: ../rpmdrake_.c:947
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -956,7 +948,7 @@ msgstr ""
 "\n"
 "接下來程式將會引導你完成移除您認為不需要的套件項目。"
 
-#: ../rpmdrake_.c:939
+#: ../rpmdrake_.c:952
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -966,7 +958,7 @@ msgstr ""
 "歡迎來到套件更新程式!\n"
 "接下來程式將會引導你完成套件更新與安裝。"
 
-#: ../rpmdrake_.c:944
+#: ../rpmdrake_.c:957
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -994,6 +986,58 @@ msgstr "套件來源管理員"
 msgid "Install Software"
 msgstr "安裝套件"
 
+#~ msgid ""
+#~ "%sFiles:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Changelog:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s檔案：\n"
+#~ "%s\n"
+#~ "\n"
+#~ "變更紀錄：\n"
+#~ "%s"
+
+#~ msgid "Source: %s\n"
+#~ msgstr "來源：%s\n"
+
+#~ msgid ""
+#~ "Name: %s\n"
+#~ "Version: %s\n"
+#~ "Size: %s KB\n"
+#~ "Importance: %s\n"
+#~ "\n"
+#~ "Summary: %s\n"
+#~ "\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "名稱：%s\n"
+#~ "版本：%s\n"
+#~ "大小：%s KB\n"
+#~ "重要性：%s\n"
+#~ "\n"
+#~ "簡介：%s\n"
+#~ "\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Name: %s\n"
+#~ "Version: %s\n"
+#~ "Size: %s KB\n"
+#~ "\n"
+#~ "Summary: %s\n"
+#~ "\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "名稱：%s\n"
+#~ "版本：%s\n"
+#~ "大小：%s KB\n"
+#~ "\n"
+#~ "簡介：%s\n"
+#~ "\n"
+#~ "%s\n"
+
 #~ msgid "(Non available)"
 #~ msgstr "(無法使用)"
 
@@ -1262,9 +1306,6 @@ msgstr "安裝套件"
 #~ "請稍候\n"
 #~ "正在取回映射地址的清單"
 
-#~ msgid "%.1f KB"
-#~ msgstr "%.1f KB"
-
 #~ msgid "%.1f MB"
 #~ msgstr "%.1f MB"
 
@@ -1372,9 +1413,6 @@ msgstr "安裝套件"
 #~ msgid "0 selected packages: 0.0 MB"
 #~ msgstr "選擇了 0 個套件：0.0 MB"
 
-#~ msgid "/_File"
-#~ msgstr "/檔案 (_F)"
-
 #~ msgid "/File/_Preferences"
 #~ msgstr "/檔案/編好設定 (_P)"
 
@@ -1396,15 +1434,9 @@ msgstr "安裝套件"
 #~ msgid "Installed"
 #~ msgstr "已安裝"
 
-#~ msgid "Size"
-#~ msgstr "大小"
-
 #~ msgid "Type"
 #~ msgstr "類別"
 
-#~ msgid "Summary"
-#~ msgstr "摘要"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate，版本 7.2\n"
 
@@ -1534,9 +1566,6 @@ msgstr "安裝套件"
 #~ msgid "Network settings:"
 #~ msgstr "網路設定："
 
-#~ msgid "Version:"
-#~ msgstr "版本："
-
 #~ msgid "Show security updates"
 #~ msgstr "顯示安全更新套件"