sync with code

1 files changed, 88 insertions, 87 deletions

diff --git a/po/ast.po b/po/ast.po
index 0535f2af..3f8197ec 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\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: 2010-02-01 15:49+0100\n"
 "Last-Translator: marquinos <marquinos@mandriva.org>\n"
 "Language-Team: Asturian <alministradores@softastur.org>\n"
@@ -253,7 +253,7 @@ msgstr ""
 msgid "Warning"
 msgstr "Avisu"
 
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
 #, c-format
 msgid "Ok"
 msgstr "Aceutar"
@@ -313,7 +313,7 @@ msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paquete, %d MB)"
 msgstr[1] "(%d paquetes, %d MB)"
 
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nun pudieron obtenese los paquetes orixe, albortando"
@@ -350,38 +350,41 @@ msgstr "...falló la recuperación: %s"
 msgid "_Done"
 msgstr "_Fecho"
 
-#: ../gurpmi2:402
+#: ../gurpmi2:402 ../urpm/main_loop.pm:69
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"%s"
 msgstr ""
 "Falló la instalación, falten dellos ficheros:\n"
-"%s\n"
-"Puedes querer anovar la base de datos d'urpmi"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Puede que necesites anovar la base de datos d'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 "Falló la instalación:"
 
-#: ../gurpmi2:413
+#: ../gurpmi2:414
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "El(los) paquete(s) ya tan instalaos"
 
-#: ../gurpmi2:415
+#: ../gurpmi2:416
 #, c-format
 msgid "Installation finished"
 msgstr "Finó la instalación"
 
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "desaniciando %s"
 
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
 #, c-format
 msgid "restarting urpmi"
 msgstr "reaniciando urpmi"
@@ -510,59 +513,59 @@ msgstr "fallu rexistrando paquetes llocales"
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Esta operación ta torgada en mou restrinxíu"
 
-#: ../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 "declaración incorreuta del proxy na llinia de comandos\n"
 
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: nun puede lleese'l ficheru rpm «%s»\n"
 
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
 #, c-format
 msgid "unexpected expression %s"
 msgstr "espresión %s non esperada"
 
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
 #, c-format
 msgid "missing expression before %s"
 msgstr "falta esxpresion enantes de %s"
 
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "espresión non esperada %s (suxerencia: usar -a o -o)"
 
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
 #, c-format
 msgid "no expression to close"
 msgstr "nun hai espresión a zarrar"
 
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "de manera predeterminada urpmf espera una regexp. Deberíes usar la opción «--"
 "literal»"
 
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "el direutoriu chroot nun esiste"
 
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Nun puede usase %s ensin %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 "Nun puede usase %s con %s"
 
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Abondos argumentos\n"
@@ -611,7 +614,7 @@ msgstr "nun pudo lleese'l ficheru de configuración [%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "el mediu «%s» ta definíu dos vegaes, albortando"
 
-#: ../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 "nun puede escribise'l ficheru de configuración [%s]"
@@ -728,22 +731,22 @@ msgstr "        %s%% completu, velocidá = %s"
 msgid "retrieving %s"
 msgstr "baxando %s"
 
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
 #, c-format
 msgid "retrieved %s"
 msgstr "baxaos %s"
 
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocolu desconocíu definíu pa %s"
 
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nun alcontráu webfetch, los webfetch sofitaos son: %s\n"
 
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "nun puede manexase'l protocolu: %s"
@@ -866,26 +869,17 @@ msgstr "la base de datos %s ta bloquiada. Esperando..."
 msgid "aborting"
 msgstr "albortando"
 
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
 #, c-format
 msgid "Retry?"
 msgstr "¿Reintentar?"
 
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Falló la instalación, falten dellos ficheros:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
 #, c-format
 msgid "You may need to update your urpmi database."
 msgstr "Puede que necesites anovar la base de datos d'urpmi."
 
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -894,7 +888,7 @@ msgstr ""
 "Falló la instalación, rpms nun válidos:\n"
 "%s"
 
-#: ../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 "
@@ -905,68 +899,68 @@ msgstr ""
 "paquetes (%s necesario, %s disponible).\n"
 "¿De xuro que quies siguir?"
 
-#: ../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 "Falló la instalación"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "¿Quies siguir de toes formes?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
 #, c-format
 msgid "The following package has bad signature"
 msgstr "El siguiente paquete caltien una firma non válida"
 
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Los siguientes paquetes caltienen firmes non válides"
 
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "¿Quies siguir cola instalación?"
 
-#: ../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 "Falló la instalación"
+
+#: ../urpm/main_loop.pm:144
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "desaniciando rpms instalaos (%s)"
 
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
 #, c-format
-msgid "distributing %s"
-msgstr "distribuyendo %s"
+msgid "Try to continue anyway?"
+msgstr "¿Quies siguir de toes formes?"
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
 #, c-format
 msgid "installing %s from %s"
 msgstr "instalando %s dende %s"
 
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
 #, c-format
 msgid "installing %s"
 msgstr "instalando %s"
 
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "distribuyendo %s"
+
+#: ../urpm/main_loop.pm:264
 #, c-format
 msgid "Try installation without checking dependencies?"
 msgstr "¿Intentar instalar ensin verificar les dependencies?"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
 #, c-format
 msgid "Try harder to install (--force)?"
 msgstr "¿Intentar instalar en mou forciáu (--force)?"
 
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
 #, c-format
 msgid "Packages are up to date"
 msgstr "Los paquetes tan anovaos"
 
-#: ../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 "Ye posible la instalación"
@@ -1508,37 +1502,37 @@ msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr ""
 "atopáronse los paquetes %s na base de datos d'urpmi, pero dengún ta instaláu"
 
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
 #, c-format
 msgid "Package %s is already installed"
 msgstr "El paquete %s ya ta instaláu"
 
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Los paquetes %s ya tan instalaos"
 
-#: ../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 "debío a conflictos con %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 "debío a que nun ta satisfecho %s"
 
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
 #, c-format
 msgid "trying to promote %s"
 msgstr "intentando promover %s"
 
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
 #, c-format
 msgid "in order to keep %s"
 msgstr "pa caltener %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"
@@ -1547,7 +1541,7 @@ msgstr ""
 "Tien de quitase'l paquete siguiente pa poder anovar otros:\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"
@@ -1556,12 +1550,12 @@ msgstr ""
 "Tienen de desaniase los paquetes siguientes pa poder anovar otros:\n"
 "%s"
 
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
 #, c-format
 msgid "in order to install %s"
 msgstr "pa instalar %s"
 
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
 #, c-format
 msgid "due to missing %s"
 msgstr "debío a que falta %s"
@@ -2602,12 +2596,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "¿Efectuar la instalación del paquete?"
 msgstr[1] "¿Efectuar la instalación de los %d paquetes?"
 
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Encaboxar"
-
-#: ../urpmi:650
+#: ../urpmi:643
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Calca Enter cuando'l preséu te montáu..."
@@ -3348,21 +3337,21 @@ msgstr "--list-nodes namái pueden usase con --parallel"
 msgid "use -l to list files"
 msgstr "usa -l pa llistar los ficheros"
 
-#: ../urpmq:424
+#: ../urpmq:420
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
 "nun esiste xml info pal sofitu \"%s\", namái resultaos parciales pal paquete "
 "%s"
 
-#: ../urpmq:425
+#: ../urpmq:421
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr ""
 "nun esiste xml info pal sofitu \"%s\", namái resultaos parciales pa los "
 "paquetes %s"
 
-#: ../urpmq:428
+#: ../urpmq:424
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3370,7 +3359,7 @@ msgstr ""
 "nun esiste xml info pal sofitu \"%s\", nun se retornen resultaos pal paquete "
 "%s"
 
-#: ../urpmq:429
+#: ../urpmq:425
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3378,7 +3367,7 @@ msgstr ""
 "nun esiste xml info pal sofitu \"%s\", nun pueden retornase resultaos pa los "
 "paquetes %s"
 
-#: ../urpmq:496
+#: ../urpmq:492
 #, c-format
 msgid "No changelog found\n"
 msgstr "Nu s'atopó changelog\n"
@@ -3391,6 +3380,18 @@ msgstr "Instalador de software"
 msgid "Graphical front end to install RPM files"
 msgstr "Interface gráfica pa instalar ficheros RPM"
 
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Falló la instalación, falten dellos ficheros:\n"
+#~ "%s\n"
+#~ "Puedes querer anovar la base de datos d'urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Encaboxar"
+
 #, fuzzy
 #~ msgid ""
 #~ "# Here are logs of your DUDF uploads.\n"