sync with code

1 files changed, 88 insertions, 84 deletions

diff --git a/po/wa.po b/po/wa.po
index f66f0362..ccb17a00 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-21 08:44+0100\n"
+"POT-Creation-Date: 2012-06-08 19:19+0200\n"
 "PO-Revision-Date: 2004-08-08 20:26+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -266,7 +266,7 @@ msgstr ""
 msgid "Warning"
 msgstr "Adviertixhmint"
 
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
 #, c-format
 msgid "Ok"
 msgstr "'l est bon"
@@ -327,7 +327,7 @@ msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pacaedje, %d Mo)"
 msgstr[1] "(%d pacaedjes, %d Mo)"
 
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "dji n' a savou prinde les pacaedjes sourdants, dji lai toumer"
@@ -364,38 +364,42 @@ msgstr "...l' aberwetaedje a fwait berwete: %s"
 msgid "_Done"
 msgstr "_Fwait"
 
-#: ../gurpmi2:402
-#, c-format
+#: ../gurpmi2:402 ../urpm/main_loop.pm:69
+#, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"%s"
+msgstr "L' astalåcion a fwait berwete:"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
 msgstr ""
 "L' astalaedje a fwait berwete, sacwants fitchîs mankèt:\n"
 "%s\n"
 "Vos dvrîz motoit mete a djoû li båze di dnêyes urpmi."
 
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
 #, c-format
 msgid "Installation failed:"
 msgstr "L' astalåcion a fwait berwete:"
 
-#: ../gurpmi2:413
+#: ../gurpmi2:414
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "tot a ddja stî astalé"
 
-#: ../gurpmi2:415
+#: ../gurpmi2:416
 #, c-format
 msgid "Installation finished"
 msgstr "L' astalåcion a fini"
 
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "dji oistêye li pacaedje %s"
 
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
 #, c-format
 msgid "restarting urpmi"
 msgstr "renondant urpmi"
@@ -525,57 +529,57 @@ msgstr "åk n' a nén stî tot-z eredjistrant les pacaedjes locås"
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Ciste operåcion ci n' est nén possibe e môde rastrindou"
 
-#: ../urpm/args.pm:152 ../urpm/args.pm:161
+#: ../urpm/args.pm:151 ../urpm/args.pm:160
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "måle declaråcion do procsi sol roye di comande\n"
 
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: dji n' sai lére li fitchî rpm «%s»\n"
 
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Patrons po les ratourneures:\n"
 
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "I manke li sinateure (%s)"
 
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Patrons po les ratourneures:\n"
 
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "li ridant po candjî d' raecene (chroot) n' egzistêye nén"
 
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Dji n' sai eployî %s sins %s"
 
-#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:159
+#: ../urpm/args.pm:503 ../urpm/args.pm:506 ../urpmq:159
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Dji n' sai eployî %s avou %s"
 
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Pår trop d' årgumints\n"
@@ -622,7 +626,7 @@ msgstr "dji n' sai lére li fitchî d' apontiaedje [%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "li sopoirt «%s» est defini deus côps, dji lai toumer"
 
-#: ../urpm/cfg.pm:252 ../urpm/media.pm:541
+#: ../urpm/cfg.pm:254 ../urpm/media.pm:541
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "dji n' sai scrire li fitchî d' apontiaedje [%s]"
@@ -737,22 +741,22 @@ msgstr "        %s%% di fwait, radisté = %s"
 msgid "retrieving %s"
 msgstr "prindant %s"
 
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
 #, c-format
 msgid "retrieved %s"
 msgstr "%s a stî pris"
 
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocole nén cnoxhou defini po %s"
 
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nou aberweteu waibe di trové, les cis sopoirtés sont: %s\n"
 
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "dji n' sai manaedjî l' protocole: %s"
@@ -875,19 +879,12 @@ msgstr "båze di dnêyes %s serêye"
 msgid "aborting"
 msgstr "Adviertixhmint"
 
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
 #, c-format
 msgid "Retry?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:89
-#, fuzzy, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr "L' astalåcion a fwait berwete:"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
 #, fuzzy, c-format
 msgid "You may need to update your urpmi database."
 msgstr ""
@@ -895,14 +892,14 @@ msgstr ""
 "%s\n"
 "Vos dvrîz motoit mete a djoû li båze di dnêyes urpmi."
 
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "L' astalåcion a fwait berwete:"
 
-#: ../urpm/main_loop.pm:113
+#: ../urpm/main_loop.pm:94
 #, c-format
 msgid ""
 "There is not enough space on your filesystem to download all packages (%s "
@@ -910,68 +907,68 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:173 ../urpm/main_loop.pm:213 ../urpm/main_loop.pm:294
-#: ../urpm/main_loop.pm:301
-#, c-format
-msgid "Installation failed"
-msgstr "L' astalåcion a fwait berwete"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Li pacaedje ki shût a-st ene mwaijhe sinateure"
 
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Les pacaedjes ki shuvèt ont ene mwaijhe sinateure"
 
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Voloz vs continouwer avou l' astalaedje?"
 
-#: ../urpm/main_loop.pm:217
+#: ../urpm/main_loop.pm:140 ../urpm/main_loop.pm:159 ../urpm/main_loop.pm:263
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Installation failed"
+msgstr "L' astalåcion a fwait berwete"
+
+#: ../urpm/main_loop.pm:144
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "oistaedje des rpms astalés (%s) a pårti di %s"
 
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
 #, c-format
-msgid "distributing %s"
-msgstr "dji distribouwe %s"
+msgid "Try to continue anyway?"
+msgstr ""
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
 #, c-format
 msgid "installing %s from %s"
 msgstr "dj' astale %s a pårti di %s"
 
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
 #, c-format
 msgid "installing %s"
 msgstr "dj' astale %s"
 
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "dji distribouwe %s"
+
+#: ../urpm/main_loop.pm:264
 #, fuzzy, c-format
 msgid "Try installation without checking dependencies?"
 msgstr "Sayî d' astaler sin verifyî les aloyaedjes? (o/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
 #, fuzzy, c-format
 msgid "Try harder to install (--force)?"
 msgstr "Sayî d' astaler co pus foirt (--force)? (o/N) "
 
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
 #, c-format
 msgid "Packages are up to date"
 msgstr "Les pacaedjes sont-st a djoû"
 
-#: ../urpm/main_loop.pm:356 ../urpm/parallel.pm:299
+#: ../urpm/main_loop.pm:442 ../urpm/parallel.pm:299
 #, c-format
 msgid "Installation is possible"
 msgstr "L' astalaedje est possibe"
@@ -1509,37 +1506,37 @@ msgstr ""
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Les pacaedjes %s èn polèt nén esse astalés"
 
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Li pacaedje %s a ddja stî astalé"
 
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Les pacaedjes %s ont ddja stî astalés"
 
-#: ../urpm/select.pm:573 ../urpm/select.pm:660
+#: ../urpm/select.pm:572 ../urpm/select.pm:659
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "cåze di conflits avou %s"
 
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "cåze di %s ki n' est nén satisfyî"
 
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
 #, c-format
 msgid "trying to promote %s"
 msgstr "dji saye di promouvwer %s"
 
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
 #, c-format
 msgid "in order to keep %s"
 msgstr "po wårder %s"
 
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1548,7 +1545,7 @@ msgstr ""
 "Li pacaedje shuvant a mezåjhe d' esse oisté po des ôtes esse metous a djoû:\n"
 "%s"
 
-#: ../urpm/select.pm:623
+#: ../urpm/select.pm:622
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1558,12 +1555,12 @@ msgstr ""
 "djoû:\n"
 "%s"
 
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
 #, c-format
 msgid "in order to install %s"
 msgstr "po-z astaler %s"
 
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
 #, c-format
 msgid "due to missing %s"
 msgstr "cåze di %s ki n' est nén la"
@@ -2616,12 +2613,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Continouwer avou l' astalaedje d' on pacaedje? (%d Mo)"
 msgstr[1] "Continouwer avou l' astalaedje d' on pacaedje? (%d Mo)"
 
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Rinoncî"
-
-#: ../urpmi:650
+#: ../urpmi:643
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Tapez so «enter» cwand c' est fwait..."
@@ -3356,28 +3348,28 @@ msgstr "--list-nodes pout esse eployî seulmint avou --parallel"
 msgid "use -l to list files"
 msgstr ""
 
-#: ../urpmq:424
+#: ../urpmq:420
 #, fuzzy, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
 "pont d' fitchî «hdlist» pol sopoirt «%s», i n' a k' on rzultat parciel pol "
 "pacaedje %s"
 
-#: ../urpmq:425
+#: ../urpmq:421
 #, fuzzy, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr ""
 "pont d' fitchî «hdlist» pol sopoirt «%s», i n' a k' on rzultat parciel po "
 "les pacaedjes %s"
 
-#: ../urpmq:428
+#: ../urpmq:424
 #, fuzzy, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "pont d' fitchî «hdlist» pol sopoirt «%s», i n' a nou rzultat pol pacaedje %s"
 
-#: ../urpmq:429
+#: ../urpmq:425
 #, fuzzy, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3385,7 +3377,7 @@ msgstr ""
 "pont d' fitchî «hdlist» pol sopoirt «%s», i n' a nou rzultat po les "
 "pacaedjes %s"
 
-#: ../urpmq:496
+#: ../urpmq:492
 #, c-format
 msgid "No changelog found\n"
 msgstr "Nou djournå des candjmints di trové\n"
@@ -3398,6 +3390,18 @@ msgstr "Astaleu di programes"
 msgid "Graphical front end to install RPM files"
 msgstr "Ene eterface grafike po-z astaler des pacaedjes RPM"
 
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "L' astalaedje a fwait berwete, sacwants fitchîs mankèt:\n"
+#~ "%s\n"
+#~ "Vos dvrîz motoit mete a djoû li båze di dnêyes urpmi."
+
+#~ msgid "Cancel"
+#~ msgstr "Rinoncî"
+
 #, fuzzy
 #~ msgid "Cannot write DUDF file.\n"
 #~ msgstr "Dji n' sai ahiver l' fitchî d' apontiaedje [%s]"