merge in latest changes, update french translation

1 files changed, 131 insertions, 117 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index b60dc3e2..6b225851 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-08-05 18:39+0200\n"
+"POT-Creation-Date: 2002-08-06 13:44+0200\n"
 "PO-Revision-Date: 2002-02-28 05:00--800\n"
 "Last-Translator: Kenduest Lee <kenduest@i18n.linux.org.tw>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
@@ -69,7 +69,7 @@ msgid "Removable device"
 msgstr ""
 
 # media.c:1285 media.c:1397
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:340
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:344
 msgid "Security updates"
 msgstr "安全更新"
 
@@ -132,14 +132,14 @@ msgstr ""
 msgid "Type of source:"
 msgstr "來源類別："
 
-#: ../edit-urpm-sources.pl_.c:124 ../rpmdrake.pm_.c:74 ../rpmdrake.pm_.c:87
-#: ../rpmdrake.pm_.c:259 ../rpmdrake_.c:616
+#: ../edit-urpm-sources.pl_.c:124 ../rpmdrake.pm_.c:75 ../rpmdrake.pm_.c:88
+#: ../rpmdrake.pm_.c:260 ../rpmdrake_.c:622
 msgid "Ok"
 msgstr ""
 
 # main.c:1231 media.c:459 media.c:572
 #: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:174
-#: ../edit-urpm-sources.pl_.c:199 ../rpmdrake.pm_.c:259 ../rpmdrake_.c:616
+#: ../edit-urpm-sources.pl_.c:199 ../rpmdrake.pm_.c:260 ../rpmdrake_.c:622
 msgid "Cancel"
 msgstr "取消"
 
@@ -215,7 +215,7 @@ msgid "Source"
 msgstr "套件來源"
 
 # media.c:1167 media.c:1373
-#: ../edit-urpm-sources.pl_.c:242 ../rpmdrake_.c:477
+#: ../edit-urpm-sources.pl_.c:242 ../rpmdrake_.c:482
 #, fuzzy
 msgid "Remove"
 msgstr "可移除裝置"
@@ -238,11 +238,11 @@ msgid "Save and quit"
 msgstr ""
 
 # main.c:1083 rpminst/src/all_pages.cpp:346 rpmview/rpmview.c:146
-#: ../edit-urpm-sources.pl_.c:252 ../rpmdrake_.c:480
+#: ../edit-urpm-sources.pl_.c:252 ../rpmdrake_.c:486
 msgid "Quit"
 msgstr "離開"
 
-#: ../edit-urpm-sources.pl_.c:262 ../rpmdrake_.c:702
+#: ../edit-urpm-sources.pl_.c:262 ../rpmdrake_.c:708
 #, c-format
 msgid ""
 "%s\n"
@@ -259,130 +259,130 @@ msgid ""
 "or to perform updates."
 msgstr ""
 
-#: ../rpmdrake.pm_.c:70
+#: ../rpmdrake.pm_.c:71
 msgid "Yes"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:72
+#: ../rpmdrake.pm_.c:73
 msgid "No"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:129
+#: ../rpmdrake.pm_.c:130
 msgid "Austria"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:130
+#: ../rpmdrake.pm_.c:131
 msgid "Belgium"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:131
+#: ../rpmdrake.pm_.c:132
 msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:132
+#: ../rpmdrake.pm_.c:133
 msgid "Canada"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:133
+#: ../rpmdrake.pm_.c:134
 msgid "Costa Rica"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:134
+#: ../rpmdrake.pm_.c:135
 msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:135
+#: ../rpmdrake.pm_.c:136
 msgid "Germany"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:136
+#: ../rpmdrake.pm_.c:137
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:137 ../rpmdrake.pm_.c:141
+#: ../rpmdrake.pm_.c:138 ../rpmdrake.pm_.c:142
 msgid "Greece"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:138
+#: ../rpmdrake.pm_.c:139
 msgid "Spain"
 msgstr ""
 
 # main.c:2116 main.c:2292
-#: ../rpmdrake.pm_.c:139
+#: ../rpmdrake.pm_.c:140
 #, fuzzy
 msgid "Finland"
 msgstr "尋找："
 
 # main.c:1231 media.c:459 media.c:572
-#: ../rpmdrake.pm_.c:140
+#: ../rpmdrake.pm_.c:141
 #, fuzzy
 msgid "France"
 msgstr "取消"
 
 # main.c:2108
-#: ../rpmdrake.pm_.c:142
+#: ../rpmdrake.pm_.c:143
 #, fuzzy
 msgid "Israel"
 msgstr "已安裝"
 
 # main.c:2108
-#: ../rpmdrake.pm_.c:143
+#: ../rpmdrake.pm_.c:144
 #, fuzzy
 msgid "Italy"
 msgstr "已安裝"
 
-#: ../rpmdrake.pm_.c:144
+#: ../rpmdrake.pm_.c:145
 msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:145
+#: ../rpmdrake.pm_.c:146
 msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:146
+#: ../rpmdrake.pm_.c:147
 msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:147
+#: ../rpmdrake.pm_.c:148
 msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:148
+#: ../rpmdrake.pm_.c:149
 msgid "Poland"
 msgstr ""
 
 # proxies.c:269 proxies.c:302
-#: ../rpmdrake.pm_.c:149
+#: ../rpmdrake.pm_.c:150
 #, fuzzy
 msgid "Portugal"
 msgstr "埠號："
 
-#: ../rpmdrake.pm_.c:150
+#: ../rpmdrake.pm_.c:151
 msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:151
+#: ../rpmdrake.pm_.c:152
 msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:152
+#: ../rpmdrake.pm_.c:153
 msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:153
+#: ../rpmdrake.pm_.c:154
 msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:154
+#: ../rpmdrake.pm_.c:155
 msgid "China"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:155 ../rpmdrake.pm_.c:156 ../rpmdrake.pm_.c:157
-#: ../rpmdrake.pm_.c:158 ../rpmdrake.pm_.c:209
+#: ../rpmdrake.pm_.c:156 ../rpmdrake.pm_.c:157 ../rpmdrake.pm_.c:158
+#: ../rpmdrake.pm_.c:159 ../rpmdrake.pm_.c:210
 msgid "United States"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:217
+#: ../rpmdrake.pm_.c:218
 msgid ""
 "I need to contact MandrakeSoft website to get the mirrors list.\n"
 "Please check that your network is currently running.\n"
@@ -390,15 +390,15 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:221
+#: ../rpmdrake.pm_.c:222
 msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake.pm_.c:227
+#: ../rpmdrake.pm_.c:228
 msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:228
+#: ../rpmdrake.pm_.c:229
 #, c-format
 msgid ""
 "There was an error downloading the mirrors list:\n"
@@ -409,12 +409,12 @@ msgid ""
 msgstr ""
 
 # softman_toolbox/error_codes.c:50
-#: ../rpmdrake.pm_.c:236
+#: ../rpmdrake.pm_.c:237
 #, fuzzy
 msgid "No mirror"
 msgstr "沒有錯誤"
 
-#: ../rpmdrake.pm_.c:237
+#: ../rpmdrake.pm_.c:238
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -424,7 +424,7 @@ msgid ""
 msgstr ""
 
 # media.c:454 media.c:567
-#: ../rpmdrake.pm_.c:251
+#: ../rpmdrake.pm_.c:252
 #, fuzzy
 msgid "Please choose the desired mirror."
 msgstr ""
@@ -439,56 +439,75 @@ msgid ""
 "Disabling \"Mandrake choices\" classification."
 msgstr ""
 
-#: ../rpmdrake_.c:125
+#: ../rpmdrake_.c:124
 msgid "(Non available)"
 msgstr ""
 
-#: ../rpmdrake_.c:140
+#: ../rpmdrake_.c:139
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake_.c:140
+#: ../rpmdrake_.c:139
 msgid "Please choose"
 msgstr ""
 
 # rpminst/src/all_pages.cpp:89
-#: ../rpmdrake_.c:170
+#: ../rpmdrake_.c:169
 #, fuzzy
 msgid "unknown package "
 msgstr "不詳的頁面"
 
 # main.c:1193
-#: ../rpmdrake_.c:180
+#: ../rpmdrake_.c:179
 #, fuzzy
 msgid "Please wait, listing packages..."
 msgstr "請稍候，正在移除這些套件："
 
-#: ../rpmdrake_.c:205
+# installable.c:128 installable.c:224 installable.c:819
+# softman_toolbox/gtkpkgdetails.c:448
+#: ../rpmdrake_.c:191
+msgid "(none)"
+msgstr "(無)"
+
+# mu_wizard.c:203
+#: ../rpmdrake_.c:191
+#, fuzzy
+msgid "No update"
+msgstr "一般更新"
+
+#: ../rpmdrake_.c:192
+msgid ""
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+
+#: ../rpmdrake_.c:208
 msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake_.c:205
+#: ../rpmdrake_.c:208
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake_.c:238
+#: ../rpmdrake_.c:241
 msgid "This would break your system"
 msgstr ""
 
-#: ../rpmdrake_.c:239
+#: ../rpmdrake_.c:242
 msgid ""
 "Sorry, removing these packages would break your system:\n"
 "\n"
 msgstr ""
 
 # rpminst/src/page_infos_deps.cpp:86
-#: ../rpmdrake_.c:243
+#: ../rpmdrake_.c:246
 #, fuzzy
 msgid "Some additional packages need to be removed"
 msgstr "為了可以全面運作正常這些額外的套件必須一同安裝："
 
 # main.c:1168
-#: ../rpmdrake_.c:244
+#: ../rpmdrake_.c:247
 #, fuzzy
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -498,22 +517,22 @@ msgstr ""
 "為了要符合所有相依性，\n"
 "這些套件將會被移除："
 
-#: ../rpmdrake_.c:251
+#: ../rpmdrake_.c:254
 msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:252 ../rpmdrake_.c:285
+#: ../rpmdrake_.c:255 ../rpmdrake_.c:288
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:266
+#: ../rpmdrake_.c:269
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake_.c:267
+#: ../rpmdrake_.c:270
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -521,32 +540,32 @@ msgid ""
 msgstr ""
 
 # rpminst/src/page_files_errors.cpp:143
-#: ../rpmdrake_.c:270
+#: ../rpmdrake_.c:273
 #, fuzzy
 msgid "Some packages can't be installed"
 msgstr "套件已安裝"
 
-#: ../rpmdrake_.c:271
+#: ../rpmdrake_.c:274
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:284 ../rpmdrake_.c:444
+#: ../rpmdrake_.c:287 ../rpmdrake_.c:449
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:299
+#: ../rpmdrake_.c:302
 #, c-format
-msgid "Total size: %d / %d MB"
+msgid "Selected: %d MB / Available: %d MB"
 msgstr ""
 
-#: ../rpmdrake_.c:300
+#: ../rpmdrake_.c:304
 #, c-format
-msgid "Total size: %d MB"
+msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake_.c:307
+#: ../rpmdrake_.c:311
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -559,7 +578,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../rpmdrake_.c:311
+#: ../rpmdrake_.c:315
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -572,74 +591,74 @@ msgid ""
 msgstr ""
 
 # media.c:1285 media.c:1397
-#: ../rpmdrake_.c:340
+#: ../rpmdrake_.c:344
 #, fuzzy
 msgid "Bugfixes updates"
 msgstr "安全更新"
 
 # mu_wizard.c:203
-#: ../rpmdrake_.c:340
+#: ../rpmdrake_.c:344
 #, fuzzy
 msgid "Normal updates"
 msgstr "一般更新"
 
 # mu_wizard.c:769
-#: ../rpmdrake_.c:359
+#: ../rpmdrake_.c:363
 #, fuzzy
 msgid "Mandrake choices"
 msgstr "Mandrake 套件更新"
 
-#: ../rpmdrake_.c:360
+#: ../rpmdrake_.c:364
 msgid "All packages, alphabetical"
 msgstr ""
 
 # main.c:2248 main.c:2438
-#: ../rpmdrake_.c:361
+#: ../rpmdrake_.c:365
 #, fuzzy
 msgid "All packages,"
 msgstr "0 套件，0 位元"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake_.c:388
 msgid "by group"
 msgstr ""
 
 # softman_toolbox/gtkpkgfiles.c:150
-#: ../rpmdrake_.c:384
+#: ../rpmdrake_.c:388
 #, fuzzy
 msgid "by size"
 msgstr "目錄大小"
 
-#: ../rpmdrake_.c:385
+#: ../rpmdrake_.c:389
 msgid "by selection state"
 msgstr ""
 
-#: ../rpmdrake_.c:386
+#: ../rpmdrake_.c:390
 msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake_.c:386
+#: ../rpmdrake_.c:390
 msgid "by update availability"
 msgstr ""
 
 # main.c:382 main.c:1574 main.c:1576
-#: ../rpmdrake_.c:409 ../rpmdrake_.c:435
+#: ../rpmdrake_.c:413 ../rpmdrake_.c:440
 #, fuzzy
 msgid "Search results"
 msgstr "搜尋結果"
 
 # main.c:382 main.c:1574 main.c:1576
-#: ../rpmdrake_.c:409
+#: ../rpmdrake_.c:413
 #, fuzzy
 msgid "Search results (none)"
 msgstr "搜尋結果"
 
 # main.c:1193
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:419
 #, fuzzy
 msgid "Please wait, searching in files..."
 msgstr "請稍候，正在移除這些套件："
 
-#: ../rpmdrake_.c:445
+#: ../rpmdrake_.c:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -650,28 +669,28 @@ msgid ""
 msgstr ""
 
 # main.c:2116 main.c:2292
-#: ../rpmdrake_.c:462
+#: ../rpmdrake_.c:467
 msgid "Find:"
 msgstr "尋找："
 
 # main.c:2121 main.c:2297
-#: ../rpmdrake_.c:466
+#: ../rpmdrake_.c:471
 #, fuzzy
 msgid "Search"
 msgstr "尋找"
 
 # main.c:2108
-#: ../rpmdrake_.c:478
+#: ../rpmdrake_.c:483
 #, fuzzy
 msgid "Install"
 msgstr "已安裝"
 
-#: ../rpmdrake_.c:489
+#: ../rpmdrake_.c:495
 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr ""
 
 # main.c:2092
-#: ../rpmdrake_.c:490
+#: ../rpmdrake_.c:496
 #, fuzzy
 msgid "Mandrake Update"
 msgstr ""
@@ -679,18 +698,18 @@ msgstr ""
 "更新"
 
 # main.c:2462
-#: ../rpmdrake_.c:490
+#: ../rpmdrake_.c:496
 #, fuzzy
 msgid "Software Packages Removal"
 msgstr "  套件管理員"
 
 # rpminst/src/all_pages.cpp:84
-#: ../rpmdrake_.c:491
+#: ../rpmdrake_.c:497
 #, fuzzy
 msgid "Software Packages Installation"
 msgstr "安裝套件"
 
-#: ../rpmdrake_.c:520
+#: ../rpmdrake_.c:526
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -698,27 +717,27 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake_.c:524
+#: ../rpmdrake_.c:530
 msgid "Please wait, contacting mirror to update packages information."
 msgstr ""
 
-#: ../rpmdrake_.c:526
+#: ../rpmdrake_.c:532
 msgid "Error updating medium"
 msgstr ""
 
-#: ../rpmdrake_.c:527
+#: ../rpmdrake_.c:533
 msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
 
-#: ../rpmdrake_.c:535
+#: ../rpmdrake_.c:541
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
 
-#: ../rpmdrake_.c:539
+#: ../rpmdrake_.c:545
 msgid "Error adding update medium"
 msgstr ""
 
-#: ../rpmdrake_.c:540
+#: ../rpmdrake_.c:546
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -732,73 +751,73 @@ msgid ""
 msgstr ""
 
 # main.c:2085 main.c:2086
-#: ../rpmdrake_.c:569
+#: ../rpmdrake_.c:575
 #, fuzzy
 msgid "Please wait, finding available packages..."
 msgstr "重新載入可用套件的清單"
 
 # rpminst/src/page_files_errors.cpp:65
-#: ../rpmdrake_.c:606
+#: ../rpmdrake_.c:612
 #, fuzzy
 msgid "Unable to get source packages."
 msgstr "大件事，無法讀取或找不到套件"
 
-#: ../rpmdrake_.c:607
+#: ../rpmdrake_.c:613
 msgid "Unable to get source packages, sorry."
 msgstr ""
 
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:620
 msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:621
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
 # main.c:2260
-#: ../rpmdrake_.c:623 ../rpmdrake_.c:631
+#: ../rpmdrake_.c:629 ../rpmdrake_.c:637
 #, fuzzy
 msgid "Installation failed"
 msgstr "可安裝的套件"
 
-#: ../rpmdrake_.c:624
+#: ../rpmdrake_.c:630
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
 msgstr ""
 
 # mu_wizard.c:255
-#: ../rpmdrake_.c:627
+#: ../rpmdrake_.c:633
 #, fuzzy
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr "請選擇您需要更新的套件"
 
-#: ../rpmdrake_.c:632
+#: ../rpmdrake_.c:638
 msgid "There was a problem during installation."
 msgstr ""
 
 # softman_toolbox/error_codes.c:62
-#: ../rpmdrake_.c:636
+#: ../rpmdrake_.c:642
 #, fuzzy
 msgid "Everything already installed."
 msgstr "套件已安裝"
 
-#: ../rpmdrake_.c:637
+#: ../rpmdrake_.c:643
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:661
 msgid "Please wait, reading packages database..."
 msgstr ""
 
 # main.c:1193
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:678
 #, fuzzy
 msgid "Please wait, removing packages..."
 msgstr "請稍候，正在移除這些套件："
 
-#: ../rpmdrake_.c:706
+#: ../rpmdrake_.c:712
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -806,7 +825,7 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake_.c:711
+#: ../rpmdrake_.c:717
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -814,7 +833,7 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake_.c:716
+#: ../rpmdrake_.c:722
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -862,11 +881,6 @@ msgstr ""
 #~ msgid "Relative path to synthesis or hdlist:"
 #~ msgstr "到檔頭清單 (hdlist or sybthesis) 的相對路徑："
 
-# installable.c:128 installable.c:224 installable.c:819
-# softman_toolbox/gtkpkgdetails.c:448
-#~ msgid "(none)"
-#~ msgstr "(無)"
-
 # installable.c:452 installable.c:582 installable.c:650 installable.c:1259
 # installable.c:1400 installed.c:254 installed.c:382 installed.c:450
 # installed.c:1001 installed.c:1140