merge in latest changes, update french translation

1 files changed, 130 insertions, 120 deletions

diff --git a/po/ca.po b/po/ca.po
index ff97eb88..303ee7a4 100644
--- a/po/ca.po
+++ b/po/ca.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: 2001-09-20 20:49+0200\n"
 "Last-Translator: Softcatalà <traddrake@softcatala.org>\n"
 "Language-Team: Catalan <info@softcatala.org>\n"
@@ -62,7 +62,7 @@ msgstr "punt de muntatge:"
 msgid "Removable device"
 msgstr "Elimina el suport"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:340
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:344
 msgid "Security updates"
 msgstr "Actualitzacions de seguretat"
 
@@ -113,13 +113,13 @@ msgstr "Edita les fonts"
 msgid "Type of source:"
 msgstr "Tipus de font:"
 
-#: ../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 ""
 
 #: ../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 "Cancel·la"
 
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Source"
 msgstr "Font"
 
-#: ../edit-urpm-sources.pl_.c:242 ../rpmdrake_.c:477
+#: ../edit-urpm-sources.pl_.c:242 ../rpmdrake_.c:482
 #, fuzzy
 msgid "Remove"
 msgstr "Extraïble"
@@ -212,11 +212,11 @@ msgstr ""
 msgid "Save and quit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:252 ../rpmdrake_.c:480
+#: ../edit-urpm-sources.pl_.c:252 ../rpmdrake_.c:486
 msgid "Quit"
 msgstr "Surt"
 
-#: ../edit-urpm-sources.pl_.c:262 ../rpmdrake_.c:702
+#: ../edit-urpm-sources.pl_.c:262 ../rpmdrake_.c:708
 #, c-format
 msgid ""
 "%s\n"
@@ -233,125 +233,125 @@ 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 ""
 
-#: ../rpmdrake.pm_.c:139
+#: ../rpmdrake.pm_.c:140
 #, fuzzy
 msgid "Finland"
 msgstr "Cerca:"
 
-#: ../rpmdrake.pm_.c:140
+#: ../rpmdrake.pm_.c:141
 #, fuzzy
 msgid "France"
 msgstr "Cancel·la"
 
-#: ../rpmdrake.pm_.c:142
+#: ../rpmdrake.pm_.c:143
 #, fuzzy
 msgid "Israel"
 msgstr "Instal·lat"
 
-#: ../rpmdrake.pm_.c:143
+#: ../rpmdrake.pm_.c:144
 #, fuzzy
 msgid "Italy"
 msgstr "Instal·lat"
 
-#: ../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 ""
 
-#: ../rpmdrake.pm_.c:149
+#: ../rpmdrake.pm_.c:150
 #, fuzzy
 msgid "Portugal"
 msgstr "Port:"
 
-#: ../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"
@@ -359,15 +359,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"
@@ -377,12 +377,12 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm_.c:236
+#: ../rpmdrake.pm_.c:237
 #, fuzzy
 msgid "No mirror"
 msgstr "Cap error"
 
-#: ../rpmdrake.pm_.c:237
+#: ../rpmdrake.pm_.c:238
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -391,7 +391,7 @@ msgid ""
 "by Mandrake Linux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm_.c:251
+#: ../rpmdrake.pm_.c:252
 #, fuzzy
 msgid "Please choose the desired mirror."
 msgstr ""
@@ -406,56 +406,72 @@ 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
 #, fuzzy
 msgid "Please choose"
 msgstr "Si us plau, confirmeu-ho"
 
-#: ../rpmdrake_.c:170
+#: ../rpmdrake_.c:169
 #, fuzzy
 msgid "unknown package "
 msgstr "Pàgina desconeguda"
 
-#: ../rpmdrake_.c:180
+#: ../rpmdrake_.c:179
 #, fuzzy
 msgid "Please wait, listing packages..."
 msgstr "Si us plau, espereu; s'estan eliminant els paquets"
 
-#: ../rpmdrake_.c:205
+#: ../rpmdrake_.c:191
+msgid "(none)"
+msgstr "(cap)"
+
+#: ../rpmdrake_.c:191
+#, fuzzy
+msgid "No update"
+msgstr "actualitzacions normals"
+
+#: ../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
 #, fuzzy
 msgid "Addable"
 msgstr "Disponible"
 
-#: ../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 ""
 
-#: ../rpmdrake_.c:243
+#: ../rpmdrake_.c:246
 #, fuzzy
 msgid "Some additional packages need to be removed"
 msgstr ""
 "Cal instal·lar aquests paquets addicionals per tal que tot funcioni "
 "correctament:"
 
-#: ../rpmdrake_.c:244
+#: ../rpmdrake_.c:247
 #, fuzzy
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -465,54 +481,54 @@ msgstr ""
 "Per poder satisfer totes les dependències,\n"
 "s'eliminaran aquests paquets:"
 
-#: ../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"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:270
+#: ../rpmdrake_.c:273
 #, fuzzy
 msgid "Some packages can't be installed"
 msgstr "Els paquets ja estan instal·lats"
 
-#: ../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
-#, c-format
-msgid "Total size: %d MB"
-msgstr ""
+#: ../rpmdrake_.c:304
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d paquets seleccionats: %.1f MB"
 
-#: ../rpmdrake_.c:307
+#: ../rpmdrake_.c:311
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -525,7 +541,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../rpmdrake_.c:311
+#: ../rpmdrake_.c:315
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -537,67 +553,67 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../rpmdrake_.c:340
+#: ../rpmdrake_.c:344
 #, fuzzy
 msgid "Bugfixes updates"
 msgstr "Actualitzacions de seguretat"
 
-#: ../rpmdrake_.c:340
+#: ../rpmdrake_.c:344
 #, fuzzy
 msgid "Normal updates"
 msgstr "actualitzacions normals"
 
-#: ../rpmdrake_.c:359
+#: ../rpmdrake_.c:363
 #, fuzzy
 msgid "Mandrake choices"
 msgstr "MandrakeUpdate"
 
-#: ../rpmdrake_.c:360
+#: ../rpmdrake_.c:364
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake_.c:361
+#: ../rpmdrake_.c:365
 #, fuzzy
 msgid "All packages,"
 msgstr "0 paquets, 0 bytes"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake_.c:388
 msgid "by group"
 msgstr ""
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake_.c:388
 #, fuzzy
 msgid "by size"
 msgstr "Mida profunda"
 
-#: ../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 ""
 
-#: ../rpmdrake_.c:409 ../rpmdrake_.c:435
+#: ../rpmdrake_.c:413 ../rpmdrake_.c:440
 #, fuzzy
 msgid "Search results"
 msgstr "Cerca resultats"
 
-#: ../rpmdrake_.c:409
+#: ../rpmdrake_.c:413
 #, fuzzy
 msgid "Search results (none)"
 msgstr "Cerca resultats"
 
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:419
 #, fuzzy
 msgid "Please wait, searching in files..."
 msgstr "Si us plau, espereu; s'estan eliminant els paquets"
 
-#: ../rpmdrake_.c:445
+#: ../rpmdrake_.c:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -607,42 +623,42 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake_.c:462
+#: ../rpmdrake_.c:467
 msgid "Find:"
 msgstr "Cerca:"
 
-#: ../rpmdrake_.c:466
+#: ../rpmdrake_.c:471
 msgid "Search"
 msgstr "Cerca"
 
-#: ../rpmdrake_.c:478
+#: ../rpmdrake_.c:483
 #, fuzzy
 msgid "Install"
 msgstr "Instal·lat"
 
-#: ../rpmdrake_.c:489
+#: ../rpmdrake_.c:495
 #, fuzzy
 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr "-adobe-helvetica-bold-r-*-*-*-100-*-*-*-*-iso8859-*,*"
 
-#: ../rpmdrake_.c:490
+#: ../rpmdrake_.c:496
 #, fuzzy
 msgid "Mandrake Update"
 msgstr ""
 "Mandrake\n"
 "Update"
 
-#: ../rpmdrake_.c:490
+#: ../rpmdrake_.c:496
 #, fuzzy
 msgid "Software Packages Removal"
 msgstr " Gestor de programari "
 
-#: ../rpmdrake_.c:491
+#: ../rpmdrake_.c:497
 #, fuzzy
 msgid "Software Packages Installation"
 msgstr "Instal·lació de paquets"
 
-#: ../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"
@@ -650,27 +666,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"
@@ -683,69 +699,69 @@ msgid ""
 "Do you want to try another mirror?"
 msgstr ""
 
-#: ../rpmdrake_.c:569
+#: ../rpmdrake_.c:575
 #, fuzzy
 msgid "Please wait, finding available packages..."
 msgstr "Si us plau, espereu; s'estan eliminant els paquets"
 
-#: ../rpmdrake_.c:606
+#: ../rpmdrake_.c:612
 #, fuzzy
 msgid "Unable to get source packages."
 msgstr "Paquets incorrectes, il·legibles o no trobats"
 
-#: ../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 ""
 
-#: ../rpmdrake_.c:623 ../rpmdrake_.c:631
+#: ../rpmdrake_.c:629 ../rpmdrake_.c:637
 #, fuzzy
 msgid "Installation failed"
 msgstr "S'està instal·lant "
 
-#: ../rpmdrake_.c:624
+#: ../rpmdrake_.c:630
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
 msgstr ""
 
-#: ../rpmdrake_.c:627
+#: ../rpmdrake_.c:633
 #, fuzzy
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr "Si us plau, espereu; s'estan eliminant els paquets"
 
-#: ../rpmdrake_.c:632
+#: ../rpmdrake_.c:638
 msgid "There was a problem during installation."
 msgstr ""
 
-#: ../rpmdrake_.c:636
+#: ../rpmdrake_.c:642
 #, fuzzy
 msgid "Everything already installed."
 msgstr "El paquet ja està instal·lat"
 
-#: ../rpmdrake_.c:637
+#: ../rpmdrake_.c:643
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:661
 #, fuzzy
 msgid "Please wait, reading packages database..."
 msgstr "Si us plau, espereu; s'estan eliminant els paquets"
 
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:678
 #, fuzzy
 msgid "Please wait, removing packages..."
 msgstr "Si us plau, espereu; s'estan eliminant els paquets"
 
-#: ../rpmdrake_.c:706
+#: ../rpmdrake_.c:712
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -753,7 +769,7 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake_.c:711
+#: ../rpmdrake_.c:717
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -761,7 +777,7 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake_.c:716
+#: ../rpmdrake_.c:722
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -804,9 +820,6 @@ msgstr ""
 #~ msgid "Relative path to synthesis or hdlist:"
 #~ msgstr "camí relatiu a l'hdlist: "
 
-#~ msgid "(none)"
-#~ msgstr "(cap)"
-
 #~ msgid "%d packages, %Ld bytes"
 #~ msgstr "%d paquets, %Ld bytes"
 
@@ -1708,9 +1721,6 @@ msgstr ""
 #~ msgid "Name: %s"
 #~ msgstr "Nom: %s"
 
-#~ msgid "%d selected packages: %.1f MB"
-#~ msgstr "%d paquets seleccionats: %.1f MB"
-
 #~ msgid "0 selected packages: 0.0 MB"
 #~ msgstr "0 paquets seleccionats: 0.0 MB"