merge in latest changes

1 files changed, 168 insertions, 140 deletions

diff --git a/po/br.po b/po/br.po
index 25ceb875..6b5c8268 100644
--- a/po/br.po
+++ b/po/br.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-02 00:20+0200\n"
+"POT-Creation-Date: 2002-08-05 18:39+0200\n"
 "PO-Revision-Date: 2000-02-11 14:01+0100\n"
 "Last-Translator: Jañ-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>\n"
 "Language-Team: Brezhoneg <ofisk.bzh@wanadoo.fr>\n"
@@ -56,7 +56,7 @@ msgstr ""
 msgid "Removable device"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:349
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:340
 msgid "Security updates"
 msgstr ""
 
@@ -103,13 +103,13 @@ msgstr "Etre"
 msgid "Type of source:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:124 ../rpmdrake.pm_.c:71 ../rpmdrake.pm_.c:84
-#: ../rpmdrake.pm_.c:271
+#: ../edit-urpm-sources.pl_.c:124 ../rpmdrake.pm_.c:74 ../rpmdrake.pm_.c:87
+#: ../rpmdrake.pm_.c:259 ../rpmdrake_.c:616
 msgid "Ok"
 msgstr ""
 
 #: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:174
-#: ../rpmdrake.pm_.c:271
+#: ../edit-urpm-sources.pl_.c:199 ../rpmdrake.pm_.c:259 ../rpmdrake_.c:616
 msgid "Cancel"
 msgstr "Nullañ"
 
@@ -137,42 +137,64 @@ msgstr "Pakad"
 msgid "Please wait, updating medium..."
 msgstr "Gortozit mar plij"
 
-#: ../edit-urpm-sources.pl_.c:192
+#: ../edit-urpm-sources.pl_.c:191
+#, fuzzy
+msgid "Update source(s)"
+msgstr "Etre"
+
+#: ../edit-urpm-sources.pl_.c:194
+msgid "Select the source(s) you wish to update:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:198
+msgid "Update"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:206
+#, fuzzy
+msgid "Please wait, updating media..."
+msgstr "Gortozit mar plij"
+
+#: ../edit-urpm-sources.pl_.c:213
 #, fuzzy
 msgid "Configure sources"
 msgstr "Ouzhpennañ un arveriad"
 
-#: ../edit-urpm-sources.pl_.c:193
+#: ../edit-urpm-sources.pl_.c:214
 msgid "Enabled?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:193
+#: ../edit-urpm-sources.pl_.c:214
 #, fuzzy
 msgid "Source"
 msgstr "Etre"
 
-#: ../edit-urpm-sources.pl_.c:221
-msgid "Add"
-msgstr ""
-
-#: ../edit-urpm-sources.pl_.c:223 ../rpmdrake_.c:436
+#: ../edit-urpm-sources.pl_.c:242 ../rpmdrake_.c:477
 #, fuzzy
 msgid "Remove"
 msgstr "Dilemel"
 
-#: ../edit-urpm-sources.pl_.c:225
+#: ../edit-urpm-sources.pl_.c:244
 msgid "Edit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:229
+#: ../edit-urpm-sources.pl_.c:246
+msgid "Add..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:248
+msgid "Update..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:251
 msgid "Save and quit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:230 ../rpmdrake_.c:439
+#: ../edit-urpm-sources.pl_.c:252 ../rpmdrake_.c:480
 msgid "Quit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:240 ../rpmdrake_.c:656
+#: ../edit-urpm-sources.pl_.c:262 ../rpmdrake_.c:702
 #, c-format
 msgid ""
 "%s\n"
@@ -180,7 +202,7 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:243
+#: ../edit-urpm-sources.pl_.c:265
 msgid ""
 "Welcome to the packages source editor!\n"
 "\n"
@@ -189,123 +211,123 @@ msgid ""
 "or to perform updates."
 msgstr ""
 
-#: ../rpmdrake.pm_.c:69
+#: ../rpmdrake.pm_.c:70
 msgid "Yes"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:70
+#: ../rpmdrake.pm_.c:72
 msgid "No"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:141
+#: ../rpmdrake.pm_.c:129
 msgid "Austria"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:142
+#: ../rpmdrake.pm_.c:130
 msgid "Belgium"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:143
+#: ../rpmdrake.pm_.c:131
 msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:144
+#: ../rpmdrake.pm_.c:132
 msgid "Canada"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:145
+#: ../rpmdrake.pm_.c:133
 msgid "Costa Rica"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:146
+#: ../rpmdrake.pm_.c:134
 msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:147
+#: ../rpmdrake.pm_.c:135
 msgid "Germany"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:148
+#: ../rpmdrake.pm_.c:136
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:149 ../rpmdrake.pm_.c:153
+#: ../rpmdrake.pm_.c:137 ../rpmdrake.pm_.c:141
 msgid "Greece"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:150
+#: ../rpmdrake.pm_.c:138
 msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:151
+#: ../rpmdrake.pm_.c:139
 msgid "Finland"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:152
+#: ../rpmdrake.pm_.c:140
 #, fuzzy
 msgid "France"
 msgstr "Nullañ"
 
-#: ../rpmdrake.pm_.c:154
+#: ../rpmdrake.pm_.c:142
 #, fuzzy
 msgid "Israel"
 msgstr "O staliañ"
 
-#: ../rpmdrake.pm_.c:155
+#: ../rpmdrake.pm_.c:143
 #, fuzzy
 msgid "Italy"
 msgstr "O staliañ"
 
-#: ../rpmdrake.pm_.c:156
+#: ../rpmdrake.pm_.c:144
 msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:157
+#: ../rpmdrake.pm_.c:145
 msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:158
+#: ../rpmdrake.pm_.c:146
 msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:159
+#: ../rpmdrake.pm_.c:147
 msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:160
+#: ../rpmdrake.pm_.c:148
 msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:161
+#: ../rpmdrake.pm_.c:149
 msgid "Portugal"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:162
+#: ../rpmdrake.pm_.c:150
 msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:163
+#: ../rpmdrake.pm_.c:151
 msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:164
+#: ../rpmdrake.pm_.c:152
 msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:165
+#: ../rpmdrake.pm_.c:153
 msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:166
+#: ../rpmdrake.pm_.c:154
 msgid "China"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:221
+#: ../rpmdrake.pm_.c:155 ../rpmdrake.pm_.c:156 ../rpmdrake.pm_.c:157
+#: ../rpmdrake.pm_.c:158 ../rpmdrake.pm_.c:209
 msgid "United States"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:229
+#: ../rpmdrake.pm_.c:217
 msgid ""
 "I need to contact MandrakeSoft website to get the mirrors list.\n"
 "Please check that your network is currently running.\n"
@@ -313,15 +335,15 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:233
+#: ../rpmdrake.pm_.c:221
 msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake.pm_.c:239
+#: ../rpmdrake.pm_.c:227
 msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:228
 #, c-format
 msgid ""
 "There was an error downloading the mirrors list:\n"
@@ -331,11 +353,11 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm_.c:248
+#: ../rpmdrake.pm_.c:236
 msgid "No mirror"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:237
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -344,19 +366,11 @@ msgid ""
 "by Mandrake Linux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm_.c:263
+#: ../rpmdrake.pm_.c:251
 msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake_.c:31
-#, c-format
-msgid ""
-"Usage: %s [OPTION]...\n"
-"  --noconfirmation       don't ask first confirmation question in "
-"MandrakeUpdate mode\n"
-msgstr ""
-
-#: ../rpmdrake_.c:78
+#: ../rpmdrake_.c:82
 msgid ""
 "Could not find /var/lib/urpmi/compssUsers.flat,\n"
 "the installer should have generated it for me :-(.\n"
@@ -364,104 +378,104 @@ msgid ""
 "Disabling \"Mandrake choices\" classification."
 msgstr ""
 
-#: ../rpmdrake_.c:118
+#: ../rpmdrake_.c:125
 msgid "(Non available)"
 msgstr ""
 
-#: ../rpmdrake_.c:133
+#: ../rpmdrake_.c:140
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake_.c:133
+#: ../rpmdrake_.c:140
 #, fuzzy
 msgid "Please choose"
 msgstr "Gortozit mar plij"
 
-#: ../rpmdrake_.c:163
+#: ../rpmdrake_.c:170
 msgid "unknown package "
 msgstr ""
 
-#: ../rpmdrake_.c:173
+#: ../rpmdrake_.c:180
 msgid "Please wait, listing packages..."
 msgstr ""
 
-#: ../rpmdrake_.c:198
+#: ../rpmdrake_.c:205
 #, fuzzy
 msgid "Addable"
 msgstr "Staliañ ar reizhiad"
 
-#: ../rpmdrake_.c:198
+#: ../rpmdrake_.c:205
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake_.c:231
+#: ../rpmdrake_.c:238
 msgid "This would break your system"
 msgstr ""
 
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:239
 msgid ""
 "Sorry, removing these packages would break your system:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:236
+#: ../rpmdrake_.c:243
 msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:237
+#: ../rpmdrake_.c:244
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:244
+#: ../rpmdrake_.c:251
 msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:245 ../rpmdrake_.c:278
+#: ../rpmdrake_.c:252 ../rpmdrake_.c:285
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake_.c:266
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:267
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:263
+#: ../rpmdrake_.c:270
 msgid "Some packages can't be installed"
 msgstr ""
 
-#: ../rpmdrake_.c:264
+#: ../rpmdrake_.c:271
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:277 ../rpmdrake_.c:403
+#: ../rpmdrake_.c:284 ../rpmdrake_.c:444
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:292
+#: ../rpmdrake_.c:299
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr ""
 
-#: ../rpmdrake_.c:293
+#: ../rpmdrake_.c:300
 #, c-format
 msgid "Total size: %d MB"
 msgstr ""
 
-#: ../rpmdrake_.c:300
+#: ../rpmdrake_.c:307
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -474,7 +488,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../rpmdrake_.c:304
+#: ../rpmdrake_.c:311
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -486,49 +500,63 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../rpmdrake_.c:330
-msgid "By selection"
+#: ../rpmdrake_.c:340
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake_.c:330
-msgid "By size"
+#: ../rpmdrake_.c:340
+msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake_.c:331
-msgid "By presence"
+#: ../rpmdrake_.c:359
+msgid "Mandrake choices"
+msgstr ""
+
+#: ../rpmdrake_.c:360
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake_.c:331
+#: ../rpmdrake_.c:361
 #, fuzzy
-msgid "By source"
-msgstr "Etre"
+msgid "All packages,"
+msgstr "Distaliañ"
 
-#: ../rpmdrake_.c:349
-msgid "Bugfixes updates"
+#: ../rpmdrake_.c:384
+msgid "by group"
 msgstr ""
 
-#: ../rpmdrake_.c:349
-msgid "Normal updates"
+#: ../rpmdrake_.c:384
+msgid "by size"
 msgstr ""
 
-#: ../rpmdrake_.c:368
-msgid "Mandrake choices"
+#: ../rpmdrake_.c:385
+msgid "by selection state"
 msgstr ""
 
-#: ../rpmdrake_.c:369
-msgid "All packages, by group"
+#: ../rpmdrake_.c:386
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake_.c:370
-msgid "All packages, alphabetical"
+#: ../rpmdrake_.c:386
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:395
+#: ../rpmdrake_.c:409 ../rpmdrake_.c:435
 #, fuzzy
 msgid "Search results"
 msgstr "Klask"
 
-#: ../rpmdrake_.c:404
+#: ../rpmdrake_.c:409
+#, fuzzy
+msgid "Search results (none)"
+msgstr "Klask"
+
+#: ../rpmdrake_.c:415
+#, fuzzy
+msgid "Please wait, searching in files..."
+msgstr "Gortozit mar plij"
+
+#: ../rpmdrake_.c:445
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -538,36 +566,36 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake_.c:421
+#: ../rpmdrake_.c:462
 msgid "Find:"
 msgstr ""
 
-#: ../rpmdrake_.c:425
+#: ../rpmdrake_.c:466
 msgid "Search"
 msgstr "Klask"
 
-#: ../rpmdrake_.c:437
+#: ../rpmdrake_.c:478
 #, fuzzy
 msgid "Install"
 msgstr "O staliañ"
 
-#: ../rpmdrake_.c:448
+#: ../rpmdrake_.c:489
 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr ""
 
-#: ../rpmdrake_.c:449
+#: ../rpmdrake_.c:490
 msgid "Mandrake Update"
 msgstr ""
 
-#: ../rpmdrake_.c:449
+#: ../rpmdrake_.c:490
 msgid "Software Packages Removal"
 msgstr ""
 
-#: ../rpmdrake_.c:450
+#: ../rpmdrake_.c:491
 msgid "Software Packages Installation"
 msgstr ""
 
-#: ../rpmdrake_.c:479
+#: ../rpmdrake_.c:520
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -575,27 +603,27 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake_.c:483
+#: ../rpmdrake_.c:524
 msgid "Please wait, contacting mirror to update packages information."
 msgstr ""
 
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:526
 msgid "Error updating medium"
 msgstr ""
 
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:527
 msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
 
-#: ../rpmdrake_.c:494
+#: ../rpmdrake_.c:535
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
 
-#: ../rpmdrake_.c:498
+#: ../rpmdrake_.c:539
 msgid "Error adding update medium"
 msgstr ""
 
-#: ../rpmdrake_.c:499
+#: ../rpmdrake_.c:540
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -608,64 +636,64 @@ msgid ""
 "Do you want to try another mirror?"
 msgstr ""
 
-#: ../rpmdrake_.c:528
+#: ../rpmdrake_.c:569
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:606
 msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake_.c:566
+#: ../rpmdrake_.c:607
 msgid "Unable to get source packages, sorry."
 msgstr ""
 
-#: ../rpmdrake_.c:573
+#: ../rpmdrake_.c:614
 msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake_.c:574
+#: ../rpmdrake_.c:615
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../rpmdrake_.c:582 ../rpmdrake_.c:590
+#: ../rpmdrake_.c:623 ../rpmdrake_.c:631
 #, fuzzy
 msgid "Installation failed"
 msgstr "O staliañ"
 
-#: ../rpmdrake_.c:583
+#: ../rpmdrake_.c:624
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
 msgstr ""
 
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:627
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr ""
 
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:632
 msgid "There was a problem during installation."
 msgstr ""
 
-#: ../rpmdrake_.c:595
+#: ../rpmdrake_.c:636
 msgid "Everything already installed."
 msgstr ""
 
-#: ../rpmdrake_.c:596
+#: ../rpmdrake_.c:637
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../rpmdrake_.c:612
+#: ../rpmdrake_.c:655
 msgid "Please wait, reading packages database..."
 msgstr ""
 
-#: ../rpmdrake_.c:629
+#: ../rpmdrake_.c:672
 #, fuzzy
 msgid "Please wait, removing packages..."
 msgstr "Gortozit mar plij"
 
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:706
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -673,7 +701,7 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake_.c:665
+#: ../rpmdrake_.c:711
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -681,7 +709,7 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake_.c:670
+#: ../rpmdrake_.c:716
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -691,6 +719,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "By source"
+#~ msgstr "Etre"
+
+#, fuzzy
 #~ msgid "search"
 #~ msgstr "Klask"
 
@@ -715,10 +747,6 @@ msgstr ""
 #~ msgstr "Anv"
 
 #, fuzzy
-#~ msgid "Uninstalling packages"
-#~ msgstr "Distaliañ"
-
-#, fuzzy
 #~ msgid "/_File"
 #~ msgstr "Restr"