summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-06-08 18:52:51 +0000
committerThierry Vignaud <tv@mageia.org>2012-06-08 18:52:51 +0000
commit31b683cbb251507ca116c48dd40ca352c686e3ea (patch)
tree21b96c690b00ef7d04164cfa520c1371e5332ca7 /po
parent5d7414cd5dc0c7dbdfe5314df4253cb14f86e9b2 (diff)
downloadurpmi-31b683cbb251507ca116c48dd40ca352c686e3ea.tar
urpmi-31b683cbb251507ca116c48dd40ca352c686e3ea.tar.gz
urpmi-31b683cbb251507ca116c48dd40ca352c686e3ea.tar.bz2
urpmi-31b683cbb251507ca116c48dd40ca352c686e3ea.tar.xz
urpmi-31b683cbb251507ca116c48dd40ca352c686e3ea.zip
sync with code
Diffstat (limited to 'po')
-rw-r--r--po/af.po174
-rw-r--r--po/ar.po175
-rw-r--r--po/ast.po175
-rw-r--r--po/az.po172
-rw-r--r--po/bg.po174
-rw-r--r--po/bn.po172
-rw-r--r--po/br.po165
-rw-r--r--po/bs.po172
-rw-r--r--po/ca.po179
-rw-r--r--po/cs.po177
-rw-r--r--po/cy.po177
-rw-r--r--po/da.po177
-rw-r--r--po/de.po924
-rw-r--r--po/el.po181
-rw-r--r--po/eo.po172
-rw-r--r--po/es.po888
-rw-r--r--po/et.po175
-rw-r--r--po/eu.po177
-rw-r--r--po/fa.po172
-rw-r--r--po/fi.po175
-rw-r--r--po/fr.po938
-rw-r--r--po/fur.po172
-rw-r--r--po/ga.po165
-rw-r--r--po/gl.po176
-rw-r--r--po/he.po176
-rw-r--r--po/hi.po172
-rw-r--r--po/hr.po172
-rw-r--r--po/hu.po177
-rw-r--r--po/id.po172
-rw-r--r--po/is.po177
-rw-r--r--po/it.po177
-rw-r--r--po/ja.po176
-rw-r--r--po/ka.po165
-rw-r--r--po/ko.po174
-rw-r--r--po/ky.po172
-rw-r--r--po/lt.po172
-rw-r--r--po/lv.po165
-rw-r--r--po/mk.po172
-rw-r--r--po/mn.po174
-rw-r--r--po/ms.po165
-rw-r--r--po/mt.po173
-rw-r--r--po/nb.po175
-rw-r--r--po/nl.po181
-rw-r--r--po/nn.po175
-rw-r--r--po/pa_IN.po172
-rw-r--r--po/pl.po177
-rw-r--r--po/pt.po175
-rw-r--r--po/pt_BR.po177
-rw-r--r--po/ro.po938
-rw-r--r--po/ru.po175
-rw-r--r--po/sc.po172
-rw-r--r--po/sk.po172
-rw-r--r--po/sl.po177
-rw-r--r--po/sq.po172
-rw-r--r--po/sr.po172
-rw-r--r--po/sr@Latn.po172
-rw-r--r--po/sv.po175
-rw-r--r--po/tg.po172
-rw-r--r--po/th.po172
-rw-r--r--po/tl.po172
-rw-r--r--po/tr.po177
-rw-r--r--po/uk.po177
-rw-r--r--po/urpmi.pot156
-rw-r--r--po/uz.po170
-rw-r--r--po/uz@cyrillic.po170
-rw-r--r--po/vi.po172
-rw-r--r--po/wa.po172
-rw-r--r--po/zh_CN.po177
-rw-r--r--po/zh_TW.po175
69 files changed, 7668 insertions, 7286 deletions
diff --git a/po/af.po b/po/af.po
index 57a86d8d..19b6b97b 100644
--- a/po/af.po
+++ b/po/af.po
@@ -9,7 +9,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: Fri May 19 2000 13:02:12+0200\n"
"Last-Translator: Schalk W. Cronjé <schalkc@ntaba.co.za>\n"
"Language-Team: Afrikaans <mandrake@af.org.za>\n"
@@ -225,7 +225,7 @@ msgstr "Sommige pakkette kan nie geïnstalleer word nie"
msgid "Warning"
msgstr "Waarskuwing"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "OK"
@@ -291,7 +291,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakket, %d MB)"
msgstr[1] "(%d pakkette, %d MB)"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "Kan nie die bronpakette bekom nie."
@@ -328,38 +328,42 @@ msgstr "FAT-grootteverandering het gefaal: %s"
msgid "_Done"
msgstr "_Klaar"
-#: ../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 "Installasie het misluk"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Installasie probleme, van die lêers is soek:\n"
"%s\n"
"Probeer u media se databasis opdateer."
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Installasie het misluk"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Alles is alreeds installeer"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Geïnstalleer"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "verwyder %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Begin slurpd: "
@@ -488,57 +492,57 @@ msgstr "Daar was 'n fout met pakkette:"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "kan nie kieslyslêer:%s lees nie"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Ontbrekende velde"
-#: ../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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -585,7 +589,7 @@ msgstr "Kan nie lêer %s oopmaak nie\n"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:252 ../urpm/media.pm:541
+#: ../urpm/cfg.pm:254 ../urpm/media.pm:541
#, fuzzy, c-format
msgid "unable to write config file [%s]"
msgstr "Kan nie lêer %s oopmaak nie\n"
@@ -700,22 +704,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "Verwyder %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "FAT-grootteverandering het gefaal: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr ""
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr "Aktiveer Network Time Protocol"
@@ -836,19 +840,12 @@ msgstr "RPM-databasisnavraag het misluk\n"
msgid "aborting"
msgstr "Waarskuwing"
-#: ../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 "Installasie het misluk"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -856,14 +853,14 @@ msgstr ""
"%s\n"
"Probeer u media se databasis opdateer."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Installasie het misluk"
-#: ../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 "
@@ -871,68 +868,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 "Installasie het misluk"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Die volgende pakkette geïnstalleer word:\n"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "Die volgende pakkette geïnstalleer word:\n"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "Wil u op hierdie knoppie klik?"
-#: ../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 "Installasie het misluk"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%s word installeer\n"
-#: ../urpm/main_loop.pm:237
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "Begin %s:"
+#: ../urpm/main_loop.pm:160
+#, c-format
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "%s word installeer\n"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, fuzzy, c-format
msgid "installing %s"
msgstr "%s word installeer\n"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "Begin %s:"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:356 ../urpm/parallel.pm:299
+#: ../urpm/main_loop.pm:442 ../urpm/parallel.pm:299
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "Installasie probleem"
@@ -1458,37 +1455,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Alles is alreeds installeer"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Alles is alreeds installeer"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Alles is alreeds installeer"
-#: ../urpm/select.pm:573 ../urpm/select.pm:660
+#: ../urpm/select.pm:572 ../urpm/select.pm:659
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "deur %s wat soek is"
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, c-format
msgid "due to unsatisfied %s"
msgstr "deur problematiese %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "probeer promosie van %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "om %s te kan behou"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1500,7 +1497,7 @@ msgstr ""
"\n"
"Kan ons voort gaan?"
-#: ../urpm/select.pm:623
+#: ../urpm/select.pm:622
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1512,12 +1509,12 @@ msgstr ""
"\n"
"Kan ons voort gaan?"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "om %s te kan behou"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "deur %s wat soek is"
@@ -2504,12 +2501,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Kanselleer"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Druk ENTER wanneer u reg is..."
@@ -3176,29 +3168,29 @@ msgstr ""
msgid "use -l to list files"
msgstr ""
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Geen beeld gevind nie"
@@ -3213,6 +3205,18 @@ msgstr "Software Media Manager"
msgid "Graphical front end to install RPM files"
msgstr "'n Grafiese voorkant om pakkette te installeer"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Installasie probleme, van die lêers is soek:\n"
+#~ "%s\n"
+#~ "Probeer u media se databasis opdateer."
+
+#~ msgid "Cancel"
+#~ msgstr "Kanselleer"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "Kan nie lêer %s oopmaak nie\n"
diff --git a/po/ar.po b/po/ar.po
index 001e93de..63622038 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ar\n"
-"POT-Creation-Date: 2012-03-21 08:44+0100\n"
+"POT-Creation-Date: 2012-06-08 19:19+0200\n"
"PO-Revision-Date: 2009-10-26 22:46+0300\n"
"Last-Translator: Ma'moun Diraneyya <mamoun.diraneyya@gmail.com>\n"
"Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -254,7 +254,7 @@ msgstr ""
msgid "Warning"
msgstr "Warning"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -320,7 +320,7 @@ msgstr[3] "(%d packages, %d MB)"
msgstr[4] "(%d packages, %d MB)"
msgstr[5] "(%d packages, %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 "unable to get source packages, aborting"
@@ -357,38 +357,41 @@ msgstr "...retrieving failed: %s"
msgid "_Done"
msgstr "_Done"
-#: ../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 ""
"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "You may need to update your urpmi database."
-#: ../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 "Installation failed:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "The package(s) are already installed"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Installation finished"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "removing %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "restarting urpmi"
@@ -517,57 +520,57 @@ msgstr "error registering local packages"
msgid "This operation is forbidden while running in restricted mode"
msgstr "This operation is forbidden while running in restricted mode"
-#: ../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 "bad proxy declaration on command line\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: cannot read rpm file \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "unexpected expression %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "missing expression before %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "unexpected expression %s (suggestion: use -a or -o ?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "no expression to close"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "by default urpmf awaits a regexp. you should use option \"--literal\""
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot directory doesn't exist"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Can't use %s without %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 "Can't use %s with %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Too many arguments\n"
@@ -616,7 +619,7 @@ msgstr "unable to read config file [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "medium `%s' is defined twice, aborting"
-#: ../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 "unable to write config file [%s]"
@@ -731,22 +734,22 @@ msgstr " %s%% completed, speed = %s"
msgid "retrieving %s"
msgstr "retrieving %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "retrieved %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "unknown protocol defined for %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "no webfetch found, supported webfetch are: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "unable to handle protocol: %s"
@@ -868,26 +871,17 @@ msgstr "%s database is locked. Waiting..."
msgid "aborting"
msgstr "aborting"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Retry?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Installation failed, some files are missing:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "You may need to update your urpmi database."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -896,7 +890,7 @@ msgstr ""
"Installation failed, bad rpms:\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 "
@@ -907,68 +901,68 @@ msgstr ""
"needed, %s available).\n"
"Are you sure you want to continue?"
-#: ../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 "Installation failed"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Try to continue anyway?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "The following package has bad signature"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "The following packages have bad signatures"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Do you want to continue installation ?"
-#: ../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 "Installation failed"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "removing installed rpms (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "distributing %s"
+msgid "Try to continue anyway?"
+msgstr "Try to continue anyway?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "installing %s from %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "installing %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "distributing %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Try installation without checking dependencies?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Try harder to install (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Packages are up to date"
-#: ../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 "Installation is possible"
@@ -1535,37 +1529,37 @@ msgstr "You should use \"-a\" to use all of them"
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "found package(s) %s in urpmi db, but none are installed"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Package %s is already installed"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Packages %s are already installed"
-#: ../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 "due to conflicts with %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 "due to unsatisfied %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "trying to promote %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "in order to keep %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"
@@ -1574,7 +1568,7 @@ msgstr ""
"The following package has to be removed for others to be upgraded:\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"
@@ -1583,12 +1577,12 @@ msgstr ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "in order to install %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "due to missing %s"
@@ -2627,12 +2621,7 @@ msgstr[3] "Proceed with the installation of the %d packages?"
msgstr[4] "Proceed with the installation of the %d packages?"
msgstr[5] "Proceed with the installation of the %d packages?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Press Enter when mounted..."
@@ -3353,31 +3342,31 @@ msgstr "--list-nodes can only be used with --parallel"
msgid "use -l to list files"
msgstr "use -l to list files"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "no xml info for medium \"%s\", only partial result for package %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr "no xml info for medium \"%s\", only partial result for packages %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"no xml info for medium \"%s\", unable to return any result for package %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "No changelog found\n"
@@ -3390,6 +3379,18 @@ msgstr "مثبِّت البرمجيَّات"
msgid "Graphical front end to install RPM files"
msgstr "واجهة رسوميَّة لتثبيت ملفات RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
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"
diff --git a/po/az.po b/po/az.po
index c11ee246..5cc70ac9 100644
--- a/po/az.po
+++ b/po/az.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-az\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-09-12 20:33+0300\n"
"Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -259,7 +259,7 @@ msgstr ""
msgid "Warning"
msgstr "Xəbərdarlıq"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Oldu"
@@ -319,7 +319,7 @@ msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paket, %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 "qaynaq paketi alına bilmir, çıxılır"
@@ -356,38 +356,42 @@ msgstr "...alış bacarılmadı: %s"
msgid "_Done"
msgstr "Qurtardı"
-#: ../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 "Qurulum iflas etdi"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Qurulum bacarılmadı, bəzi fayllar əksikdir:\n"
"%s\n"
"Sizə, urpmi databeyzinizi yeniləməyi məsləhət görürük."
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Qurulum iflas etdi"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "hər şey onsuzda quruludur"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Qurulum bitdi"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "%s silinir"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "urpmi yenidən başladılır"
@@ -514,57 +518,57 @@ msgstr "yerli paket qeydiyyat xətası"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "əmr sətirində hökmsüz vəkil tə'yini\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Əksik imza (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -611,7 +615,7 @@ msgstr "[%s] quraşdırma faylı yazıla bilmir"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "[%s] quraşdırma faylı yazıla bilmir"
@@ -726,22 +730,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "%s silinir"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...alış bacarılmadı: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s üçün müəyyən edilən protokol namə'lumdur"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "webfetch tapılmadı, dəstəklənən webfetch-lər: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "protokol istifadə edilə bilmir: %s"
@@ -862,19 +866,12 @@ msgstr "urpmi databeyzi qıfıllıdır"
msgid "aborting"
msgstr "Xəbərdarlıq"
-#: ../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 "Qurulum iflas etdi"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -882,14 +879,14 @@ msgstr ""
"%s\n"
"Sizə, urpmi databeyzinizi yeniləməyi məsləhət görürük."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Qurulum iflas etdi"
-#: ../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 "
@@ -897,68 +894,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 "Qurulum iflas etdi"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Quruluma davam etmək istəyirsiniz ?"
-#: ../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 "Qurulum iflas etdi"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%s qurulur"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "%s paylanır"
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "%s qurulur"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "%s qurulur"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "%s paylanır"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Paket asılılıqlarına fikir vermədən qurmağı sınayım? (b/X) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Qurulum mümkündür"
@@ -1484,37 +1481,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "hər şey onsuzda quruludur"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "hər şey onsuzda quruludur"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "hər şey onsuzda quruludur"
-#: ../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 "%s ilə yaranan toqquşma səbəbiylə"
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, c-format
msgid "due to unsatisfied %s"
msgstr "razı qalmayan %s olduğuna görə"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "%s irəliləndirməyə çalışılır"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "%s'ı saxlamaq üçün"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1523,7 +1520,7 @@ msgstr ""
"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\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"
@@ -1532,12 +1529,12 @@ msgstr ""
"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "%s paket(lər)ini qurmaq üçün"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "%s əksik olduğuna görə"
@@ -2526,12 +2523,7 @@ msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Ləğv et"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Hazır olanda Enter düyməsinə basın..."
@@ -3230,29 +3222,29 @@ msgstr "--list-nodes ancaq --parallel ilə bərabər istifadə edilə bilər"
msgid "use -l to list files"
msgstr "\"%s\" fayl siyahısı yazıla bilmi"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Rəsm tapıla bilmədi"
@@ -3266,6 +3258,18 @@ msgstr "Proqram qurucusu"
msgid "Graphical front end to install RPM files"
msgstr "RPM paketlərini qurmaq üçün qrafiki ön üz"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Qurulum bacarılmadı, bəzi fayllar əksikdir:\n"
+#~ "%s\n"
+#~ "Sizə, urpmi databeyzinizi yeniləməyi məsləhət görürük."
+
+#~ msgid "Cancel"
+#~ msgstr "Ləğv et"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "[%s] quraşdırma faylı yazıla bilmir"
diff --git a/po/bg.po b/po/bg.po
index 0c69e915..3bd6c67b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-bg\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: 2003-08-18 15:59+0300\n"
"Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
"Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -255,7 +255,7 @@ msgstr ""
msgid "Warning"
msgstr "Предупреждение"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Добре"
@@ -320,7 +320,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d пакета"
msgstr[1] "%d пакета"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "не мога да получа сорс пакетите, прекратявам"
@@ -357,38 +357,42 @@ msgstr "...грешка при получаване: %s"
msgid "_Done"
msgstr "_Готово"
-#: ../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 "Инсталацията провалена"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Инсталирането пропадна, някои файлове липсват:\n"
"%s\n"
"Вие вероятно трябва да обновите вашата 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Инсталацията провалена"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Пакета(тите) вече са инсталирани"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Инсталацията приключи"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "изтриване на %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Стартира slurpd: "
@@ -518,57 +522,57 @@ msgstr "грешка при регистрация на локалните па
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "грешна прокси декларация на командния ред\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не може да се прочете rpm файл \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Липсващ подпис (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -615,7 +619,7 @@ msgstr "невъзможно да се запише конфигурационе
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "невъзможно да се запише конфигурационен файл [%s]"
@@ -730,22 +734,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "изтриване на %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...грешка при получаване: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "Зададен е неизвестен протокол за %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "не е намерен webfetch, поддържаните webfetch са: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "не мога да обработя протокол %s"
@@ -868,19 +872,12 @@ msgstr "базата данни на urpmi е заключена"
msgid "aborting"
msgstr "Предупреждение"
-#: ../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 "Инсталацията провалена"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -888,14 +885,14 @@ msgstr ""
"%s\n"
"Вие вероятно трябва да обновите вашата urpmi база данни."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Инсталацията провалена"
-#: ../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 "
@@ -903,68 +900,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 "Инсталацията провалена"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Следните пакети ще трябва да се инсталират:\n"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "Следните пакети ще трябва да се инсталират:\n"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "Искате ли да цъкнете на този бутон?"
-#: ../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 "Инсталацията провалена"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "инсталиране %s\n"
-#: ../urpm/main_loop.pm:237
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "Стартирам %s:"
+#: ../urpm/main_loop.pm:160
+#, c-format
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "инсталиране %s\n"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, fuzzy, c-format
msgid "installing %s"
msgstr "инсталиране %s\n"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "Стартирам %s:"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Опит за инсталиране без проверка на зависимости? (д/Н) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Опит за инсталиране даже по-силно (--force)? (д/Н) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Инсталацията е възможна"
@@ -1501,37 +1498,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Пакета(тите) вече са инсталирани"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Пакета(тите) вече са инсталирани"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Пакета(тите) вече са инсталирани"
-#: ../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 "поради конфликт с %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 "поради неопределен %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "опит за избор на %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "за да се запази %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1541,7 +1538,7 @@ msgstr ""
"обновени:\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"
@@ -1551,12 +1548,12 @@ msgstr ""
"обновени:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "за да се инсталира %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "поради липсващ %s"
@@ -2555,12 +2552,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Отказ"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Натиснете Enter,когато сте готови..."
@@ -3259,29 +3251,29 @@ msgstr "--list-nodes може да се използва само с --parallel"
msgid "use -l to list files"
msgstr "невъзможен запис на лист файл за \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Не е намерен changelog\n"
@@ -3294,6 +3286,18 @@ msgstr "Инсталатор на софтуер"
msgid "Graphical front end to install RPM files"
msgstr "Графичен инсталатор на пакети"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Инсталирането пропадна, някои файлове липсват:\n"
+#~ "%s\n"
+#~ "Вие вероятно трябва да обновите вашата urpmi база данни."
+
+#~ msgid "Cancel"
+#~ msgstr "Отказ"
+
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
#, fuzzy
diff --git a/po/bn.po b/po/bn.po
index aebbe5df..d5ea7f6b 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -25,7 +25,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: 2005-02-13 13:39+0600\n"
"Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
"Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -267,7 +267,7 @@ msgstr ""
msgid "Warning"
msgstr "নোটিশ"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "ঠিক আছে"
@@ -330,7 +330,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d প্যাকেজ সমূহ"
msgstr[1] "%d প্যাকেজ সমূহ"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "সোর্স প্যাকেজ গুলি পাওয়া যায়নি, থামানো হচ্ছে"
@@ -367,38 +367,42 @@ msgstr "...আনতে ব্যর্থ হয়েছি: %s"
msgid "_Done"
msgstr "_সম্পন্ন"
-#: ../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 "ইনস্টলেশন ব্যর্থ"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"কিছু ফাইল নেই, ইনস্টলেশন ব্যর্থ হয়েছে:\n"
"%s\n"
"আপনি হয়তো আপনার 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "ইনস্টলেশন ব্যর্থ"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "ইনস্টলেশন প্রক্রিয়া সম্পূর্ণ হয়েছে"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "%s সরানো হচ্ছে"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "urpmi আবার শুরু করা হচ্ছে"
@@ -527,57 +531,57 @@ msgstr "স্থানীয় প্যাকেজসমূহ রেজিস
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "কমান্ড লাইনের ওপর বাজে প্রক্সি ঘোষণা\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm ফাইল পড়া যাচ্ছেনা\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "(%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -624,7 +628,7 @@ msgstr "কনফিগ ফাইল [%s]-এ লেখা সম্ভব হ
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "কনফিগ ফাইল [%s]-এ লেখা সম্ভব হয়নি"
@@ -739,22 +743,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "%s সরানো হচ্ছে"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...আনতে ব্যর্থ হয়েছি: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "অজানা প্রোটোকল নির্ধারনের জন্য %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "কোন webfetch পাওয়া যায়নি, সমর্থিত webfetch সমূহ হচ্ছে: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "%s প্রোটকল নিয়ন্ত্রন করা সম্ভব হয়নি"
@@ -876,19 +880,12 @@ msgstr "urpmi ডাটাবেস লক করা আছে"
msgid "aborting"
msgstr "নোটিশ"
-#: ../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 "ইনস্টলেশন ব্যর্থ"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -896,14 +893,14 @@ msgstr ""
"%s\n"
"আপনি হয়তো আপনার urpmi ডাটাবেস আপডেট করতে চাইবেন"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "ইনস্টলেশন ব্যর্থ"
-#: ../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 "
@@ -911,68 +908,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 "ইনস্টলেশন ব্যর্থ"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "নিম্নের প্যাকেজগুলিতে বাজে স্বাক্ষর রয়েছে"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "নিম্নের প্যাকেজগুলিতে বাজে স্বাক্ষর রয়েছে"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "আপনি কি ইনস্টলেশন চলিয়ে যেতে চাচ্ছেন ?"
-#: ../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 "ইনস্টলেশন ব্যর্থ"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "বিতরণ করা হচ্ছে %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 "%s ইনস্টল করা হচ্ছে %s থেকে"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "%s ইনস্টল করা হচ্ছে"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "বিতরণ করা হচ্ছে %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "ডিপেন্ডেন্সিসমুহ পরীক্ষা না করে ইনস্টলেশনের চেষ্টা করবো? (y/N)"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "আরও জোরালোভাবে ইনস্টলের চেষ্টার করবো (--force)? (y/N)"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "ইনস্টলেশন সম্ভব"
@@ -1502,37 +1499,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-#: ../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 "%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 "%s অসন্তুষ্টির কারনে"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "%s প্রোমট করার চেষ্টা করছি"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "%s রাখার জন্য"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1541,7 +1538,7 @@ msgstr ""
"নিম্নলিখিত প্যাকেজগুলি অবশ্যই সরাতে হবে অন্যগুলি আপগ্রেড করার জন্য:\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"
@@ -1550,12 +1547,12 @@ msgstr ""
"নিম্নলিখিত প্যাকেজগুলি অবশ্যই সরাতে হবে অন্যগুলি আপগ্রেড করার জন্য:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "%s ইনস্টলের জন্য"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "%s অনুপস্থিতির কারনে"
@@ -2558,12 +2555,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "বাতিল"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "প্রস্তুত হলে Enter চাপুন..."
@@ -3260,21 +3252,21 @@ msgstr "--list-nodes শুধুমাত্র --parallel এর সাথে
msgid "use -l to list files"
msgstr "\"%s\"-এর তালিকা ফাইল লেখা যায়নি"
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"নোট: যেহেতু কোনো মাধ্যম hdlists ব্যবহার করে সন্ধান করে নি, urpmf কোনো ফলাফল দিতে "
"পারে নি\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"নোট: যেহেতু কোনো মাধ্যম hdlists ব্যবহার করে সন্ধান করে নি, urpmf কোনো ফলাফল দিতে "
"পারে নি\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3282,7 +3274,7 @@ msgstr ""
"নোট: যেহেতু কোনো মাধ্যম hdlists ব্যবহার করে সন্ধান করে নি, urpmf কোনো ফলাফল দিতে "
"পারে নি\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3290,7 +3282,7 @@ msgstr ""
"নোট: যেহেতু কোনো মাধ্যম hdlists ব্যবহার করে সন্ধান করে নি, urpmf কোনো ফলাফল দিতে "
"পারে নি\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "changelog পাওয়া যায়নি\n"
@@ -3303,6 +3295,18 @@ msgstr "সফ্টওয়্যার ইনস্টলকারী"
msgid "Graphical front end to install RPM files"
msgstr "আর.পি.এম. ফাইল ইনস্টলের জন্য গ্রাফিকাল ফ্রন্ট-এন্ড"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "কিছু ফাইল নেই, ইনস্টলেশন ব্যর্থ হয়েছে:\n"
+#~ "%s\n"
+#~ "আপনি হয়তো আপনার urpmi ডাটাবেস আপডেট করতে চাইবেন"
+
+#~ msgid "Cancel"
+#~ msgstr "বাতিল"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "ফাইল [%s]-এ লেখা সম্ভব হয়নি"
diff --git a/po/br.po b/po/br.po
index f642282c..ae5956b9 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,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: 2011-09-20 09:56+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
"Language-Team: Breton <LL@li.org>\n"
@@ -236,7 +236,7 @@ msgstr ""
msgid "Warning"
msgstr "Diwallit"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ya"
@@ -297,7 +297,7 @@ msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakad, %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 "n'hellan ket tigas ar pakadoù tarzh, emaon o terriñ"
@@ -334,35 +334,41 @@ msgstr "... sac'het eo ar resev : %s"
msgid "_Done"
msgstr "_Graet"
-#: ../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 ""
+"Sac'het eo an staliadur, restroù zo a vank :\n"
+"%s"
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:405
+#, c-format
+msgid "You may want to update your urpmi database."
+msgstr ""
+
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, c-format
msgid "Installation failed:"
msgstr "Sac'het eo an staliadur :"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Staliet eo ar pakad(où) c'hoazh"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Echu eo ar staliadur"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "lemel %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "oc'h adloc'hañ urpmi"
@@ -489,57 +495,57 @@ msgstr "fazi en ur enskrivañ ar pakadoù lec'hel"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq : n'hellan ket lenn ar restr rpm « %s »\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Mankout a ra ar sinadur (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 "n'eo ket endeo renkell ar chroot"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -586,7 +592,7 @@ msgstr "n'hell ket bet lenn restr ar c'hefluniadur [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "n'hellan ket skrivañ restr ar c'hefluniadur [%s]"
@@ -701,22 +707,22 @@ msgstr " %s%% echu, tizh = %s"
msgid "retrieving %s"
msgstr "o tegas %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "%s resevet"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "dianav eo ar c'homenad spisaet evit %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr "n'hellan ket staliañ ar pakad %s"
@@ -837,26 +843,17 @@ msgstr "krouilhet eo stlennvon %s, o c'hortoz ..."
msgid "aborting"
msgstr "o nulaat"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr ""
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Sac'het eo an staliadur, restroù zo a vank :\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr ""
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -865,7 +862,7 @@ msgstr ""
"Sac'het eo an staliadur, fall eo pakadoù :\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 "
@@ -873,68 +870,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 "Sac'het eo an staliadur"
-
-#: ../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 "Bez eus sinadur fall gant ar pakadoù a-heul"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Bez eus sinadur fall gant ar pakadoù a-heul"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Fellout a ra deoc'h kenderc'hel staliañ ?"
-#: ../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 "Sac'het eo an staliadur"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "o lemel pakadoù staliet (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "o skignañ %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 "o staliañ %s eus %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "o staliañ %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "o skignañ %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Klask staliañ hep sell ouzh an ezhommoù ?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "evit staliañ %s"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Bremañaet eo ar pakadoù"
-#: ../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 "Possubl eo an staliadur"
@@ -1457,37 +1454,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "N'hell ket bet staliet ar pakadoù %s"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Staliet eo ar pakad %s c'hoazh"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Staliet eo ar pakadoù %s c'hoazh"
-#: ../urpm/select.pm:573 ../urpm/select.pm:660
+#: ../urpm/select.pm:572 ../urpm/select.pm:659
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "peogwir %s zo manket"
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, c-format
msgid "due to unsatisfied %s"
msgstr "peogwir %s zo manket"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "N'eus pakad da zilemel ebet"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "evit mirout %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"
@@ -1496,7 +1493,7 @@ msgstr ""
"Red eo lemel ar pakad-mañ a-raok staliañ ar re nevez all:\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"
@@ -1505,12 +1502,12 @@ msgstr ""
"Red eo lemel ar pakadoù-mañ a-raok staliañ ar re nevez all:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "evit staliañ %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "peogwir %s zo manket"
@@ -2466,12 +2463,7 @@ msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "War-nes bezañ staliañ eo %d pakad. Mont war-raok ?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Nullañ"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Gwaskit « enkas » pa eo prest ar vedium ..."
@@ -3143,29 +3135,29 @@ msgstr ""
msgid "use -l to list files"
msgstr "n'hell ket skrivañ restr hdlist « %s »"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "N'eus bet kavet Changelog ebet\n"
@@ -3179,6 +3171,9 @@ msgstr "Stalier meziantoù"
msgid "Graphical front end to install RPM files"
msgstr "Ur fazi a zo bet en ur staliañ ar pakadoù :"
+#~ msgid "Cancel"
+#~ msgstr "Nullañ"
+
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "N'hell ket bet skrivet ar restr DUDF.\n"
diff --git a/po/bs.po b/po/bs.po
index 25e3a979..e27ab5cd 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: bs\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: 2006-09-13 21:02+0200\n"
"Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
"Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -258,7 +258,7 @@ msgstr ""
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "U redu"
@@ -319,7 +319,7 @@ msgstr[0] "(%d paketa, %d MB)"
msgstr[1] "(%d paketa, %d MB)"
msgstr[2] "(%d paketa, %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 "ne mogu dobiti izvorne pakete, prekidam"
@@ -356,38 +356,42 @@ msgstr "...dobavljanje nije uspjelo: %s"
msgid "_Done"
msgstr "_Gotovo"
-#: ../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 "Instalacija nije uspjela na čvoru %s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Instalacija nije uspjela, neke od datoteka nedostaju:\n"
"%s\n"
"Možda ćete trebati osvježiti vašu urpmi bazu podataka"
-#: ../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 "Instalacija nije uspjela:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "sve je već instalirano"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalacija završena"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "uklanjam %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "restartujem urpmi"
@@ -516,57 +520,57 @@ msgstr "greška pri registrovanju lokalnih paketa"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Ova operacija je zabranjena dok ste u ograničenom režimu"
-#: ../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 "pogrešna deklaracija proxy-ja na komandnoj liniji\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "Izrazi za uzorke:\n"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nedostaje potpis (%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 "Izrazi za uzorke:\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
#, fuzzy, c-format
msgid "chroot directory doesn't exist"
msgstr "Direktorij okruženja %s ne postoji"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Previše argumenata\n"
@@ -613,7 +617,7 @@ msgstr "ne mogu da zapišem konf. datoteku [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "ne mogu da zapišem konf. datoteku [%s]"
@@ -728,22 +732,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "uklanjam %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...dobavljanje nije uspjelo: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "nepoznat protokol je definisan za %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "nije pronađen download program, podržani su: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ne mogu rukovati protokolom: %s"
@@ -866,19 +870,12 @@ msgstr "urpmi baza podataka je zaključana"
msgid "aborting"
msgstr "Upozorenje"
-#: ../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 "Instalacija nije uspjela na čvoru %s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -886,14 +883,14 @@ msgstr ""
"%s\n"
"Možda ćete trebati osvježiti vašu urpmi bazu podataka"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalacija nije uspjela na čvoru %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 "
@@ -901,68 +898,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 "Instalacija nije uspjela"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Sljedeći paketi imaju neispravne potpise"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Sljedeći paketi imaju neispravne potpise"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Želite li nastaviti instalaciju ?"
-#: ../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 "Instalacija nije uspjela"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "instaliram %s iz %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "distribuiram %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 "instaliram %s iz %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "instaliram %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "distribuiram %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Da pokušam instalaciju bez provjere ovisnosti? (d/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Pokušaj instalaciju još jače (--force opcija)? (d/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Instalacija nije moguća"
@@ -1495,37 +1492,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "sve je već instalirano"
-#: ../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 "zbog konflikta sa %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 "zbog nezadovoljenih %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "pokušavam promovirati %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "kako bi zadržao %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1534,7 +1531,7 @@ msgstr ""
"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\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"
@@ -1543,12 +1540,12 @@ msgstr ""
"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "da bih instalirao %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "zbog nedostajućeg %s"
@@ -2563,12 +2560,7 @@ msgstr[0] "Da nastavim sa instalacijom %d paketa? (%d MB)"
msgstr[1] "Da nastavim sa instalacijom %d paketa? (%d MB)"
msgstr[2] "Da nastavim sa instalacijom %d paketa? (%d MB)"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Odustani"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Pritisnite Enter kada budete spremni..."
@@ -3278,21 +3270,21 @@ msgstr "--list-nodes se može koristiti samo sa --parallel"
msgid "use -l to list files"
msgstr "ne mogu zapisati list datoteku za \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"Napomena: pošto nijedan od pretraženih medija ne koristi hdliste, urpmf nije "
"mogao vratiti rezultate\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Napomena: pošto nijedan od pretraženih medija ne koristi hdliste, urpmf nije "
"mogao vratiti rezultate\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3300,7 +3292,7 @@ msgstr ""
"Napomena: pošto nijedan od pretraženih medija ne koristi hdliste, urpmf nije "
"mogao vratiti rezultate\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3308,7 +3300,7 @@ msgstr ""
"Napomena: pošto nijedan od pretraženih medija ne koristi hdliste, urpmf nije "
"mogao vratiti rezultate\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Nije pronađen changelog\n"
@@ -3321,6 +3313,18 @@ msgstr "Instalacija softvera"
msgid "Graphical front end to install RPM files"
msgstr "Grafički interfejs za instaliranje RPM paketa"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Instalacija nije uspjela, neke od datoteka nedostaju:\n"
+#~ "%s\n"
+#~ "Možda ćete trebati osvježiti vašu urpmi bazu podataka"
+
+#~ msgid "Cancel"
+#~ msgstr "Odustani"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "Ne mogu napraviti konf. datoteku [%s]"
diff --git a/po/ca.po b/po/ca.po
index e9dab34f..c4d00460 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2012-03-21 08:44+0100\n"
+"POT-Creation-Date: 2012-06-08 19:19+0200\n"
"PO-Revision-Date: 2012-03-08 23:50+0000\n"
"Last-Translator: Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -258,7 +258,7 @@ msgstr ""
msgid "Warning"
msgstr "Advertència"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "D'acord"
@@ -318,7 +318,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paquet, %d MB)"
msgstr[1] "(%d paquets, %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 "no es poden recuperar els paquets font. S'està interrompent"
@@ -355,39 +355,41 @@ msgstr "...ha fallat la recuperació: %s"
msgid "_Done"
msgstr "_Fet"
-#: ../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 ""
-"La instal·lació ha fallat, falten alguns fitxers.\n"
-"\n"
-"%s\n"
-"Potser voleu actualitzar la base de dades urpmi"
+"La instal·lació ha fallat, no s'han trobat alguns fitxers:\n"
+"%s"
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Pot ser necessari actualitzar la base de dades urpmi."
+
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, c-format
msgid "Installation failed:"
msgstr "La instal·lació ha fallat:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Ja està tot instal·lat"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instal·lació finalitzada"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "s'està eliminant %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "s'esta reiniciant urpmi"
@@ -516,57 +518,57 @@ msgstr "error registrant els paquets locals"
msgid "This operation is forbidden while running in restricted mode"
msgstr "L'operació no està permesa mentre s'executa en mode restringit"
-#: ../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ó errònia del proxy a la línia de comandes\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: no s'ha pogut llegir el fitxer rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "expressió inesperada %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr ""
-#: ../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
#, c-format
msgid "no expression to close"
msgstr "no hi ha expressió per a tancar"
-#: ../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 "el directori chroot no existeix"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Impossible utilitzar %s sense %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 "Impossible utilitzar %s amb %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Massa arguments\n"
@@ -613,7 +615,7 @@ msgstr "no s'ha pogut llegir el fitxer de configuració [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "el suport `%s' està definit dues vegades, cancel·lant"
-#: ../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 "no s'ha pogut escriure el fitxer de configuració [%s]"
@@ -730,24 +732,24 @@ msgstr " %s%% completat, velocitat = %s"
msgid "retrieving %s"
msgstr "s'està recuperant %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "s'ha recuperat %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "el protocol definit per a %s és desconegut"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
"no s'ha trobat cap programa per baixar coses de la xarxa, els programes "
"suportats són: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "incapaç de gestionar el protocol: %s"
@@ -870,26 +872,17 @@ msgstr "La base de dades %s està blocada. S'està esperant..."
msgid "aborting"
msgstr "s'està interrompent"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Tornar a intentar?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"La instal·lació ha fallat, no s'han trobat alguns fitxers:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Pot ser necessari actualitzar la base de dades urpmi."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -898,7 +891,7 @@ msgstr ""
"La instal·lació ha fallat, rpms dolents:\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 "
@@ -906,68 +899,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 "La instal·lació ha fallat"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Intentar continuar de totes maneres?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "El paquet següent té una signatura incorrecta"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Els paquets següents tenen signatures incorrectes"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Voleu continuar la instal·lació?"
-#: ../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 "La instal·lació ha fallat"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "S'estan suprimint els rpms instal·lats (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "s'està distribuint %s"
+msgid "Try to continue anyway?"
+msgstr "Intentar continuar de totes maneres?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "s'està instal·lant %s des de %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "s'està instal·lant %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "s'està distribuint %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Intentar la instal·lació sense comprovar dependències?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr ""
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Els paquets estan actualitzats"
-#: ../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 "La instal·lació és possible"
@@ -1495,37 +1488,37 @@ msgstr "Heu de fer servir \"-a\" per a fer-los servir tots"
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr ""
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "El paquet %s ja està instal·lat"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Els paquets %s ja estan instal·lats"
-#: ../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 "degut a conflictes amb %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 "degut a %s no satisfetes"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "per tal de mantenir %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"
@@ -1534,7 +1527,7 @@ msgstr ""
"El paquets següent s'ha d'eliminar per poder actualitzar uns altres:\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"
@@ -1543,12 +1536,12 @@ msgstr ""
"Els paquets següents s'han d'eliminar per poder actualitzar uns altres:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "per tal d'instal·lar %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "degut a que falten %s"
@@ -2546,12 +2539,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr ""
@@ -3230,29 +3218,29 @@ msgstr "--list-nodes només es pot usar amb --parallel"
msgid "use -l to list files"
msgstr ""
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "No s'ha trobat la llista de canvis\n"
@@ -3265,6 +3253,19 @@ msgstr "Instal·lador de programari"
msgid "Graphical front end to install RPM files"
msgstr "Frontal gràfic per instal·lar fitxers RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "La instal·lació ha fallat, falten alguns fitxers.\n"
+#~ "\n"
+#~ "%s\n"
+#~ "Potser voleu actualitzar la base de dades urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel·la"
+
#~ msgid "curl is missing, cannot upload DUDF file.\n"
#~ msgstr "no s'ha trobat curl, no s'ha pogut pujar el fitxer DUDF.\n"
diff --git a/po/cs.po b/po/cs.po
index df346f02..b97e6f6f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2012-03-21 08:44+0100\n"
+"POT-Creation-Date: 2012-06-08 19:19+0200\n"
"PO-Revision-Date: 2012-03-10 14:33+0000\n"
"Last-Translator: Petos Safarik <petos@mandrivalinux.cz>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -253,7 +253,7 @@ msgstr ""
msgid "Warning"
msgstr "Varování"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "OK"
@@ -314,7 +314,7 @@ msgstr[0] "(%d balíček, %d MB)"
msgstr[1] "(%d balíčky, %d MB)"
msgstr[2] "(%d balíčků, %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 "nelze získat zdrojový balíček, končím"
@@ -351,38 +351,41 @@ msgstr "...načítání selhalo: %s"
msgid "_Done"
msgstr "_Hotovo"
-#: ../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 ""
-"Instalace selhala, některé soubory chybí:\n"
-"%s\n"
-"Možná potřebujete aktualizovat databázi urpmi"
+"Instalace selhala, chybí některé soubory:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Možná potřebujete aktualizovat vaši databázi 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 "Instalace selhala:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Balíčky jsou již nainstalovány"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalace dokončena"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "odstraňuje se %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "restartuje se urpmi"
@@ -511,57 +514,57 @@ msgstr "chyba při registraci lokálních balíčků"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Tato operace je zakázána při běhu v omezeném režimu"
-#: ../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 "špatně zadaná proxy na příkazové řádce\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nemohu přečíst rpm soubor \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "neočekávaný výraz %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "chybí výraz před %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "neočekávaný výraz %s (návrh: použijte -a nebo -o ?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "chybí výraz pro zavření"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "urpmf očekává implicitně regulární výraz, použijte volbu \"--literal\""
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "adresář chroot neexistuje"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Nelze použít %s bez %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 "Nelze použít %s zároveň s %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Příliš mnoho parametrů\n"
@@ -610,7 +613,7 @@ msgstr "nelze načíst soubor s nastavením [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "zdroj `%s' je definovaný dvakrát, končím"
-#: ../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 "nelze zapsat soubor s nastavením [%s]"
@@ -725,22 +728,22 @@ msgstr " %s%% hotovo, rychlost = %s"
msgid "retrieving %s"
msgstr "přijímám %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "přijato %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "neznámý protokol definovaný pro %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "nebyla nalezena aplikace pro stažení přes web, podporované jsou: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "nelze zpracovat protokol: %s"
@@ -863,26 +866,17 @@ msgstr "Databáze %s je zamčená, čekám..."
msgid "aborting"
msgstr "přerušuji"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Opakovat?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Instalace selhala, chybí některé soubory:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Možná potřebujete aktualizovat vaši databázi urpmi."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -891,7 +885,7 @@ msgstr ""
"Instalace selhala, vadné RPM balíčky:\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 "
@@ -902,68 +896,68 @@ msgstr ""
"potřeba %s, dostupné je %s).\n"
"Opravdu chcete pokračovat?"
-#: ../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 "Chyba při instalaci"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Přesto zkusit pokračovat?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Následující balíček má špatnou signaturu"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Následující balíčky mají špatné signatury"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Chcete pokračovat v instalaci?"
-#: ../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 "Chyba při instalaci"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "odstraňují se instalované RPM balíčky (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "distribuuji %s"
+msgid "Try to continue anyway?"
+msgstr "Přesto zkusit pokračovat?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "instaluji %s z %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "instaluji %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "distribuuji %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Pokusit se o instalaci bez kontroly závislostí?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Pokusit se o instalaci razantněji (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Balíčky jsou aktuální"
-#: ../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 "Instalace je možná"
@@ -1524,37 +1518,37 @@ msgstr "Chcete-li použít všechny, použijte volbu \"-a\""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "nalezeny balíčky %s v db urpmi, ale žádný není instalovaný"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Balíček %s je již nainstalován"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Balíčky %s jsou již nainstalovány"
-#: ../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 "z důvodu konfliktů s %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 "z důvodu nesplněného %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "pokouším se postoupit %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "aby bylo možné zachovat %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"
@@ -1563,7 +1557,7 @@ msgstr ""
"Následující balíček musí být odstraněn, aby bylo možné jiné aktualizovat:\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"
@@ -1572,12 +1566,12 @@ msgstr ""
"Následující balíčky musí být odstraněny, aby bylo možné jiné aktualizovat:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "pro instalaci %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "z důvodu chybějícího %s"
@@ -2616,12 +2610,7 @@ msgstr[0] "Pokračovat v instalaci %d balíčku?"
msgstr[1] "Pokračovat v instalaci %d balíčků?"
msgstr[2] "Pokračovat v instalaci %d balíčků?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Po připojení stiskněte Enter..."
@@ -3360,20 +3349,20 @@ msgstr "volbu --list-nodes lze použít pouze s volbou --parallel"
msgid "use -l to list files"
msgstr "použijte -l pro seznam souborů"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"pro zdroj \"%s\" neexistuje xml info, pouze částečný výsledek pro balíček %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"pro zdroj \"%s\" neexistuje soubor xml info, pouze částečný výsledek pro "
"balíčky %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3381,7 +3370,7 @@ msgstr ""
"pro zdroj \"%s\" neexistuje soubor xml info, nelze vrátit žádný výsledek pro "
"balíček %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3389,7 +3378,7 @@ msgstr ""
"pro zdroj \"%s\" neexistuje soubor xml info, nelze vrátit žádný výsledek pro "
"balíčky %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Nebyl nalezen záznam změn\n"
@@ -3403,6 +3392,18 @@ msgid "Graphical front end to install RPM files"
msgstr "Grafické rozhraní pro instalaci balíčků RPM"
#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Instalace selhala, některé soubory chybí:\n"
+#~ "%s\n"
+#~ "Možná potřebujete aktualizovat databázi urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Zrušit"
+
+#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
#~ "# Line format is : <date time of generation> <uid>\n"
#~ "# You can use uids to see the content of your uploads at this url :\n"
diff --git a/po/cy.po b/po/cy.po
index da9c82fb..68ec46ae 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mandriva Linux\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: 2009-08-24 20:33-0000\n"
"Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
"Language-Team: Cymraeg\n"
@@ -256,7 +256,7 @@ msgstr ""
msgid "Warning"
msgstr "Rhybudd"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Iawn"
@@ -316,7 +316,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pecyn, %d MB)"
msgstr[1] "(%d pecyn, %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 "methu estyn pecynnau ffynhonnell, atal"
@@ -353,38 +353,41 @@ msgstr "... methodd ail-lwytho: %s"
msgid "_Done"
msgstr "_Gorffen"
-#: ../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 ""
-"Methodd y gosod, mae rhai ffeiliau ar goll:\n"
-"%s\n"
-"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
+"Methodd y gosod, mae rhai ffiliau ar goll:\n"
+"%s"
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
+
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, c-format
msgid "Installation failed:"
msgstr "Methodd y gosod:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Popeth wedi eu gosod eisoes"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Cwblhawyd y gosod"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "tynnu %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "ailgychwyn urpmi"
@@ -513,59 +516,59 @@ msgstr "gwall cofrestru pecynnau lleol"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
-#: ../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 "datganiad dirprwy gwallus ar y llinell orchymyn\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "mynegiadau annisgwyl %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "mynegiad coll cyn %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "mynegiad annisgwyl %s (awgrym: defnyddio -a neu-0 ?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "dim mynegiad i'w gau"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"drwy ragosodiad mae urmpf yn disgwyl regexp, dylech ddefnyddio dewis \"--"
"literal\""
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Nid yw cyfeiriadur chroot yn bodoli"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Methu defnyddio %s heb %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 "Methu defnyddio %s gyda %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Gormod o ymresymiadau\n"
@@ -614,7 +617,7 @@ msgstr "Methu creu ffeil config (%s)"
msgid "medium `%s' is defined twice, aborting"
msgstr "mae cyfrwng '%s' wedi ei ddiffinio ddwy waith, cau"
-#: ../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 "methu ysgrifennu i ffeil ffurfweddiad (%s)"
@@ -729,22 +732,22 @@ msgstr " %s%% wedi ei gwblhau, cyflymder = %s"
msgid "retrieving %s"
msgstr "estyn %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "estynwyd: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocol anhysbys ar gyfer %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "heb ganfod webfetch, yn cael eu cynnal gan webfetch: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "methu trin protocol: %s"
@@ -866,26 +869,17 @@ msgstr "Cronfa ddata %s wedi cloi, aros..."
msgid "aborting"
msgstr "atal"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Ceisio eto?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Methodd y gosod, mae rhai ffiliau ar goll:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -894,7 +888,7 @@ msgstr ""
"Methodd y gosod, rpm gwallus:\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 "
@@ -902,68 +896,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 "Methodd y gosod"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Ymlaen beth bynnag?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Mae gan y pecyn canlynol lofnod gwallus"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ydych chi am barhau gosod?"
-#: ../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 "Methodd y gosod"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "tynnu rpm wedi eu gosod (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "dosbarthu %s"
+msgid "Try to continue anyway?"
+msgstr "Ymlaen beth bynnag?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "gosod %s o %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "gosod %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "dosbarthu %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Ceisio gosod heb wirio dibyniaethau?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Mwy o orfodaeth gyda'r gosod? (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Mae'r pecynnau'n rhai diweddaraf"
-#: ../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 "Gosod yn bosibl"
@@ -1506,37 +1500,37 @@ msgstr "Dylech ddefnyddio \"-a\" i'w defnyddio i gyd"
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "wedi canfod pecyn(nau) %s yn urpmi db, ond heb eu gosod"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Pecyn %s wedi ei osod eisoes"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Pecynnau %s wedi eu gosod eisoes"
-#: ../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 "oherwydd gwrthdaro gyda %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 "%s heb ei foddloni"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "ceisio hybu %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "fel modd i gadw %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"
@@ -1545,7 +1539,7 @@ msgstr ""
"Rhaid i'r pecyn canlynol gael ei dynnu i eraill gael eu diweddaru.\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"
@@ -1554,12 +1548,12 @@ msgstr ""
"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "er mwyn gosod %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "oherwydd %s coll"
@@ -2584,12 +2578,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Parhau gyda gosod %d pecyn?"
msgstr[1] "Parhau gyda gosod %d pecyn?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Dileu"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Pwyso Enter pan wedi ei arosod..."
@@ -3325,21 +3314,21 @@ msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
msgid "use -l to list files"
msgstr "defnyddiwch -l i restru'r ffeiliau"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"dim xml info ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer "
"pecyn %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"dimxml info ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer "
"pecynnau %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3347,7 +3336,7 @@ msgstr ""
"dim xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
"pecyn %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3355,7 +3344,7 @@ msgstr ""
"dim xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
"pecynnau %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Heb ganfod changelog\n"
@@ -3368,6 +3357,18 @@ msgstr "Gosodwr Meddalwedd"
msgid "Graphical front end to install RPM files"
msgstr "Blaen graffigol ar gyfer gosod ffeiliau RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Methodd y gosod, mae rhai ffeiliau ar goll:\n"
+#~ "%s\n"
+#~ "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
+
+#~ msgid "Cancel"
+#~ msgstr "Dileu"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/da.po b/po/da.po
index cf56c8fb..c9bc00fe 100644
--- a/po/da.po
+++ b/po/da.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: da\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: 2009-10-22 12:59+0200\n"
"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -265,7 +265,7 @@ msgstr ""
msgid "Warning"
msgstr "Advarsel"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "O.k."
@@ -327,7 +327,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakke, %d MB)"
msgstr[1] "(%d pakker, %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 "kan ikke hente kilde-pakker, afslutter med fejl"
@@ -364,38 +364,41 @@ msgstr "...hentning mislykkedes: %s"
msgid "_Done"
msgstr "_Færdig"
-#: ../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 ""
-"Installationen mislykkedes, nogle filer mangler:\n"
-"%s\n"
-"Du ønsker måske at opdatere din urpmi-database"
+"Installation mislykkedes, der mangler nogen filer:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Du ønsker måske at opdatere din urpmi-database."
-#: ../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 "Installationen fejlede:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "alting er allerede installeret"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Installationen færdig"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "fjerner %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "genstarter urpmi"
@@ -524,57 +527,57 @@ msgstr "fejl ved registrering af lokale pakker"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Denne handling er forbudt ved kørsel i begrænset tilstand"
-#: ../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 "Forkert proxy-erklæring på kommandolinje\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: kan ikke læse rpm-fil \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "Uventet udtryk %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "manglende udtryk før %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "uventet udtryk %s (forslag: brug -a eller -o ?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "intet udtryk at lukke"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "normalt venter urpmf en regexp. du bør bruge parameteren \"--literal\""
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-katalog eksisterer ikke"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan ikke bruge %s uden %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 "Kan ikke bruge '%s' med '%s'."
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "For mange argumenter\n"
@@ -623,7 +626,7 @@ msgstr "kunne ikke læse config-fil [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "Mediet '%s' er defineret to gange. Afbryder"
-#: ../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 "kunne ikke skrive config-fil [%s]"
@@ -739,22 +742,22 @@ msgstr " %s %% færdiggjort. Hastighed: %s."
msgid "retrieving %s"
msgstr "henter %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "hentede %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "ukendt protokol defineret for %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "Ingen webhentning fundet, understøttede webhentninger er: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "kunne ikke behandle protokol: %s"
@@ -877,26 +880,17 @@ msgstr "%s-database er låst, venter..."
msgid "aborting"
msgstr "afbryder"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Forsøg igen?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Installation mislykkedes, der mangler nogen filer:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Du ønsker måske at opdatere din urpmi-database."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -905,7 +899,7 @@ msgstr ""
"Installationen fejlede, dårlige rpm-pakker:\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 "
@@ -916,68 +910,68 @@ msgstr ""
"%s tilgængelig).\n"
"Er du sikker på at du vil fortsætte?"
-#: ../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 "Installationen fejlede"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Prøv at fortsætte alligevel?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Den følgende pakke har dårlig signatur"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "De følgende pakker har dårlige signaturer"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ønsker du at fortsætte installationen?"
-#: ../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 "Installationen fejlede"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "fjerner installerede rpm'er (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "distribuerer %s"
+msgid "Try to continue anyway?"
+msgstr "Prøv at fortsætte alligevel?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "installerer %s fra %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "installerer %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "distribuerer %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Prøv installation uden at tjekke afhængigheder?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Prøv endnu hårdere at installere (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Pakkerne er af nyeste version"
-#: ../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 "Installation er mulig"
@@ -1519,37 +1513,37 @@ msgstr "Du bør bruge \"-a\" for at bruge dem alle"
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "fandt pakkerne %s i urpmi db, men ingen er installeret"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Pakke %s er allerede installeret"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Pakkerne %s er allerede installerede"
-#: ../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 "grundet modstrid med %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 "grundet uopfyldt %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "prøver at fremme %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "for at kunne beholde %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"
@@ -1558,7 +1552,7 @@ msgstr ""
"Den følgende pakke skal fjernes for at andre kan opgraderes:\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"
@@ -1567,12 +1561,12 @@ msgstr ""
"De følgende pakker skal fjernes for at andre kan opgraderes:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "for at kunne installere %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "grundet manglende %s"
@@ -2598,12 +2592,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortsæt installationen med %d pakke?"
msgstr[1] "Fortsæt installationen med de %d pakker?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Annullér"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Tryk Enter når det er monteret..."
@@ -3328,30 +3317,30 @@ msgstr "--list-nodes kan kun bruges med --parallel"
msgid "use -l to list files"
msgstr "brug -l for at liste filer"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "Ingen 'xml-info for medie '%s', kun delvist resultat for pakken '%s'"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr "Ingen xml-info for medie'%s', kun delvist resultat for pakkerne '%s'"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"Ingen 'xml-info for medie '%s', kan ikke vise noget resultat for pakken %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr "Ingen xml-info for medie '%s', kan ikke vise resultat for pakkerne %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Ingen ændringslog fundet\n"
@@ -3364,6 +3353,18 @@ msgstr "Programmel-installering"
msgid "Graphical front end to install RPM files"
msgstr "Grafisk frontend til installation af rpm-filer"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Installationen mislykkedes, nogle filer mangler:\n"
+#~ "%s\n"
+#~ "Du ønsker måske at opdatere din urpmi-database"
+
+#~ msgid "Cancel"
+#~ msgstr "Annullér"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/de.po b/po/de.po
index fddfee1e..3742489d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2012-03-21 08:44+0100\n"
+"POT-Creation-Date: 2012-06-08 19:19+0200\n"
"PO-Revision-Date: 2012-03-22 16:39+0100\n"
"Last-Translator: Oliver Burger <obgr_seneca@mageia.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,9 +25,7 @@ msgstr "RPM-Installation"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Fehler: Datei %s kann nicht gefunden werden, Vorgang wird abgebrochen"
-#: ../gurpmi:47
-#: ../gurpmi2:196
-#: ../gurpmi2:221
+#: ../gurpmi:47 ../gurpmi2:196 ../gurpmi2:221
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -39,7 +37,8 @@ msgid ""
"\n"
"%s\n"
"\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
"\n"
"What would you like to do?"
msgstr ""
@@ -47,12 +46,13 @@ msgstr ""
"\n"
"%s\n"
"\n"
-"Sie wollten es wahrscheinlich nicht auf dem Rechner installieren (Installieren bietet die Möglichkeit, den Quellcode zu ändern und zu kompilieren)\n"
+"Sie wollten es wahrscheinlich nicht auf dem Rechner installieren "
+"(Installieren bietet die Möglichkeit, den Quellcode zu ändern und zu "
+"kompilieren)\n"
"\n"
"Was wollen Sie machen?"
-#: ../gurpmi:75
-#: ../gurpmi:86
+#: ../gurpmi:75 ../gurpmi:86
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -92,8 +92,7 @@ msgstr "_Installieren"
msgid "_Save"
msgstr "_Speichern"
-#: ../gurpmi:101
-#: ../gurpmi2:196
+#: ../gurpmi:101 ../gurpmi2:196
#, c-format
msgid "_Cancel"
msgstr "_Abbrechen"
@@ -103,13 +102,13 @@ msgstr "_Abbrechen"
msgid "Choose location to save file"
msgstr "Speicherort auswählen"
-#: ../gurpmi.pm:39
-#: ../urpmi:66
+#: ../gurpmi.pm:39 ../urpmi:66
#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
@@ -125,42 +124,38 @@ msgstr ""
msgid "Options:"
msgstr "Optionen:"
-#: ../gurpmi.pm:46
-#: ../urpme:46
-#: ../urpmf:35
-#: ../urpmi:71
-#: ../urpmi.addmedia:55
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:71 ../urpmi.addmedia:55
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - Diese Hilfe anzeigen.\n"
-#: ../gurpmi.pm:47
-#: ../urpmi:78
+#: ../gurpmi.pm:47 ../urpmi:78
#, c-format
-msgid " --auto - non-interactive mode, assume default answers to questions.\n"
-msgstr " --auto - nicht-interaktiver Modus, vorgegebene Antworten werden bei Fragen angenommen.\n"
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions.\n"
+msgstr ""
+" --auto - nicht-interaktiver Modus, vorgegebene Antworten werden "
+"bei Fragen angenommen.\n"
-#: ../gurpmi.pm:48
-#: ../urpmi:79
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:79 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - Automatische Paketauswahl zur Aktualisierung des Systems.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - Automatische Paketauswahl zur Aktualisierung des "
+"Systems.\n"
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:102
-#: ../urpmq:68
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:102 ../urpmq:68
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - Aufruf erzwingen, auch wenn einige Pakete nicht existieren.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - Aufruf erzwingen, auch wenn einige Pakete nicht "
+"existieren.\n"
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -170,44 +165,43 @@ msgstr ""
" (--no-verify-rpm deaktiviert das Verhalten,\n"
" Voreingestellt: Überprüfung der Signaturen).\n"
-#: ../gurpmi.pm:52
-#: ../urpmf:41
-#: ../urpmi:72
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:72 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - Nur durch Kommata getrennte Medienliste benutzen.\n"
-#: ../gurpmi.pm:53
-#: ../urpmi:150
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - Erlaubt die Suche in »Stellt bereit« nach einem Paket.\n"
+msgstr ""
+" -p - Erlaubt die Suche in »Stellt bereit« nach einem Paket.\n"
-#: ../gurpmi.pm:54
-#: ../urpmi:151
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - Nicht in »Stellt bereit« nach dem Paket suchen.\n"
-#: ../gurpmi.pm:55
-#: ../urpmi:109
-#: ../urpmq:71
+#: ../gurpmi.pm:55 ../urpmi:109 ../urpmq:71
#, c-format
msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - Anderen Wurzelordner zur RPM-Installation benutzen.\n"
+msgstr ""
+" --root - Anderen Wurzelordner zur RPM-Installation benutzen.\n"
-#: ../gurpmi.pm:56
-#: ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:135
#, c-format
-msgid " --test - only verify if the installation can be achieved correctly.\n"
-msgstr " --test - Versuch, ob die Installation korrekt verlaufen wird.\n"
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - Versuch, ob die Installation korrekt verlaufen wird.\n"
-#: ../gurpmi.pm:57
-#: ../urpmi:75
+#: ../gurpmi.pm:57 ../urpmi:75
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - Nur die angegebenen Medien verwenden, um nach den angeforderten Paketen zu suchen\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - Nur die angegebenen Medien verwenden, um nach den "
+"angeforderten Paketen zu suchen\n"
#: ../gurpmi.pm:100
#, c-format
@@ -239,8 +233,7 @@ msgstr "Paketinstallation"
msgid "Preparing packages installation..."
msgstr "Paketinstallation wird vorbereitet …"
-#: ../gurpmi2:112
-#: ../urpmi:509
+#: ../gurpmi2:112 ../urpmi:509
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -266,7 +259,6 @@ msgid "Warning"
msgstr "Warnung"
#: ../gurpmi2:155
-#: ../urpmi:642
#, c-format
msgid "Ok"
msgstr "OK"
@@ -303,21 +295,23 @@ msgid ""
"%s\n"
"Continue installation anyway?"
msgstr ""
-"Die folgenden Pakete müssen entfernt werden, um andere aktualisieren zu können:\n"
+"Die folgenden Pakete müssen entfernt werden, um andere aktualisieren zu "
+"können:\n"
"%s\n"
"Wollen Sie trotzdem fortfahren?"
-#: ../gurpmi2:276
-#: ../urpmi:609
+#: ../gurpmi2:276 ../urpmi:609
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "Um die Abhängigkeiten zu erfüllen, wird folgendes Paket installiert:"
-#: ../gurpmi2:277
-#: ../urpmi:610
+#: ../gurpmi2:277 ../urpmi:610
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert:"
#: ../gurpmi2:279
#, c-format
@@ -326,14 +320,12 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d Paket, %d MB)"
msgstr[1] "(%d Pakete, %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 "Quellpakete können nicht gefunden werden, Abbruch"
-#: ../gurpmi2:319
-#: ../urpm/install.pm:81
+#: ../gurpmi2:319 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Vorbereiten …"
@@ -343,8 +335,7 @@ msgstr "Vorbereiten …"
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installieren des Pakets `%s' (%s/%s) …"
-#: ../gurpmi2:343
-#: ../urpmi:637
+#: ../gurpmi2:343 ../urpmi:637
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Bitte legen Sie das Medium mit dem Namen »%s« ein"
@@ -354,12 +345,8 @@ msgstr "Bitte legen Sie das Medium mit dem Namen »%s« ein"
msgid "Downloading package `%s'..."
msgstr "Holen des Pakets »%s« …"
-#: ../gurpmi2:369
-#: ../urpm.pm:338
-#: ../urpm/download.pm:831
-#: ../urpm/get_pkgs.pm:262
-#: ../urpm/media.pm:981
-#: ../urpm/media.pm:1493
+#: ../gurpmi2:369 ../urpm.pm:338 ../urpm/download.pm:831
+#: ../urpm/get_pkgs.pm:262 ../urpm/media.pm:981 ../urpm/media.pm:1493
#: ../urpm/media.pm:1644
#, c-format
msgid "...retrieving failed: %s"
@@ -370,42 +357,41 @@ msgstr " …Holen fehlgeschlagen: %s"
msgid "_Done"
msgstr "_Fertig"
-#: ../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 ""
"Installation fehlgeschlagen, einige Dateien fehlen:\n"
-"%s\n"
-"Sie sollten Ihre urpmi-Datenbank aktualisieren"
+"%s"
-#: ../gurpmi2:408
-#: ../urpm/main_loop.pm:292
-#: ../urpm/main_loop.pm:335
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Sie sollten Ihre urpmi-Datenbank aktualisieren."
+
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, c-format
msgid "Installation failed:"
msgstr "Installation fehlgeschlagen:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Alles bereits installiert"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Installation beendet"
-#: ../gurpmi2:416
-#: ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "%s wird entfernt"
-#: ../gurpmi2:427
-#: ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "urpmi wird neu gestartet"
@@ -444,8 +430,7 @@ msgstr " Voreinstellung ist %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - Voller RPM-Name (NVRA)\n"
-#: ../rurpmi:11
-#: ../urpmi:269
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Nur der Systemadministrator darf Pakete installieren"
@@ -458,7 +443,9 @@ msgstr "Urpmi wird im eingeschränkten Modus ausgeführt …"
#: ../urpm.pm:23
#, c-format
msgid "While some packages may have been installed, there were failures.\n"
-msgstr "Einige Pakete wurden eventuell installiert, es sind aber Fehler aufgetreten.\n"
+msgstr ""
+"Einige Pakete wurden eventuell installiert, es sind aber Fehler "
+"aufgetreten.\n"
#: ../urpm.pm:110
#, c-format
@@ -480,9 +467,7 @@ msgstr "Pakete können nicht im Ordner »%s« gespeichert werden"
msgid "Environment directory %s does not exist"
msgstr "Der angegebene Ordner %s existiert nicht"
-#: ../urpm.pm:151
-#: ../urpmf:248
-#: ../urpmq:167
+#: ../urpm.pm:151 ../urpmf:248 ../urpmq:167
#, c-format
msgid "using specific environment on %s\n"
msgstr "Spezielle Umgebung für %s wird benutzt\n"
@@ -502,8 +487,7 @@ msgstr "Ungültiger RPM-Name [%s]"
msgid "retrieving rpm file [%s] ..."
msgstr "Holen des RPMs [%s] …"
-#: ../urpm.pm:335
-#: ../urpm/get_pkgs.pm:260
+#: ../urpm.pm:335 ../urpm/get_pkgs.pm:260
#, c-format
msgid "...retrieving done"
msgstr "… Holen beendet"
@@ -538,82 +522,83 @@ msgstr "Fehler bei der Registrierung lokaler Pakete"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Diese Operation ist im eingeschränkten Modus verboten"
-#: ../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 "Ungültige Proxyangabe als Befehlszeilenparameter\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM-Datei »%s« kann nicht gelesen werden.\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "unerwarteter Ausdruck %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "fehlender Ausdruck vor (%s)"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "unerwarteter Ausdruck %s (Vorschlag: Benutzen Sie -a oder -o)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "Kein Ausdruck zu schließen"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "Als Standard erwartet urpmf einen regulären Ausdruck. Sie sollten die Option »--literal« verwenden"
+msgstr ""
+"Als Standard erwartet urpmf einen regulären Ausdruck. Sie sollten die Option "
+"»--literal« verwenden"
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-Ordner existiert nicht"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Es ist nicht möglich, %s ohne %s zu verwenden"
-#: ../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 "Es ist nicht möglich, %s mit %s zu verwenden"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "zu viele Argumente\n"
-#: ../urpm/bug_report.pm:55
-#: ../urpmi:259
+#: ../urpm/bug_report.pm:55 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopieren fehlgeschlagen"
#: ../urpm/cdrom.pm:67
#, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "Sie müssen die CD-ROM selbst einbinden (oder perl-Hal-Cdroms installieren, um dies automatisch durchführen zu lassen)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"Sie müssen die CD-ROM selbst einbinden (oder perl-Hal-Cdroms installieren, "
+"um dies automatisch durchführen zu lassen)"
#: ../urpm/cdrom.pm:69
#, c-format
msgid "Udisks daemon (udisks-daemon) is not running or not ready"
msgstr "Der Udisks-Dienst (udisks-daemon) läuft nicht oder ist nicht bereit"
-#: ../urpm/cdrom.pm:161
-#: ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "Das Medium »%sy ist nicht verfügbar"
@@ -638,8 +623,7 @@ msgstr "Es ist nicht möglich, die Konfigurationsdatei zu lesen [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "Medium `%s' ist bereits vorhanden, Abbruch"
-#: ../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 "Die Konfigurationsdatei [%s] kann nicht geschrieben werden"
@@ -652,7 +636,9 @@ msgstr "%s ist nicht verfügbar. Zurück zur %s"
#: ../urpm/download.pm:166
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "Proxy-Einstellungen können nicht gelesen werden (ungenügende Leserechte für %s)"
+msgstr ""
+"Proxy-Einstellungen können nicht gelesen werden (ungenügende Leserechte für "
+"%s)"
#: ../urpm/download.pm:191
#, c-format
@@ -742,7 +728,9 @@ msgstr "%s konnte nicht heruntergeladen werden"
#: ../urpm/download.pm:808
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
-msgstr " %s%% von %s abgeschlossen, verbleibende Zeit = %s, Geschwindigkeit = %s"
+msgstr ""
+" %s%% von %s abgeschlossen, verbleibende Zeit = %s, Geschwindigkeit = "
+"%s"
#: ../urpm/download.pm:809
#, c-format
@@ -754,22 +742,22 @@ msgstr " %s%% abgeschlossen, Geschwindigkeit = %s"
msgid "retrieving %s"
msgstr "%s wird geholt"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "%s wurde geholt"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "Unbekanntes Protokoll für %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "kein webfetch gefunden, unterstützte webfetch sind: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "Das Protokoll kann nicht verarbeitet werden: %s"
@@ -796,8 +784,11 @@ msgstr "[neu packen]"
#: ../urpm/install.pm:168
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "Vorgang zum Installieren auf %s gestellt (entfernen=%d, installieren=%d, aktualisieren=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"Vorgang zum Installieren auf %s gestellt (entfernen=%d, installieren=%d, "
+"aktualisieren=%d)"
#: ../urpm/install.pm:171
#, c-format
@@ -819,8 +810,7 @@ msgstr "Paket %s kann nicht installiert werden"
msgid "removing bad rpm (%s) from %s"
msgstr "Fehlerhaftes rpm (%s) wird von %s entfernt"
-#: ../urpm/install.pm:213
-#: ../urpm/install.pm:278
+#: ../urpm/install.pm:213 ../urpm/install.pm:278
#, c-format
msgid "removing %s failed: %s"
msgstr "Entfernen von %s fehlgeschlagen: %s"
@@ -865,8 +855,7 @@ msgstr "Kein Server definiert, es fehlt eine Adresse oder ein Rechnername"
msgid "No base defined"
msgstr "Kein Bezug definiert"
-#: ../urpm/ldap.pm:173
-#: ../urpm/ldap.pm:176
+#: ../urpm/ldap.pm:173 ../urpm/ldap.pm:176
#, c-format
msgid "Cannot connect to ldap uri:"
msgstr "Es ist nicht möglich, zur LDAP-Adresse zu verbinden: "
@@ -879,7 +868,9 @@ msgstr "Die %s-Datenbank ist gesperrt, der Prozess %d nutzt sie bereits"
#: ../urpm/lock.pm:70
#, c-format
msgid "%s database is locked (another program is already using it)"
-msgstr "Die %s-Datenbank ist gesperrt ( ein anderes laufendes Programm nutzt sie bereits)"
+msgstr ""
+"Die %s-Datenbank ist gesperrt ( ein anderes laufendes Programm nutzt sie "
+"bereits)"
#: ../urpm/lock.pm:84
#, c-format
@@ -891,26 +882,17 @@ msgstr "%s Datenbank ist gesperrt. Warten …"
msgid "aborting"
msgstr "abbrechen"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Nochmals versuchen?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Installation fehlgeschlagen, einige Dateien fehlen:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Sie sollten Ihre urpmi-Datenbank aktualisieren."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -919,80 +901,79 @@ msgstr ""
"Installation fehlgeschlagen, fehlerhafte RPMs:\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 needed, %s available).\n"
+"There is not enough space on your filesystem to download all packages (%s "
+"needed, %s available).\n"
"Are you sure you want to continue?"
msgstr ""
-"Auf Ihrem Dateisystem ist nicht genug Platz vorhanden, um alle Pakete herunterzuladen (%s werden benötigt, %s sind vorhanden).\n"
+"Auf Ihrem Dateisystem ist nicht genug Platz vorhanden, um alle Pakete "
+"herunterzuladen (%s werden benötigt, %s sind vorhanden).\n"
"Wollen Sie wirklich fortfahren?"
-#: ../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 "Die Installation schlug fehl"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Trotzdem versuchen?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Folgendes Paket hat eine inkorrekte Signatur"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Die folgenden Pakete haben inkorrekte Signaturen"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Wollen Sie die Installation fortsetzen?"
-#: ../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 "Die Installation schlug fehl"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "installierte RPMs werden entfernt(%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "%s wird verteilt"
+msgid "Try to continue anyway?"
+msgstr "Trotzdem versuchen?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "%s von %s wird installiert"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "%s wird installiert"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "%s wird verteilt"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Soll eine Installation ohne Abhängigkeitstest versucht werden?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Soll eine Installation mittels --force erzwungen werden?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Die Pakete sind auf dem aktuellen Stand"
-#: ../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 "Die Installation ist möglich"
@@ -1005,22 +986,29 @@ msgstr "Warnung: md5sum für %s ist in Prüfsummendatei nicht verfügbar"
#: ../urpm/media.pm:258
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "Das virtuelle Medium »%s« sollte eine eindeutige URL haben, es wird ignoriert"
+msgstr ""
+"Das virtuelle Medium »%s« sollte eine eindeutige URL haben, es wird ignoriert"
#: ../urpm/media.pm:260
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "Auf Listendatei von »%s« konnte nicht zugegriffen werden, Medium wird ignoriert"
+msgstr ""
+"Auf Listendatei von »%s« konnte nicht zugegriffen werden, Medium wird "
+"ignoriert"
#: ../urpm/media.pm:263
#, c-format
msgid "unable to access synthesis file of \"%s\", medium ignored"
-msgstr "Es ist nicht möglich, auf die Synthesis-Datei von »%s« zuzugreifen, das Medium wird ignoriert"
+msgstr ""
+"Es ist nicht möglich, auf die Synthesis-Datei von »%s« zuzugreifen, das "
+"Medium wird ignoriert"
#: ../urpm/media.pm:289
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
-msgstr "Existierendes Medium »%s« konnte nicht überschrieben werden, wird übersprungen"
+msgstr ""
+"Existierendes Medium »%s« konnte nicht überschrieben werden, wird "
+"übersprungen"
#: ../urpm/media.pm:505
#, c-format
@@ -1044,8 +1032,12 @@ msgstr "Zugeordnetes Medium wird für den parallelen Modus verwendet: %s"
#: ../urpm/media.pm:610
#, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "--synthesis kann nicht verwendet werden mit --media, --excludemedia, --sortmedia, --update, --use-distrib oder --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--synthesis kann nicht verwendet werden mit --media, --excludemedia, --"
+"sortmedia, --update, --use-distrib oder --parallel"
#: ../urpm/media.pm:719
#, c-format
@@ -1105,7 +1097,9 @@ msgstr "Nicht möglich, media.cfg zu parsen"
#: ../urpm/media.pm:982
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "Es ist nicht möglich, das Distributionsmedium zu verwenden (keine media.cfg-Datei gefunden)"
+msgstr ""
+"Es ist nicht möglich, das Distributionsmedium zu verwenden (keine media.cfg-"
+"Datei gefunden)"
#: ../urpm/media.pm:1003
#, c-format
@@ -1172,15 +1166,12 @@ msgstr "Synthese-Datei [%s] wird gelesen"
msgid "problem reading synthesis file of medium \"%s\""
msgstr "Probleme beim Lesen der Synthese-Datei des Mediums »%s«"
-#: ../urpm/media.pm:1370
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1370 ../urpm/media.pm:1465
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "[%s] für Medium »%s« wird kopiert …"
-#: ../urpm/media.pm:1372
-#: ../urpm/media.pm:1442
-#: ../urpm/media.pm:1695
+#: ../urpm/media.pm:1372 ../urpm/media.pm:1442 ../urpm/media.pm:1695
#, c-format
msgid "...copying failed"
msgstr "… das Kopieren scheiterte"
@@ -1190,8 +1181,7 @@ msgstr "… das Kopieren scheiterte"
msgid "copying description file of \"%s\"..."
msgstr "Beschreibungsdatei von »%s« wird kopiert …"
-#: ../urpm/media.pm:1440
-#: ../urpm/media.pm:1469
+#: ../urpm/media.pm:1440 ../urpm/media.pm:1469
#, c-format
msgid "...copying done"
msgstr "… das Kopieren ist beendet"
@@ -1206,8 +1196,7 @@ msgstr "Kopieren von [%s] fehlgeschlagen (Datei ist verdächtig klein)"
msgid "computing md5sum of retrieved source synthesis"
msgstr "md5sum der erhaltenen Synthese-Datei der Quelle wird errechnet"
-#: ../urpm/media.pm:1521
-#: ../urpm/media.pm:1961
+#: ../urpm/media.pm:1521 ../urpm/media.pm:1961
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "Holen von [%s] fehlgeschlagen (md5sum fehlerhaft)"
@@ -1277,8 +1266,7 @@ msgstr "Medium »%s« aktualisiert"
msgid "retrieval of [%s] failed"
msgstr "Holen von [%s] fehlgeschlagen"
-#: ../urpm/mirrors.pm:19
-#: ../urpm/mirrors.pm:40
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "Erneuter Versuch mit Mirror %s"
@@ -1298,25 +1286,18 @@ msgstr "Geoposition %s %.2f %.2f in Zeitzone %s gefunden"
msgid "getting mirror list from %s"
msgstr "Mirror-Liste von %s wird geholt"
-#: ../urpm/msg.pm:76
-#: ../urpmi:495
-#: ../urpmi:513
-#: ../urpmi:629
+#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:629
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77
-#: ../urpme:38
-#: ../urpmi.addmedia:133
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi.addmedia:133
#, c-format
msgid "Yy"
msgstr "JjYy"
-#: ../urpm/msg.pm:107
-#: ../urpme:163
-#: ../urpmi.addmedia:136
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:136
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
@@ -1381,8 +1362,7 @@ msgstr "MB"
msgid "GB"
msgstr "GB"
-#: ../urpm/msg.pm:208
-#: ../urpm/msg.pm:217
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
#, c-format
msgid "TB"
msgstr "TB"
@@ -1390,7 +1370,9 @@ msgstr "TB"
#: ../urpm/orphans.pm:51
#, c-format
msgid "Marking %s as manually installed, it won't be auto-orphaned"
-msgstr "%s wird als manuell installiert markiert, es wird von der auto-orphan-Funktion ignoriert"
+msgstr ""
+"%s wird als manuell installiert markiert, es wird von der auto-orphan-"
+"Funktion ignoriert"
#: ../urpm/orphans.pm:448
#, c-format
@@ -1423,16 +1405,21 @@ msgstr[1] "Vielleicht wollen Sie es entfernen."
msgid ""
"The following package:\n"
"%s\n"
-"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans\""
+"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans"
+"\""
msgid_plural ""
"The following packages:\n"
"%s\n"
-"are now orphaned, if you wish to remove them, you can use \"urpme --auto-orphans\""
-msgstr[0] "Das folgende Paket ist nun verwaist, Sie können nun »urpme --auto-orphans« benutzen, um es zu entfernen."
+"are now orphaned, if you wish to remove them, you can use \"urpme --auto-"
+"orphans\""
+msgstr[0] ""
+"Das folgende Paket ist nun verwaist, Sie können nun »urpme --auto-orphans« "
+"benutzen, um es zu entfernen."
msgstr[1] ""
"Die folgenden Pakete:\n"
"%s\n"
-"sind nun verwaist, Sie können nun »urpme --auto-orphans« benutzen, um sie zu entfernen."
+"sind nun verwaist, Sie können nun »urpme --auto-orphans« benutzen, um sie zu "
+"entfernen."
#: ../urpm/parallel.pm:15
#, c-format
@@ -1486,16 +1473,19 @@ msgstr "Cp schlug auf Server %s fehl (%d)"
#: ../urpm/parallel_ssh.pm:86
#, c-format
-msgid "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit code: %d)"
-msgstr "%s schlug auf Rechner %s fehl (gibt es vielleicht keine geeignete urpmi-Version?) (Fehlercode: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"%s schlug auf Rechner %s fehl (gibt es vielleicht keine geeignete urpmi-"
+"Version?) (Fehlercode: %d)"
#: ../urpm/removable.pm:33
#, c-format
msgid "unable to access medium \"%s\"."
msgstr "Es ist nicht möglich, auf das Medium »%s« zuzugreifen."
-#: ../urpm/removable.pm:73
-#: ../urpm/removable.pm:91
+#: ../urpm/removable.pm:73 ../urpm/removable.pm:91
#, c-format
msgid "mounting %s"
msgstr "Einhängen von %s"
@@ -1508,20 +1498,24 @@ msgstr "Aushängen von %s"
#: ../urpm/select.pm:31
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "Urpmi wurde neu gestartet, und die Liste der vorrangigen Pakete hat sich nicht geändert"
+msgstr ""
+"Urpmi wurde neu gestartet, und die Liste der vorrangigen Pakete hat sich "
+"nicht geändert"
#: ../urpm/select.pm:33
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "Urpmi wurde neu gestartet, und die Liste der vorrangigen Pakete hat sich geändert: %s gegenüber %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"Urpmi wurde neu gestartet, und die Liste der vorrangigen Pakete hat sich "
+"geändert: %s gegenüber %s"
#: ../urpm/select.pm:186
#, c-format
msgid "No package named %s"
msgstr "Kein Paket mit dem Namen %s gefunden"
-#: ../urpm/select.pm:188
-#: ../urpme:117
+#: ../urpm/select.pm:188 ../urpme:117
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Die folgenden Pakete enthalten %s: %s"
@@ -1534,41 +1528,40 @@ msgstr "Benutzen Sie »-a«, um alle zu nutzen"
#: ../urpm/select.pm:308
#, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Paket(e) %s in der urpmi-Datenbank gefunden, sind jedoch nicht installiert."
+msgstr ""
+"Paket(e) %s in der urpmi-Datenbank gefunden, sind jedoch nicht installiert."
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Paket %s ist installiert"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Pakete %s sind installiert"
-#: ../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 "wegen Konflikten mit %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 "wegen nicht erfüllter Abhängigkeit von %s "
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "Es wird versucht, %s voranzubringen"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "um %s zu behalten"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1578,7 +1571,7 @@ msgstr ""
"durchführen zu können:\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"
@@ -1588,12 +1581,12 @@ msgstr ""
"durchführen zu können:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "um %s zu installieren"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "wegen fehlendem %s"
@@ -1621,12 +1614,15 @@ msgstr "System"
#: ../urpm/sys.pm:223
#, c-format
msgid "You should restart your computer for %s"
-msgstr "Sie sollten Ihren Computer aufgrund der Aktualisierung von %s neu starten"
+msgstr ""
+"Sie sollten Ihren Computer aufgrund der Aktualisierung von %s neu starten"
#: ../urpm/sys.pm:225
#, c-format
msgid "You should restart your session for %s"
-msgstr "Sie sollten Ihre aktuelle Sitzung aufgrund der Aktualisierung von %s neu starten"
+msgstr ""
+"Sie sollten Ihre aktuelle Sitzung aufgrund der Aktualisierung von %s neu "
+"starten"
#: ../urpm/sys.pm:227
#, c-format
@@ -1653,7 +1649,8 @@ msgstr "Datei %s kann nicht nach %s verschoben werden"
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
@@ -1679,17 +1676,14 @@ msgstr "--auto-orphans - Deinstalliert verwaiste Pakete\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - Prüfen, ob die Entfernung korrekt verlaufen wird.\n"
-#: ../urpme:51
-#: ../urpmi:108
-#: ../urpmq:70
+#: ../urpme:51 ../urpmi:108 ../urpmq:70
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - Verteilter urpmi-Aufruf auf allen teilnehmenden\n"
" Maschinen.\n"
-#: ../urpme:52
-#: ../urpmi:142
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Neu packen vor dem Löschen\n"
@@ -1699,23 +1693,20 @@ msgstr " --repackage - Neu packen vor dem Löschen\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - Anderen Wurzelordner zur RPM-Entfernung benutzen.\n"
-#: ../urpme:54
-#: ../urpmf:40
-#: ../urpmi:110
-#: ../urpmi.addmedia:73
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:48
-#: ../urpmq:72
+#: ../urpme:54 ../urpmf:40 ../urpmi:110 ../urpmi.addmedia:73
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:72
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - Anderen Wurzelordner für urpmi-Datenbank und RPM-Installation.\n"
+msgstr ""
+" --urpmi-root - Anderen Wurzelordner für urpmi-Datenbank und RPM-"
+"Installation.\n"
-#: ../urpme:55
-#: ../urpmi:100
+#: ../urpme:55 ../urpmi:100
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - Nur die rpm-Datenbank aktualisieren, nicht das Dateisystem.\n"
+msgstr ""
+" --justdb - Nur die rpm-Datenbank aktualisieren, nicht das "
+"Dateisystem.\n"
#: ../urpme:56
#, c-format
@@ -1728,12 +1719,11 @@ msgid ""
" --use-distrib - configure urpme on the fly from a distrib tree, useful\n"
" to (un)install a chroot with --root option.\n"
msgstr ""
-" --use-distrib - urpme direkt von einem distrib-Baum konfigurieren, nützlich\n"
+" --use-distrib - urpme direkt von einem distrib-Baum konfigurieren, "
+"nützlich\n"
" um eine chroot mit --root-Option zu (de)installieren.\n"
-#: ../urpme:59
-#: ../urpmi:153
-#: ../urpmq:91
+#: ../urpme:59 ../urpmi:153 ../urpmq:91
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - ausführlicher Modus.\n"
@@ -1778,9 +1768,11 @@ msgstr "Keine Waisen zu entfernen"
#: ../urpme:151
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
msgstr[0] "Um die Abhängigkeiten zu erfüllen, wird das folgende Paket entfernt"
-msgstr[1] "Um die Abhängigkeiten zu erfüllen, werden die folgenden %d Pakete entfernt"
+msgstr[1] ""
+"Um die Abhängigkeiten zu erfüllen, werden die folgenden %d Pakete entfernt"
#: ../urpme:156
#, c-format
@@ -1816,13 +1808,15 @@ msgstr "Entfernen ist möglich"
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage: urpmf [options] pattern-expression\n"
msgstr ""
"Urpmf-Version %s\n"
"Copyright (c) 2002-2010 Mandriva\n"
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter verbreitet werden.\n"
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter "
+"verbreitet werden.\n"
"\n"
"Benutzung: urpmf [Optionen] Musterausdruck\n"
@@ -1831,42 +1825,41 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - Ausgabe der Versionsnummer dieses Werkzeuges.\n"
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:82
+#: ../urpmf:37 ../urpmi:132 ../urpmq:82
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - Eine besondere Umgebung verwenden (Etwa zur\n"
" Erstellung von Fehlerberichten).\n"
-#: ../urpmf:38
-#: ../urpmi:73
-#: ../urpmq:49
+#: ../urpmf:38 ../urpmi:73 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia - Keine durch Kommata getrennte Medienliste benutzen.\n"
+msgstr ""
+" --excludemedia - Keine durch Kommata getrennte Medienliste benutzen.\n"
#: ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l - Keine Muster vergleichen, sondern wortwörtlich benutzen.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l - Keine Muster vergleichen, sondern wortwörtlich benutzen.\n"
-#: ../urpmf:42
-#: ../urpmi:76
-#: ../urpmq:50
+#: ../urpmf:42 ../urpmi:76 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - Medien gemäß der Substrings getrennt durch Kommata sortieren.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia - Medien gemäß der Substrings getrennt durch Kommata "
+"sortieren.\n"
#: ../urpmf:43
#, c-format
msgid " --use-distrib - use the given path to access media\n"
-msgstr " --use-distrib - Angegebenen Pfad zum Zugriff auf das Medium verwenden\n"
+msgstr ""
+" --use-distrib - Angegebenen Pfad zum Zugriff auf das Medium verwenden\n"
-#: ../urpmf:44
-#: ../urpmi:77
-#: ../urpmq:51
+#: ../urpmf:44 ../urpmi:77 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1878,9 +1871,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - Keine identischen Zeilen ausgeben.\n"
-#: ../urpmf:46
-#: ../urpmi:74
-#: ../urpmq:46
+#: ../urpmf:46 ../urpmi:74 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - Nur Aktualisierungs-Medien verwenden.\n"
@@ -1915,7 +1906,9 @@ msgstr "Musterausdrücke:\n"
#: ../urpmf:52
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr " text - jeder Text wird als regulärer Ausdruck geparst, bis -l benutzt wird.\n"
+msgstr ""
+" text - jeder Text wird als regulärer Ausdruck geparst, bis -l "
+"benutzt wird.\n"
#: ../urpmf:53
#, c-format
@@ -2077,11 +2070,12 @@ msgstr " --vendor - Hersteller\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - das Medium, in welchem das Paket gefunden wurde\n"
-#: ../urpmf:85
-#: ../urpmq:101
+#: ../urpmf:85 ../urpmq:101
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - Ausgabe von Version, Release und Architektur mit dem Namen.\n"
+msgstr ""
+" -f - Ausgabe von Version, Release und Architektur mit dem "
+"Namen.\n"
#: ../urpmf:153
#, c-format
@@ -2091,7 +2085,9 @@ msgstr "Nicht erkannter Ausdruck (%s)"
#: ../urpmf:198
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Fehlerhaftes Format: Sie können nur eine Markierung mit mehrfachen Werten anhängen"
+msgstr ""
+"Fehlerhaftes Format: Sie können nur eine Markierung mit mehrfachen Werten "
+"anhängen"
#: ../urpmf:291
#, c-format
@@ -2111,7 +2107,9 @@ msgstr "keine xml-Info für das Medium »%s« verfügbar"
#: ../urpmi:80
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
-msgstr " --auto-update - Automatische Paketauswahl zur Aktualisierung des Systems.\n"
+msgstr ""
+" --auto-update - Automatische Paketauswahl zur Aktualisierung des "
+"Systems.\n"
#: ../urpmi:81
#, c-format
@@ -2128,24 +2126,26 @@ msgstr " --force-key - Aktualisierung auf gpg-Schlüssel erzwingen.\n"
msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - Verwaiste Pakete ohne Nachfrage deinstallieren\n"
-#: ../urpmi:84
-#: ../urpmq:56
+#: ../urpmi:84 ../urpmq:56
#, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
msgstr " --no-suggests - »Vorgeschlagene« Pakete nicht auswählen.\n"
#: ../urpmi:85
#, c-format
-msgid " --no-uninstall - never ask to uninstall a package, abort the installation.\n"
-msgstr " --no-uninstall - Niemals fragen bei Paketdeinstallation, Installation abbrechen.\n"
+msgid ""
+" --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+" --no-uninstall - Niemals fragen bei Paketdeinstallation, Installation "
+"abbrechen.\n"
#: ../urpmi:86
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - Keine Pakete installieren (nur herunterladen).\n"
-#: ../urpmi:87
-#: ../urpmq:58
+#: ../urpmi:87 ../urpmq:58
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -2161,7 +2161,8 @@ msgid ""
" are going to be installed or upgraded,\n"
" default is %d.\n"
msgstr ""
-" --split-level - Aufteilen in kleine Vorgänge, wenn mehr als die gegebenen\n"
+" --split-level - Aufteilen in kleine Vorgänge, wenn mehr als die "
+"gegebenen\n"
" Pakete installiert oder aktualisiert werden,\n"
" Voreinstellung ist %d.\n"
@@ -2197,8 +2198,10 @@ msgstr " --noclean - Unbenutzte RPMs im Zwischenspeicher belassen.\n"
#: ../urpmi:101
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - Die Installation bereits installierter Pakete erzwingen.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - Die Installation bereits installierter Pakete erzwingen.\n"
#: ../urpmi:103
#, c-format
@@ -2221,7 +2224,8 @@ msgstr ""
#: ../urpmi:107
#, c-format
msgid " --allow-suggests - auto select \"suggested\" packages.\n"
-msgstr " --allow-suggests - Die »vorgeschlagenen« Pakete automatisch auswählen.\n"
+msgstr ""
+" --allow-suggests - Die »vorgeschlagenen« Pakete automatisch auswählen.\n"
#: ../urpmi:111
#, c-format
@@ -2232,17 +2236,19 @@ msgstr ""
" --use-distrib - urpmi von einem distrib Baum konfigurieren, nützlich\n"
" zum Installieren eines chroot mit --root-Option.\n"
-#: ../urpmi:113
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:37
+#: ../urpmi:113 ../urpmi.addmedia:60 ../urpmi.update:37
#, c-format
msgid " --metalink - generate and use a local metalink.\n"
msgstr " --metalink - Einen lokalen Metalink erstellen und benutzen.\n"
#: ../urpmi:114
#, c-format
-msgid " --download-all - download all needed packages before trying to install them\n"
-msgstr " --download-all - alle benötigten Pakete herunterladen, bevor mit der Installation begonnen wird\n"
+msgid ""
+" --download-all - download all needed packages before trying to install "
+"them\n"
+msgstr ""
+" --download-all - alle benötigten Pakete herunterladen, bevor mit der "
+"Installation begonnen wird\n"
#: ../urpmi:115
#, c-format
@@ -2256,31 +2262,35 @@ msgstr ""
#: ../urpmi:118
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
-msgstr " --curl-options - Zusätzliche Optionen, die an curl übergeben werden\n"
+msgstr ""
+" --curl-options - Zusätzliche Optionen, die an curl übergeben werden\n"
#: ../urpmi:119
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
-msgstr " --rsync-options- Zusätzliche Optionen, die an rsync übergeben werden\n"
+msgstr ""
+" --rsync-options- Zusätzliche Optionen, die an rsync übergeben werden\n"
#: ../urpmi:120
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
-msgstr " --wget-options - Zusätzliche Optionen, die an wget übergeben werden\n"
+msgstr ""
+" --wget-options - Zusätzliche Optionen, die an wget übergeben werden\n"
#: ../urpmi:121
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
-msgstr " --prozilla-options - Zusätzliche Optionen, die an prozilla übergeben werden\n"
+msgstr ""
+" --prozilla-options - Zusätzliche Optionen, die an prozilla übergeben "
+"werden\n"
#: ../urpmi:122
#, c-format
msgid " --aria2-options - additional options to pass to aria2\n"
-msgstr " --aria2-options - Zusätzliche Optionen, die an aria2 übergeben werden\n"
+msgstr ""
+" --aria2-options - Zusätzliche Optionen, die an aria2 übergeben werden\n"
-#: ../urpmi:123
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:61 ../urpmi.update:38
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - Die Dowloadgeschwindigkeit begrenzen.\n"
@@ -2292,12 +2302,10 @@ msgid ""
" (--no-resume disables it, default is disabled).\n"
msgstr ""
" --resume - Übertragung einer teilweise heruntergeladenen Datei\n"
-" fortsetzen (--no-resume deaktiviert es, Vorgabe ist deaktiviert).\n"
+" fortsetzen (--no-resume deaktiviert es, Vorgabe ist "
+"deaktiviert).\n"
-#: ../urpmi:126
-#: ../urpmi.addmedia:62
-#: ../urpmi.update:39
-#: ../urpmq:78
+#: ../urpmi:126 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -2306,10 +2314,7 @@ msgstr ""
" --proxy - Einen HTTP-Proxy verwenden, als Standard-Portnummer\n"
" wird 1080 angenommen (Format: <ProxyRechner[:port]>).\n"
-#: ../urpmi:128
-#: ../urpmi.addmedia:64
-#: ../urpmi.update:41
-#: ../urpmq:80
+#: ../urpmi:128 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:80
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -2341,12 +2346,15 @@ msgstr " --excludedocs - Dokumentationsdateien ausschließen.\n"
#: ../urpmi:138
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - Nicht vor Installation den Festplattenplatz prüfen.\n"
+msgstr ""
+" --ignoresize - Nicht vor Installation den Festplattenplatz prüfen.\n"
#: ../urpmi:139
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch - Ermöglicht das Installieren von RPMs für andere Achitekturen\n"
+msgstr ""
+" --ignorearch - Ermöglicht das Installieren von RPMs für andere "
+"Achitekturen\n"
#: ../urpmi:140
#, c-format
@@ -2361,7 +2369,8 @@ msgstr " --replacefiles - Dateikonflikte ignorieren\n"
#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
-msgstr " --skip - Pakete, deren Installation übersprungen werden soll\n"
+msgstr ""
+" --skip - Pakete, deren Installation übersprungen werden soll\n"
#: ../urpmi:144
#, c-format
@@ -2374,7 +2383,8 @@ msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-" --more-choices - Falls mehrere Pakete gefunden wurden, mehrere Möglichkeiten\n"
+" --more-choices - Falls mehrere Pakete gefunden wurden, mehrere "
+"Möglichkeiten\n"
" als die Vorgabe vorschlagen.\n"
#: ../urpmi:147
@@ -2387,8 +2397,7 @@ msgstr " --nolock - Die RPM-Datenbank nicht sperren.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - Nur Pakete der selben Architektur aktualisieren.\n"
-#: ../urpmi:149
-#: ../urpmq:99
+#: ../urpmi:149 ../urpmq:99
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - Alle Treffer in der Befehlszeile auswählen.\n"
@@ -2411,7 +2420,9 @@ msgstr " Namen oder RPM-Dateien von der Befehlszeile werden installiert.\n"
#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Fehler: Es ist nicht möglich, --auto-select weiter mit der Paketliste zu verwenden.\n"
+msgstr ""
+"Fehler: Es ist nicht möglich, --auto-select weiter mit der Paketliste zu "
+"verwenden.\n"
#: ../urpmi:190
#, c-format
@@ -2425,7 +2436,9 @@ msgstr ""
#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
-msgstr "Sie können keine binären RPM-Dateien installieren, wenn --install-src genutzt wird"
+msgstr ""
+"Sie können keine binären RPM-Dateien installieren, wenn --install-src "
+"genutzt wird"
#: ../urpmi:221
#, c-format
@@ -2439,13 +2452,20 @@ msgstr "Vorgabe --buildrequires"
#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "Bitte benutzen Sie --buildrequires oder --install-src, Vorgabe ist --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"Bitte benutzen Sie --buildrequires oder --install-src, Vorgabe ist --"
+"buildrequires"
#: ../urpmi:253
#, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Ordner [%s] existiert bereits, bitte benutzen Sie einen anderen Ordner für Fehlerberichte oder löschen Sie diesen"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Ordner [%s] existiert bereits, bitte benutzen Sie einen anderen Ordner für "
+"Fehlerberichte oder löschen Sie diesen"
#: ../urpmi:254
#, c-format
@@ -2487,8 +2507,12 @@ msgstr "%s (zu installieren)"
#: ../urpmi:443
#, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
-msgstr "Um die Abhängigkeit von »%s« zu erfüllen, wird eines der folgenden Pakete benötigt:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
+msgstr ""
+"Um die Abhängigkeit von »%s« zu erfüllen, wird eines der folgenden Pakete "
+"benötigt:"
#: ../urpmi:446
#, c-format
@@ -2517,8 +2541,7 @@ msgstr ""
"abhängen, die älter sind als die installierten Pakete:\n"
"%s"
-#: ../urpmi:496
-#: ../urpmi:514
+#: ../urpmi:496 ../urpmi:514
#, c-format
msgid ""
"\n"
@@ -2527,10 +2550,7 @@ msgstr ""
"\n"
"Wollen Sie trotzdem fortfahren?"
-#: ../urpmi:497
-#: ../urpmi:515
-#: ../urpmi:630
-#: ../urpmi.addmedia:136
+#: ../urpmi:497 ../urpmi:515 ../urpmi:630 ../urpmi.addmedia:136
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
@@ -2581,10 +2601,12 @@ msgstr "(nur ein Test, das Entfernen wird nicht wirklich durchgeführt)"
#: ../urpmi:566
#, c-format
msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
"%s\n"
msgstr ""
-"Sie müssen urpmi zuerst mit der Option »--buildrequires« aufrufen, um die folgenden Abhängigkeiten zu installieren:\n"
+"Sie müssen urpmi zuerst mit der Option »--buildrequires« aufrufen, um die "
+"folgenden Abhängigkeiten zu installieren:\n"
"%s\n"
#: ../urpmi:576
@@ -2597,7 +2619,9 @@ msgstr[1] "Die folgenden verwaisten Pakete werden entfernt"
#: ../urpmi:600
#, c-format
msgid "WARNING: %s option is in use. Some strange problems may happen"
-msgstr "Achtung: Die %s-Option wird genutzt. Es können einige seltsame Probleme auftreten"
+msgstr ""
+"Achtung: Die %s-Option wird genutzt. Es können einige seltsame Probleme "
+"auftreten"
#: ../urpmi:612
#, c-format
@@ -2626,12 +2650,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortfahren mit der Installation von einem Paket?"
msgstr[1] "Fortfahren mit der Installation der %d Pakete?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Abbruch"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Betätigen Sie die Eingabetaste, wenn das Gerät eingebunden ist …"
@@ -2670,7 +2689,8 @@ msgstr ""
" cdrom://<Pfad>\n"
"\n"
"Benutzung: urpmi.addmedia [Optionen] --distrib --mirrorlist <Url>\n"
-"Benutzung: urpmi.addmedia [Optionen] --mirrorlist <Url> <Name> <Relativer Pfad>\n"
+"Benutzung: urpmi.addmedia [Optionen] --mirrorlist <Url> <Name> <Relativer "
+"Pfad>\n"
"\n"
"Beispiele:\n"
"\n"
@@ -2681,29 +2701,22 @@ msgstr ""
"\n"
"die Optionen wählen Sie aus\n"
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:33
-#: ../urpmq:75
+#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:75
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - wget zum Holen entfernter Dateien verwenden.\n"
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:34
-#: ../urpmq:76
+#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:76
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - curl zum Holen entfernter Dateien verwenden.\n"
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:35
-#: ../urpmq:77
+#: ../urpmi.addmedia:58 ../urpmi.update:35 ../urpmq:77
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - prozilla zum Holen entfernter Dateien verwenden.\n"
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:59 ../urpmi.update:36
#, c-format
msgid " --aria2 - use aria2 to retrieve distant files.\n"
msgstr " --aria2 - aria2 zum Holen entfernter Dateien verwenden.\n"
@@ -2722,10 +2735,13 @@ msgstr ""
#, c-format
msgid ""
" --xml-info - use the specific policy for downloading xml info files\n"
-" one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
msgstr ""
-" --xml-info - Angebene Regel zum Herunterladen von xml-Info-Dateien verwenden,\n"
-" eine von: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" --xml-info - Angebene Regel zum Herunterladen von xml-Info-Dateien "
+"verwenden,\n"
+" eine von: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
#: ../urpmi.addmedia:70
#, c-format
@@ -2735,7 +2751,8 @@ msgstr " --probe-synthesis - Versuchen, die Synthese-Datei zu benutzen.\n"
#: ../urpmi.addmedia:71
#, c-format
msgid " --probe-rpms - use rpm files (instead of synthesis).\n"
-msgstr " --probe-rpms - RPM-Dateien verwenden (anstelle von synthesis/hdlist).\n"
+msgstr ""
+" --probe-rpms - RPM-Dateien verwenden (anstelle von synthesis/hdlist).\n"
#: ../urpmi.addmedia:72
#, c-format
@@ -2754,12 +2771,15 @@ msgstr ""
#: ../urpmi.addmedia:76
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - (mit --distrib) bei jedem Medium nach einer Bestätigung fragen\n"
+msgstr ""
+" --interactive - (mit --distrib) bei jedem Medium nach einer Bestätigung "
+"fragen\n"
#: ../urpmi.addmedia:77
#, c-format
msgid " --all-media - with --distrib, add every listed media\n"
-msgstr " --all-media - (mit --distrib) jedes aufgeführte Medium hinzufügen.\n"
+msgstr ""
+" --all-media - (mit --distrib) jedes aufgeführte Medium hinzufügen.\n"
#: ../urpmi.addmedia:78
#, c-format
@@ -2768,8 +2788,7 @@ msgstr ""
" --virtual - Stets aktuelle virtuelle Medien erstellen,\n"
" nur das file://-Protokoll ist erlaubt.\n"
-#: ../urpmi.addmedia:79
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:79 ../urpmi.update:44
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - MD5SUM-Dateiüberprüfung deaktivieren.\n"
@@ -2777,23 +2796,23 @@ msgstr " --no-md5sum - MD5SUM-Dateiüberprüfung deaktivieren.\n"
#: ../urpmi.addmedia:80
#, c-format
msgid " --nopubkey - don't import pubkey of added media\n"
-msgstr " --nopubkey - Den öffentlichen Schlüssel vom hinzugefügten Medium nicht importieren.\n"
+msgstr ""
+" --nopubkey - Den öffentlichen Schlüssel vom hinzugefügten Medium nicht "
+"importieren.\n"
#: ../urpmi.addmedia:81
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - Medien zur Konfiguration hinzufügen, ohne sie zu aktualisieren.\n"
+msgstr ""
+" --raw - Medien zur Konfiguration hinzufügen, ohne sie zu "
+"aktualisieren.\n"
-#: ../urpmi.addmedia:82
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - stiller Modus.\n"
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - ausführlicher Modus.\n"
@@ -2811,7 +2830,8 @@ msgstr "für --distrib --mirrorlist <url> wird kein Argument benötigt"
#: ../urpmi.addmedia:112
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "Fehler in der <url> (für den lokalen Ordner, der Pfad muss absolut sein)"
+msgstr ""
+"Fehler in der <url> (für den lokalen Ordner, der Pfad muss absolut sein)"
#: ../urpmi.addmedia:116
#, c-format
@@ -2831,7 +2851,8 @@ msgstr "Konfigurationsdatei [%s] kann nicht erzeugt werden"
#: ../urpmi.addmedia:128
#, c-format
msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "Nicht erforderlich, <relativer Pfad zur HD-Liste> anzugeben mit --distrib"
+msgstr ""
+"Nicht erforderlich, <relativer Pfad zur HD-Liste> anzugeben mit --distrib"
#: ../urpmi.addmedia:136
#, c-format
@@ -2842,8 +2863,7 @@ msgstr ""
"\n"
"Wollen Sie das Medium »%s« wirklich hinzufügen?"
-#: ../urpmi.addmedia:155
-#: ../urpmi.addmedia:179
+#: ../urpmi.addmedia:155 ../urpmi.addmedia:179
#, c-format
msgid "unable to add medium"
msgstr "Es ist nicht möglich, das Medium hinzuzufügen"
@@ -2863,13 +2883,15 @@ msgstr "Es ist nicht möglich, %s mit einem entfernten Medium zu verwenden"
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urpmi.recover version %s\n"
"Copyright (c) 2006-2010 Mandriva.\n"
-"Dies ist freie Software und darf unter den Bedingungen der GNU GPL weiter verbreitet werden.\n"
+"Dies ist freie Software und darf unter den Bedingungen der GNU GPL weiter "
+"verbreitet werden.\n"
"\n"
"Benutzung:\n"
@@ -2881,12 +2903,16 @@ msgstr " --checkpoint - setzen Umpacken startet jetzt\n"
#: ../urpmi.recover:35
#, c-format
msgid " --noclean - don't clean repackage directory on checkpoint\n"
-msgstr " --noclean - Kann Verzeichnis nicht sauber am Kontrollpunkt verpacken.\n"
+msgstr ""
+" --noclean - Kann Verzeichnis nicht sauber am Kontrollpunkt "
+"verpacken.\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
-msgstr " --list - auflisten der Transaktionen während Zeitraum/Zeitdauer\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
+msgstr ""
+" --list - auflisten der Transaktionen während Zeitraum/Zeitdauer\n"
#: ../urpmi.recover:38
#, c-format
@@ -2905,7 +2931,8 @@ msgid ""
" or rollback the specified number of transactions\n"
msgstr ""
" --rollback - Rückstzen bis zum angegebenen Datum,\n"
-" oder Rücksetzen der angegebenen Anzahl von Transaktionen\n"
+" oder Rücksetzen der angegebenen Anzahl von "
+"Transaktionen\n"
#: ../urpmi.recover:42
#, c-format
@@ -2925,7 +2952,8 @@ msgstr "Verzeichnis zum Verpacken nicht definiert\n"
#: ../urpmi.recover:68
#, c-format
msgid "Can't write to repackage directory [%s]\n"
-msgstr "Kann nicht in das zum Verpacken angegebene Verzeichnis schreiben [%s]\n"
+msgstr ""
+"Kann nicht in das zum Verpacken angegebene Verzeichnis schreiben [%s]\n"
#: ../urpmi.recover:70
#, c-format
@@ -2974,8 +3002,7 @@ msgstr "Keine Transaktion während %s gefunden\n"
msgid "You must be superuser to do this"
msgstr "Um dies zu tun müssen Sie Superuser sein"
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
#, c-format
msgid "Writing rpm macros file [%s]...\n"
msgstr "rpm Makrodatei geschrieben [%s]\n"
@@ -3057,17 +3084,21 @@ msgstr " --force-key - Aktualisierung auf gpg-Schlüssel erzwingen.\n"
#: ../urpmi.update:46
#, c-format
msgid " --ignore - don't update, mark the media as ignored.\n"
-msgstr " --ignore - Nicht aktualisieren, die Medien als ignoriert markieren.\n"
+msgstr ""
+" --ignore - Nicht aktualisieren, die Medien als ignoriert markieren.\n"
#: ../urpmi.update:47
#, c-format
msgid " --no-ignore - don't update, mark the media as enabled.\n"
-msgstr " --no-ignore - Nicht aktualisieren, die Medien als aktiv markieren.\n"
+msgstr ""
+" --no-ignore - Nicht aktualisieren, die Medien als aktiv markieren.\n"
#: ../urpmi.update:49
#, c-format
msgid " --probe-rpms - do not use synthesis, use rpm files directly\n"
-msgstr " --probe-rpms - Keine synthesis/hlist, sondern rpm-Dateien direkt verwenden\n"
+msgstr ""
+" --probe-rpms - Keine synthesis/hlist, sondern rpm-Dateien direkt "
+"verwenden\n"
#: ../urpmi.update:50
#, c-format
@@ -3125,21 +3156,26 @@ msgstr "Medium %s wird aktiviert"
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urpmq version %s\n"
"Copyright (C) 2000-2010 Mandriva.\n"
-"Das ist freie Software und darf unter den Bedingungen der GNU GPL weitergegeben werden.\n"
+"Das ist freie Software und darf unter den Bedingungen der GNU GPL "
+"weitergegeben werden.\n"
"\n"
"Gebrauch:\n"
#: ../urpmq:48
#, c-format
-msgid " --searchmedia - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested (or updated) "
+"packages.\n"
msgstr ""
-" --searchmedia - Nur die angegebenen Medien verwenden, um angeforderte Paketen zu suchen\n"
+" --searchmedia - Nur die angegebenen Medien verwenden, um angeforderte "
+"Paketen zu suchen\n"
" (oder diese zu aktualisieren)\n"
#: ../urpmq:53
@@ -3154,7 +3190,8 @@ msgid ""
" - list installed packages not available on any media.\n"
msgstr ""
" --not-available\n"
-" - die installierten Pakete auflisten, die in keinem Medium verfügbar sind.\n"
+" - die installierten Pakete auflisten, die in keinem Medium "
+"verfügbar sind.\n"
#: ../urpmq:57
#, c-format
@@ -3190,8 +3227,11 @@ msgstr " --list-aliases - Alle verfügbaren Aliase auflisten.\n"
#: ../urpmq:65
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - Die Konfiguration in der Form eines urpmi.addmedia-Argumentes verwerfen.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - Die Konfiguration in der Form eines urpmi.addmedia-"
+"Argumentes verwerfen.\n"
#: ../urpmq:66
#, c-format
@@ -3206,7 +3246,8 @@ msgstr " --sources - druckt Quell URS der ausgewählten Pakete\n"
#: ../urpmq:69
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - Die Abfrage von RPMs für andere Architekturen erlauben\n"
+msgstr ""
+" --ignorearch - Die Abfrage von RPMs für andere Architekturen erlauben\n"
#: ../urpmq:73
#, c-format
@@ -3278,7 +3319,8 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr ""
" --whatrequires-recursive\n"
-" - Erweiterte umgekehrte Suche (beinhaltet virtuelle Pakete).\n"
+" - Erweiterte umgekehrte Suche (beinhaltet virtuelle "
+"Pakete).\n"
#: ../urpmq:97
#, c-format
@@ -3302,7 +3344,8 @@ msgstr " -g - Ausgabe der Gruppe mit dem Namen.\n"
#: ../urpmq:103
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - Nützlichen Informationen in lesbarer Form ausgeben.\n"
+msgstr ""
+" -i - Nützlichen Informationen in lesbarer Form ausgeben.\n"
#: ../urpmq:104
#, c-format
@@ -3326,23 +3369,32 @@ msgstr " -s - Es folgt ein Quellpaket (identisch zu »--src«).\n"
#: ../urpmq:108
#, c-format
-msgid " -u - remove package if a more recent version is already installed.\n"
-msgstr " -u - Paket entfernen, wenn bereits eine aktuellere Version installiert ist.\n"
+msgid ""
+" -u - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+" -u - Paket entfernen, wenn bereits eine aktuellere Version "
+"installiert ist.\n"
#: ../urpmq:109
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
-msgstr " -y - Unscharfe Suche erzwingen (identisch zu »--fuzzy«).\n"
+msgstr ""
+" -y - Unscharfe Suche erzwingen (identisch zu »--fuzzy«).\n"
#: ../urpmq:110
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y - wie -y, aber erzwingt eine großschreibungsunabhängige Schreibweise.\n"
+msgstr ""
+" -Y - wie -y, aber erzwingt eine großschreibungsunabhängige "
+"Schreibweise.\n"
#: ../urpmq:111
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " Namen oder RPM-Dateien, die auf der Befehlszeile angegeben wurden, werden abgefragt.\n"
+msgstr ""
+" Namen oder RPM-Dateien, die auf der Befehlszeile angegeben wurden, werden "
+"abgefragt.\n"
#: ../urpmq:158
#, c-format
@@ -3359,27 +3411,35 @@ msgstr "--list-nodes kann nur mit --parallel benutzt werden"
msgid "use -l to list files"
msgstr "»-l« benutzen, um die Dateien zu aufzulisten"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "Keine xml-Info für das Medium »%s«, nur Teilergebnisse für das Paket %s"
+msgstr ""
+"Keine xml-Info für das Medium »%s«, nur Teilergebnisse für das Paket %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "Keine xml-Info für das Medium »%s«, nur Teilergebnisse für die Pakete %s"
+msgstr ""
+"Keine xml-Info für das Medium »%s«, nur Teilergebnisse für die Pakete %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "Keine xml-Info für das Medium »%s«. Es ist nicht möglich, ein Ergebnis für das Paket %s zu liefern"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"Keine xml-Info für das Medium »%s«. Es ist nicht möglich, ein Ergebnis für "
+"das Paket %s zu liefern"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "Keine xml-Info für das Medium »%s«. Es ist nicht möglich, Ergebnisse für die Pakete %s zu liefern"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Keine xml-Info für das Medium »%s«. Es ist nicht möglich, Ergebnisse für die "
+"Pakete %s zu liefern"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Kein Changelog gefunden\n"
@@ -3393,6 +3453,18 @@ msgid "Graphical front end to install RPM files"
msgstr "Grafisches Frontend zum Installieren vom RPM Dateien"
#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Installation fehlgeschlagen, einige Dateien fehlen:\n"
+#~ "%s\n"
+#~ "Sie sollten Ihre urpmi-Datenbank aktualisieren"
+
+#~ msgid "Cancel"
+#~ msgstr "Abbruch"
+
+#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
#~ "# Line format is : <date time of generation> <uid>\n"
#~ "# You can use uids to see the content of your uploads at this url :\n"
diff --git a/po/el.po b/po/el.po
index a41aaec6..644816de 100644
--- a/po/el.po
+++ b/po/el.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-el\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: 2012-05-16 19:31+0200\n"
"Last-Translator: Dimitrios Glentadakis <dglent@gmail.com>\n"
"Language-Team: Greek <i18n-el@ml.mageia.org>\n"
@@ -282,7 +282,7 @@ msgstr ""
msgid "Warning"
msgstr "Προσοχή"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Εντάξει"
@@ -344,7 +344,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d πακέτο, %d MB)"
msgstr[1] "(%d πακέτα, %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 "αδυναμία λήψης των πακέτων πηγαίου κώδικα, ματαίωση"
@@ -381,38 +381,41 @@ msgstr "... η ανάκτηση απέτυχε: %s"
msgid "_Done"
msgstr "_Ολοκληρώθηκε"
-#: ../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 ""
-"Η εγκατάσταση απέτυχε, ορισμένα αρχεία λείπουν:\n"
-"%s\n"
-"Θα πρέπει να ενημερώσετε τη βάση δεδομένων urpmi"
+"Η εγκατάσταση απέτυχε, λείπουν μερικά αρχεία : \n"
+" %s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Θα πρέπει να ενημερώσετε τη βάση δεδομένων 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 "Η εγκατάσταση απέτυχε:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Η εγκατάσταση τελείωσε"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "αφαίρεση του %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "Επανεκκίνηση urpmi"
@@ -544,59 +547,59 @@ msgstr ""
"Αυτή η λειτουργία απαγορεύεται να εκτελεστεί, όταν ισχύει κατάσταση "
"περιορισμένης λειτουργίας"
-#: ../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 "μη ορθή διακήρυξη proxy στην γραμμή εντολών\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: αδυναμία ανάγνωσης αρχείου rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "απρόσμενη έκφραση %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "απουσία έκφρασης πριν το %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "απρόσμενη έκφραση %s (πρόταση: να χρησιμοποιήσεις -a ή -o ; )"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "δεν υπάρχει έκφραση για να τερματιστεί"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"από προεπιλογή η urpmf αναμένει μια regexp. Θα πρέπει να χρησιμοποιήσετε την "
"επιλογή \"--literal\""
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "ο κατάλογος chroot δεν υπάρχει"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Αδύνατη η χρήση του %s χωρίς το %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 "Αδύνατη η χρήση του %s με το %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Πάρα πολλά ορίσματα\n"
@@ -645,7 +648,7 @@ msgstr "αδυναμία ανάγνωσης του αρχείου ρυθμίσε
msgid "medium `%s' is defined twice, aborting"
msgstr "το μέσο `%s' προσδιορίστηκε δύο φορές, γίνεται εγκατάλειψη"
-#: ../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 "αδυναμία εγγραφής του αρχείου ρυθμίσεων [%s]"
@@ -762,22 +765,22 @@ msgstr " ολοκληρώθηκε το %s%%, ταχύτητα = %s"
msgid "retrieving %s"
msgstr "ανάκτηση %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "ανακτήθηκε %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "καθορίστηκε άγνωστο πρωτόκολλο για το %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "δεν βρέθηκε το webfetch, υποστηριζόμενα webfetch είναι: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "αδυναμία χειρισμού πρωτοκόλλου: %s"
@@ -902,26 +905,17 @@ msgstr "Η βάση δεδομένων %s είναι κλειδωμένη. Αν
msgid "aborting"
msgstr "εγκατάλειψη"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Νέα προσπάθεια ;"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Η εγκατάσταση απέτυχε, λείπουν μερικά αρχεία : \n"
-" %s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Θα πρέπει να ενημερώσετε τη βάση δεδομένων urpmi."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -930,7 +924,7 @@ msgstr ""
"Η εγκατάσταση απέτυχε. Εσφαλμένα rpm:\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 "
@@ -941,68 +935,68 @@ msgstr ""
"όλων των πακέτων (%s χρειάζονται, %s διαθέσιμα).\n"
"Είστε σίγουροι ότι θέλετε να συνεχίσετε;"
-#: ../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 "Η εγκατάσταση απέτυχε"
-
-#: ../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 "Το παρακάτω πακέτο έχει λανθασμένη υπογραφή"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Τα παρακάτω πακέτα έχουν λανθασμένες υπογραφές"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Θέλετε να συνεχίσετε την εγκατάσταση ;"
-#: ../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 "Η εγκατάσταση απέτυχε"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "αφαίρεση των εγκατεστημένων rpm (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "κατανομή %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 "εγκατάσταση %s από %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "εγκατάσταση %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "κατανομή %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Προσπάθεια για εγκατάσταση χωρίς έλεγχο των εξαρτήσεων ;"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Προσπάθεια για εξαναγκαστική εγκατάσταση (--force); "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Τα πακέτα είναι ενημερωμένα"
-#: ../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 "Η εγκατάσταση είναι δυνατή"
@@ -1558,37 +1552,37 @@ msgstr ""
"τα πακέτα %s βρέθηκαν στην βάση δεδομένων του urpmi, αλλά κανένα τους δεν "
"είναι εγκατεστημένο"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Το πακέτο %s είναι ήδη εγκατεστημένο"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Τα πακέτα %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 "λόγω συγκρούσεων με το %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 "λόγω μη ικανοποίησης του %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "προσπάθεια ενίσχυσης του %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "για να κρατηθεί το %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"
@@ -1597,7 +1591,7 @@ msgstr ""
"Το παρακάτω πακέτο πρέπει να αφαιρεθεί για να αναβαθμιστούν κάποια άλλα:\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"
@@ -1606,12 +1600,12 @@ msgstr ""
"Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "για να εγκατασταθεί το %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "λόγω έλλειψης του %s"
@@ -2655,8 +2649,8 @@ msgstr[1] "Θα αφαιρεθούν τα παρακάτω ορφανά πακέ
#, c-format
msgid "WARNING: %s option is in use. Some strange problems may happen"
msgstr ""
-"ΠΡΟΣΟΧΗ: Η επιλογή %s είναι σε χρήση. Μπορεί να παρουσιαστούν μερικά παράξενα "
-"προβλήματα."
+"ΠΡΟΣΟΧΗ: Η επιλογή %s είναι σε χρήση. Μπορεί να παρουσιαστούν μερικά "
+"παράξενα προβλήματα."
#: ../urpmi:612
#, c-format
@@ -2685,12 +2679,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Συνέχιση με την εγκατάσταση ενός πακέτου;"
msgstr[1] "Συνέχιση με την εγκατάσταση των %d πακέτων;"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Ακύρωση"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Πατήστε Enter όταν προσαρτηθεί..."
@@ -3477,21 +3466,21 @@ msgstr "--list-nodes μπορούν να χρησιμοποιηθούν μόνο
msgid "use -l to list files"
msgstr "χρησιμοποίησε το -l για να δεις μια λίστα με τα αρχεία"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", μονάχα περιορισμένα "
"αποτελέσματα για το πακέτο %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", μονάχα περιορισμένα "
"αποτελέσματα για τα πακέτα %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3499,7 +3488,7 @@ msgstr ""
"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", αδύνατη η λήψη "
"αποτελεσμάτων για το πακέτο %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3507,7 +3496,7 @@ msgstr ""
"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", αδύνατη η επιστροφή "
"αποτελεσμάτων για τα πακέτα %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
@@ -3521,6 +3510,18 @@ msgid "Graphical front end to install RPM files"
msgstr "Ένα γραφική πρόσοψη για την εγκατάσταση αρχείων RPM"
#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Η εγκατάσταση απέτυχε, ορισμένα αρχεία λείπουν:\n"
+#~ "%s\n"
+#~ "Θα πρέπει να ενημερώσετε τη βάση δεδομένων urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Ακύρωση"
+
+#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
#~ "# Line format is : <date time of generation> <uid>\n"
#~ "# You can use uids to see the content of your uploads at this url :\n"
diff --git a/po/eo.po b/po/eo.po
index 691267bb..97967bc4 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-eo\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: 2005-01-13 10:05+0100\n"
"Last-Translator: Grégoire COLBERT <gcolbert2004@noos.fr>\n"
"Language-Team: Esperanto <mandrak-eo@yahoogroups.com>\n"
@@ -261,7 +261,7 @@ msgstr ""
msgid "Warning"
msgstr "Averto"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Jes"
@@ -325,7 +325,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakaĵo, %d MB)"
msgstr[1] "(%d pakaĵoj, %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 "Ne povas preni fontajn pakaĵojn, mi ĉesiĝas."
@@ -362,38 +362,42 @@ msgstr "...ekstraktado malsukcesis: %s"
msgid "_Done"
msgstr "_Finata"
-#: ../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 "Instalado malsukcesis:"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Instalado malsukcesis, kelkaj dosieroj mankas:\n"
"%s\n"
"Eble vi ĝisdatigu vian urpmi-datenbazon"
-#: ../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 "Instalado malsukcesis:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "La pakaĵo(j) estas jam instalita(j)"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalo finita"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "foriganta %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "restartas urpmi"
@@ -522,57 +526,57 @@ msgstr "eraro dum registri lokajn pakaĵojn"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "malĝusta deklaro de prokuro en la komanda linio\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Mankas signaturo (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -619,7 +623,7 @@ msgstr "ne povas skribi konfigurodosieron [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "ne povas skribi konfigurodosieron [%s]"
@@ -734,22 +738,22 @@ msgstr " %s%% farita, rapido = %s"
msgid "retrieving %s"
msgstr "foriganta %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...ekstraktado malsukcesis: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "nekonata protokolo difinita por %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "neniu ret-elŝutilo trovita, eblas uzi tiujn: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ne povas uzi la protokolon: %s"
@@ -871,19 +875,12 @@ msgstr "urpmi-datenbazo ŝlosita"
msgid "aborting"
msgstr "Averto"
-#: ../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 "Instalado malsukcesis:"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -891,14 +888,14 @@ msgstr ""
"%s\n"
"Eble vi ĝisdatigu vian urpmi-datenbazon"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalado malsukcesis:"
-#: ../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 "
@@ -906,68 +903,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 "Instalado malsukcesis"
-
-#: ../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 "La sekvanta pakaĵo havas malĝustan signaturon"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "La sekvantaj pakaĵoj havas malĝustajn signaturojn"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ĉu vi deziras daŭrigi la instaladon ?"
-#: ../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 "Instalado malsukcesis"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "instalas %s el %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "distribuanta %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 "instalas %s el %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "instalas %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "distribuanta %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Provu instaladon sen kontroli dependaĵojn? (j/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Provu instaladon eĉ pli forte (--force)? (j/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Instalado eblas"
@@ -1496,37 +1493,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "La pakaĵoj estas jam instalitaj"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "La pakaĵo %s estas jam instalita"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "La pakaĵoj %s estas jam instalitaj"
-#: ../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 "pro konflikto kun %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 "pro neplenumita %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "mi provas disponigi %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "por konservi %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"
@@ -1535,7 +1532,7 @@ msgstr ""
"La sekvanta pakaĵo estas forigota por ke aliaj estu ĝisdatigotaj:\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"
@@ -1544,12 +1541,12 @@ msgstr ""
"La sekvantaj pakaĵoj estas forigotaj por ke aliaj estu ĝisdatigotaj:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "por instali %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "pro mankanta %s"
@@ -2557,12 +2554,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Nuligu"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Premu la enigklavon kiam vi pretas..."
@@ -3259,21 +3251,21 @@ msgstr "--list-nodes uzeblas nur kun --parallel"
msgid "use -l to list files"
msgstr "ne povis skribi listdosieron de \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"Notu: ĉar neniu serĉita datenportilo uzas hdlist-dosierojn, urpmf ne povis "
"doni rezulton\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Notu: ĉar neniu serĉita datenportilo uzas hdlist-dosierojn, urpmf ne povis "
"doni rezulton\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3281,7 +3273,7 @@ msgstr ""
"Notu: ĉar neniu serĉita datenportilo uzas hdlist-dosierojn, urpmf ne povis "
"doni rezulton\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3289,7 +3281,7 @@ msgstr ""
"Notu: ĉar neniu serĉita datenportilo uzas hdlist-dosierojn, urpmf ne povis "
"doni rezulton\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Neniu \"changelog\" trovita\n"
@@ -3303,6 +3295,18 @@ msgstr "Programara Instalilo"
msgid "Graphical front end to install RPM files"
msgstr "Estis eraro dum instalado de pakaĵoj:"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Instalado malsukcesis, kelkaj dosieroj mankas:\n"
+#~ "%s\n"
+#~ "Eble vi ĝisdatigu vian urpmi-datenbazon"
+
+#~ msgid "Cancel"
+#~ msgstr "Nuligu"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "ne povas skribi dosieron [%s]"
diff --git a/po/es.po b/po/es.po
index 6a1fbbd9..8d83a412 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-es\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: 2012-03-22 20:43-0500\n"
"Last-Translator: Diego Bello <dbello@gmail.com>\n"
"Language-Team: Spanish <cooker-i18n@mandrivalinux.org >\n"
@@ -42,9 +42,7 @@ msgstr "Instalación de RPMs"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Error: no se puede encontrar el archivo %s, se cancelará la operación"
-#: ../gurpmi:47
-#: ../gurpmi2:196
-#: ../gurpmi2:221
+#: ../gurpmi:47 ../gurpmi2:196 ../gurpmi2:221
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -56,7 +54,8 @@ msgid ""
"\n"
"%s\n"
"\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
"\n"
"What would you like to do?"
msgstr ""
@@ -64,12 +63,12 @@ msgstr ""
"\n"
"%s\n"
"\n"
-"Probablemente no deseaba instalarlo en su computadora (instalarlo le permitiría realizar modificaciones al código fuente y luego recompilarlo).\n"
+"Probablemente no deseaba instalarlo en su computadora (instalarlo le "
+"permitiría realizar modificaciones al código fuente y luego recompilarlo).\n"
"\n"
"¿Qué desea hacer?"
-#: ../gurpmi:75
-#: ../gurpmi:86
+#: ../gurpmi:75 ../gurpmi:86
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -78,7 +77,8 @@ msgid ""
"\n"
"Proceed?"
msgstr ""
-"Está a punto de instalar los siguientes paquetes de software en su computadora:\n"
+"Está a punto de instalar los siguientes paquetes de software en su "
+"computadora:\n"
"\n"
"%s\n"
"\n"
@@ -93,7 +93,8 @@ msgid ""
"\n"
"You may prefer to just save it. What is your choice?"
msgstr ""
-"Está a punto de instalar el paquete de software siguiente en su computadora:\n"
+"Está a punto de instalar el paquete de software siguiente en su "
+"computadora:\n"
"\n"
"%s\n"
"\n"
@@ -109,8 +110,7 @@ msgstr "_Instalar"
msgid "_Save"
msgstr "_Guardar"
-#: ../gurpmi:101
-#: ../gurpmi2:196
+#: ../gurpmi:101 ../gurpmi2:196
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
@@ -120,19 +120,20 @@ msgstr "_Cancelar"
msgid "Choose location to save file"
msgstr "Elija ubicación para guardar archivo"
-#: ../gurpmi.pm:39
-#: ../urpmi:66
+#: ../gurpmi.pm:39 ../urpmi:66
#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urmpi versión %s\n"
"Copyright © 1999-2010 Mandriva.\n"
-"Esto es software libre y se debe redistribuir bajo los términos de la GNU GPL.\n"
+"Esto es software libre y se debe redistribuir bajo los términos de la GNU "
+"GPL.\n"
"\n"
"uso:\n"
@@ -141,88 +142,83 @@ msgstr ""
msgid "Options:"
msgstr "Opciones:"
-#: ../gurpmi.pm:46
-#: ../urpme:46
-#: ../urpmf:35
-#: ../urpmi:71
-#: ../urpmi.addmedia:55
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:71 ../urpmi.addmedia:55
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - imprime este mensaje de ayuda.\n"
-#: ../gurpmi.pm:47
-#: ../urpmi:78
+#: ../gurpmi.pm:47 ../urpmi:78
#, c-format
-msgid " --auto - non-interactive mode, assume default answers to questions.\n"
-msgstr " --auto - modo no-interactivo, asumir respuestas predet. para todas las preguntas.\n"
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions.\n"
+msgstr ""
+" --auto - modo no-interactivo, asumir respuestas predet. para todas "
+"las preguntas.\n"
-#: ../gurpmi.pm:48
-#: ../urpmi:79
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:79 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - seleccionar automáticamente paquetes para actualizar sistema.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - seleccionar automáticamente paquetes para actualizar "
+"sistema.\n"
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:102
-#: ../urpmq:68
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:102 ../urpmq:68
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - forzar invocación aunque no existan algunos paquetes.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - forzar invocación aunque no existan algunos paquetes.\n"
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
" --verify-rpm - verifica la firma del rpm antes de la instalación.\n"
-" (--no-verify-rpm lo deshabilita, habilitado por defecto.).\n"
+" (--no-verify-rpm lo deshabilita, habilitado por "
+"defecto.).\n"
-#: ../gurpmi.pm:52
-#: ../urpmf:41
-#: ../urpmi:72
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:72 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
-msgstr " --media - usar sólo los soportes dados, separados por comas.\n"
+msgstr ""
+" --media - usar sólo los soportes dados, separados por comas.\n"
-#: ../gurpmi.pm:53
-#: ../urpmi:150
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - permite buscar paquete en base a lo que provee.\n"
-#: ../gurpmi.pm:54
-#: ../urpmi:151
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -p - no buscar paquete en base a lo que provee.\n"
-#: ../gurpmi.pm:55
-#: ../urpmi:109
-#: ../urpmq:71
+#: ../gurpmi.pm:55 ../urpmi:109 ../urpmq:71
#, c-format
msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - usar otro directorio raíz para la instalación de rpm.\n"
+msgstr ""
+" --root - usar otro directorio raíz para la instalación de rpm.\n"
-#: ../gurpmi.pm:56
-#: ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:135
#, c-format
-msgid " --test - only verify if the installation can be achieved correctly.\n"
-msgstr " --test - sólo verificar si se puede instalar sin problemas.\n"
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - sólo verificar si se puede instalar sin problemas.\n"
-#: ../gurpmi.pm:57
-#: ../urpmi:75
+#: ../gurpmi.pm:57 ../urpmi:75
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - usar sólo soportes dados para la búsqueda de los paquetes pedidos.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - usar sólo soportes dados para la búsqueda de los paquetes "
+"pedidos.\n"
#: ../gurpmi.pm:100
#, c-format
@@ -254,8 +250,7 @@ msgstr "Instalación de paquetes"
msgid "Preparing packages installation..."
msgstr "Preparando instalación de paquetes..."
-#: ../gurpmi2:112
-#: ../urpmi:509
+#: ../gurpmi2:112 ../urpmi:509
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -281,7 +276,6 @@ msgid "Warning"
msgstr "Advertencia"
#: ../gurpmi2:155
-#: ../urpmi:642
#, c-format
msgid "Ok"
msgstr "Aceptar"
@@ -322,17 +316,18 @@ msgstr ""
"%s\n"
"¿Continuar de todas maneras?"
-#: ../gurpmi2:276
-#: ../urpmi:609
+#: ../gurpmi2:276 ../urpmi:609
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "Para satisfacer las dependencias, se instalará el paquete siguiente"
-#: ../gurpmi2:277
-#: ../urpmi:610
+#: ../gurpmi2:277 ../urpmi:610
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Para satisfacer las dependencias, se instalarán los paquetes siguientes:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Para satisfacer las dependencias, se instalarán los paquetes siguientes:"
#: ../gurpmi2:279
#, c-format
@@ -341,14 +336,12 @@ 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 "no se pueden obtener los paquetes fuente, abortando"
-#: ../gurpmi2:319
-#: ../urpm/install.pm:81
+#: ../gurpmi2:319 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Preparando..."
@@ -358,8 +351,7 @@ msgstr "Preparando..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalando paquete `%s' (%s/%s)..."
-#: ../gurpmi2:343
-#: ../urpmi:637
+#: ../gurpmi2:343 ../urpmi:637
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Por favor, inserte el soporte denominado «%s»"
@@ -369,12 +361,8 @@ msgstr "Por favor, inserte el soporte denominado «%s»"
msgid "Downloading package `%s'..."
msgstr "Descargando paquete `%s'..."
-#: ../gurpmi2:369
-#: ../urpm.pm:338
-#: ../urpm/download.pm:831
-#: ../urpm/get_pkgs.pm:262
-#: ../urpm/media.pm:981
-#: ../urpm/media.pm:1493
+#: ../gurpmi2:369 ../urpm.pm:338 ../urpm/download.pm:831
+#: ../urpm/get_pkgs.pm:262 ../urpm/media.pm:981 ../urpm/media.pm:1493
#: ../urpm/media.pm:1644
#, c-format
msgid "...retrieving failed: %s"
@@ -385,42 +373,41 @@ msgstr "...falló la recuperación: %s"
msgid "_Done"
msgstr "_Hecho"
-#: ../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, faltan algunos archivos:\n"
-"%s\n"
-"Puede querer actualizar su base de datos urpmi"
+"Falló la instalación, algunos archivos están ausentes:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Su base de datos de urpmi puede necesitar de actualización."
-#: ../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 está(n) instalado(s)"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Finalizó la instalación"
-#: ../gurpmi2:416
-#: ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "quitando %s"
-#: ../gurpmi2:427
-#: ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
@@ -459,8 +446,7 @@ msgstr " lo predeterminado es %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - mostrar nombre completo de rpm (NVRA)\n"
-#: ../rurpmi:11
-#: ../urpmi:269
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Sólo el superusuario está autorizado a instalar paquetes"
@@ -473,7 +459,8 @@ msgstr "Lanzando urpmi en modo restringido..."
#: ../urpm.pm:23
#, c-format
msgid "While some packages may have been installed, there were failures.\n"
-msgstr "Si bien algunos paquetes podrían haber sido instalados, hubo problemas.\n"
+msgstr ""
+"Si bien algunos paquetes podrían haber sido instalados, hubo problemas.\n"
#: ../urpm.pm:110
#, c-format
@@ -495,9 +482,7 @@ msgstr "No se pueden descargar los paquetes en %s"
msgid "Environment directory %s does not exist"
msgstr "El directorio de entorno %s no existe"
-#: ../urpm.pm:151
-#: ../urpmf:248
-#: ../urpmq:167
+#: ../urpm.pm:151 ../urpmf:248 ../urpmq:167
#, c-format
msgid "using specific environment on %s\n"
msgstr "usando un entorno específico en %s\n"
@@ -517,8 +502,7 @@ msgstr "nombre de archivo rpm no válido [%s]"
msgid "retrieving rpm file [%s] ..."
msgstr "obteniendo archivo rpm [%s] ..."
-#: ../urpm.pm:335
-#: ../urpm/get_pkgs.pm:260
+#: ../urpm.pm:335 ../urpm/get_pkgs.pm:260
#, c-format
msgid "...retrieving done"
msgstr "...recuperación hecha"
@@ -553,82 +537,83 @@ msgstr "error registrando paquetes locales"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operación está prohibida en modo restringido"
-#: ../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 incorrecta del proxy en la línea de comandos\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: no se puede leer el archivo rpm «%s»\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "expresión %s no esperada"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "falta expresíón antes de %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "expresión no esperada %s (sugerencia: usar -a o -o)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "no hay expresión a cerrar"
-#: ../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 expresión regular. Debería usar la opción \"--literal\""
+msgstr ""
+"de manera predeterminada, urpmf espera una expresión regular. Debería usar "
+"la opción \"--literal\""
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "el directorio chroot no existe"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "No se puede usar %s sin %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 "No se puede usar %s con %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
-#: ../urpm/bug_report.pm:55
-#: ../urpmi:259
+#: ../urpm/bug_report.pm:55 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Falló la copia"
#: ../urpm/cdrom.pm:67
#, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "Debe montar el CD-ROM usted mismo (o instalar perl-Hal-Cdroms para que se monte automáticamente)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"Debe montar el CD-ROM usted mismo (o instalar perl-Hal-Cdroms para que se "
+"monte automáticamente)"
#: ../urpm/cdrom.pm:69
#, c-format
msgid "Udisks daemon (udisks-daemon) is not running or not ready"
msgstr "El demonio Udisks (udisks-daemon) no está activo o no está listo"
-#: ../urpm/cdrom.pm:161
-#: ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "el soporte «%s» no está disponible"
@@ -653,8 +638,7 @@ msgstr "no se puede leer el archivo de configuración [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "el soporte «%s» está definido dos veces, abortando"
-#: ../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 "no se puede escribir el archivo de configuración [%s]"
@@ -667,7 +651,8 @@ msgstr "%s no está disponible, probando con %s"
#: ../urpm/download.pm:166
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "no se pueden leer los ajustes del proxy (sin permiso suficiente para leer %s)"
+msgstr ""
+"no se pueden leer los ajustes del proxy (sin permiso suficiente para leer %s)"
#: ../urpm/download.pm:191
#, c-format
@@ -769,22 +754,22 @@ msgstr " %s%% completo, velocidad = %s"
msgid "retrieving %s"
msgstr "descargando %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "descargados %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocolo desconocido definido para %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "no se encontró webfetch, los webfetch soportados son: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "no se puede manejar el protocolo: %s"
@@ -811,8 +796,11 @@ msgstr "[reempaquetado]"
#: ../urpm/install.pm:168
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "transacción creada para instalar sobre %s (quitar=%d, instalar=%d, actualizar=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"transacción creada para instalar sobre %s (quitar=%d, instalar=%d, "
+"actualizar=%d)"
#: ../urpm/install.pm:171
#, c-format
@@ -834,8 +822,7 @@ msgstr "no se puede instalar el paquete %s"
msgid "removing bad rpm (%s) from %s"
msgstr "quitando rpm no válido (%s) desde %s"
-#: ../urpm/install.pm:213
-#: ../urpm/install.pm:278
+#: ../urpm/install.pm:213 ../urpm/install.pm:278
#, c-format
msgid "removing %s failed: %s"
msgstr "falló la eliminación de %s: %s"
@@ -880,8 +867,7 @@ msgstr "No se definió servidor, falta la URI o el host"
msgid "No base defined"
msgstr "No se definió base"
-#: ../urpm/ldap.pm:173
-#: ../urpm/ldap.pm:176
+#: ../urpm/ldap.pm:173 ../urpm/ldap.pm:176
#, c-format
msgid "Cannot connect to ldap uri:"
msgstr "No se puede conectar a la URI LDAP:"
@@ -894,7 +880,8 @@ msgstr "la base de datos %s está bloqueada, el proceso %d la está utilizando)"
#: ../urpm/lock.pm:70
#, c-format
msgid "%s database is locked (another program is already using it)"
-msgstr "la base de datos %s está bloqueada (está siendo usada por otro programa)"
+msgstr ""
+"la base de datos %s está bloqueada (está siendo usada por otro programa)"
#: ../urpm/lock.pm:84
#, c-format
@@ -906,26 +893,17 @@ msgstr "la base de datos %s está bloqueada. Aguardando..."
msgid "aborting"
msgstr "abortando"
-#: ../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, algunos archivos están ausentes:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Su base de datos de urpmi puede necesitar de actualización."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -934,80 +912,79 @@ msgstr ""
"Falló la instalación, rpms no 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 needed, %s available).\n"
+"There is not enough space on your filesystem to download all packages (%s "
+"needed, %s available).\n"
"Are you sure you want to continue?"
msgstr ""
-"No hay suficiente espacio en su sistema para descargar todos los paquetes (se necesita: %s, disponible: %s).\n"
+"No hay suficiente espacio en su sistema para descargar todos los paquetes "
+"(se necesita: %s, disponible: %s).\n"
"¿Esta seguro de continuar?"
-#: ../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 "¿Intentar continuar de todas maneras? (S/N) "
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "El siguiente paquete contienen una firma no 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 contienen firmas no válidas"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "¿Desea continuar con la 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 "quitando rpms instalandos (%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 "¿Intentar continuar de todas maneras? (S/N) "
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "instalando %s desde %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 la instalación sin verificar las dependencias? (S/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "¿Forzar la instalación (--force)? (S/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Los paquetes están actualizados"
-#: ../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 "Es posible la instalación"
@@ -1059,8 +1036,12 @@ msgstr "usando el soporte asociado para el modo paralelo: %s"
#: ../urpm/media.pm:610
#, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "--synthesis no se puede usar con --media, --excludemedia, --sortmedia, --update, --use-distrib o --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--synthesis no se puede usar con --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib o --parallel"
#: ../urpm/media.pm:719
#, c-format
@@ -1120,7 +1101,9 @@ msgstr "no se puede interpretar media.cfg"
#: ../urpm/media.pm:982
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "no se puede acceder al soporte de la distribución (no se encontró el archivo media.cfg)"
+msgstr ""
+"no se puede acceder al soporte de la distribución (no se encontró el archivo "
+"media.cfg)"
#: ../urpm/media.pm:1003
#, c-format
@@ -1170,7 +1153,8 @@ msgstr "reconfiguración terminada"
#: ../urpm/media.pm:1305
#, c-format
msgid "Error generating names file: dependency %d not found"
-msgstr "Error generando el archivo de nombres: no se encontró la dependencia %d"
+msgstr ""
+"Error generando el archivo de nombres: no se encontró la dependencia %d"
#: ../urpm/media.pm:1326
#, c-format
@@ -1187,15 +1171,12 @@ msgstr "examinando el archivo de síntesis [%s]"
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema leyendo el archivo de síntesis del soporte «%s»"
-#: ../urpm/media.pm:1370
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1370 ../urpm/media.pm:1465
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "copiando [%s] para el soporte «%s»..."
-#: ../urpm/media.pm:1372
-#: ../urpm/media.pm:1442
-#: ../urpm/media.pm:1695
+#: ../urpm/media.pm:1372 ../urpm/media.pm:1442 ../urpm/media.pm:1695
#, c-format
msgid "...copying failed"
msgstr "...falló la copia"
@@ -1205,8 +1186,7 @@ msgstr "...falló la copia"
msgid "copying description file of \"%s\"..."
msgstr "copiando descripción de archivo de «%s»..."
-#: ../urpm/media.pm:1440
-#: ../urpm/media.pm:1469
+#: ../urpm/media.pm:1440 ../urpm/media.pm:1469
#, c-format
msgid "...copying done"
msgstr "...copia hecha"
@@ -1221,8 +1201,7 @@ msgstr "falló la copia de [%s] (el archivo es sospechosamente pequeño)"
msgid "computing md5sum of retrieved source synthesis"
msgstr "calculando md5sum del archivo synthesis fuente descargado"
-#: ../urpm/media.pm:1521
-#: ../urpm/media.pm:1961
+#: ../urpm/media.pm:1521 ../urpm/media.pm:1961
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "falló la descarga de [%s] (no coincide md5sum)"
@@ -1292,8 +1271,7 @@ msgstr "soporte «%s» actualizado"
msgid "retrieval of [%s] failed"
msgstr "falló la descarga de [%s]"
-#: ../urpm/mirrors.pm:19
-#: ../urpm/mirrors.pm:40
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "intentando otra vez con el sitio de réplica %s"
@@ -1313,25 +1291,18 @@ msgstr "se encontró la geolocalización %s %.2f %.2f para el huso horario %s"
msgid "getting mirror list from %s"
msgstr "obteniendo lista de réplicas desde %s"
-#: ../urpm/msg.pm:76
-#: ../urpmi:495
-#: ../urpmi:513
-#: ../urpmi:629
+#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:629
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77
-#: ../urpme:38
-#: ../urpmi.addmedia:133
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi.addmedia:133
#, c-format
msgid "Yy"
msgstr "SsYy"
-#: ../urpm/msg.pm:107
-#: ../urpme:163
-#: ../urpmi.addmedia:136
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:136
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
@@ -1396,8 +1367,7 @@ msgstr "MB"
msgid "GB"
msgstr "GB"
-#: ../urpm/msg.pm:208
-#: ../urpm/msg.pm:217
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
#, c-format
msgid "TB"
msgstr "TB"
@@ -1438,11 +1408,13 @@ msgstr[1] "Tal vez quiera removerlos."
msgid ""
"The following package:\n"
"%s\n"
-"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans\""
+"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans"
+"\""
msgid_plural ""
"The following packages:\n"
"%s\n"
-"are now orphaned, if you wish to remove them, you can use \"urpme --auto-orphans\""
+"are now orphaned, if you wish to remove them, you can use \"urpme --auto-"
+"orphans\""
msgstr[0] ""
"El siguiente paquete:\n"
" %s\n"
@@ -1504,16 +1476,19 @@ msgstr "falló cp en el equipo %s (%d)"
#: ../urpm/parallel_ssh.pm:86
#, c-format
-msgid "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit code: %d)"
-msgstr "falló %s en el equipo %s (¿tal vez no tiene la versión correcta de urpmi?) (código de salida: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"falló %s en el equipo %s (¿tal vez no tiene la versión correcta de urpmi?) "
+"(código de salida: %d)"
#: ../urpm/removable.pm:33
#, c-format
msgid "unable to access medium \"%s\"."
msgstr "no se puede acceder al soporte «%s»."
-#: ../urpm/removable.pm:73
-#: ../urpm/removable.pm:91
+#: ../urpm/removable.pm:73 ../urpm/removable.pm:91
#, c-format
msgid "mounting %s"
msgstr "montando %s"
@@ -1530,16 +1505,17 @@ msgstr "se reinició urpmi, y la lista de paquetes prioritarios no cambió"
#: ../urpm/select.pm:33
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "se reinició urpmi, y la lista de paquetes prioritarios cambió: %s vs. %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"se reinició urpmi, y la lista de paquetes prioritarios cambió: %s vs. %s"
#: ../urpm/select.pm:186
#, c-format
msgid "No package named %s"
msgstr "Ningún paquete llamado %s"
-#: ../urpm/select.pm:188
-#: ../urpme:117
+#: ../urpm/select.pm:188 ../urpme:117
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Los siguientes paquetes contienen %s: %s"
@@ -1552,41 +1528,41 @@ msgstr "Debería usar \"-a\" para utilizarlos a todos"
#: ../urpm/select.pm:308
#, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "se encontraron los paquetes %s en la base de datos de urpmi, pero ninguno está instalado"
+msgstr ""
+"se encontraron los paquetes %s en la base de datos de urpmi, pero ninguno "
+"está instalado"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "El paquete %s ya está instalado"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Los paquetes %s ya están instalados"
-#: ../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 "debido 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 "debido a que no se satisfizo %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 "para mantener %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"
@@ -1595,7 +1571,7 @@ msgstr ""
"Se tiene que quitar el paquete siguiente para poder actualizar 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"
@@ -1604,12 +1580,12 @@ msgstr ""
"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "debido a que falta %s"
@@ -1669,20 +1645,24 @@ msgstr "No se puede mover archivo %s a %s"
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urmpe versión %s\n"
"Copyright © 1999-2010 Mandriva.\n"
-"Esto es software libre y se debe redistribuir bajo los términos de la GNU GPL.\n"
+"Esto es software libre y se debe redistribuir bajo los términos de la GNU "
+"GPL.\n"
"\n"
"uso:\n"
#: ../urpme:47
#, c-format
msgid " --auto - automatically select a package in choices.\n"
-msgstr " --auto - seleccionar un paquete en las elecciones automáticamente.\n"
+msgstr ""
+" --auto - seleccionar un paquete en las elecciones "
+"automáticamente.\n"
#: ../urpme:48
#, c-format
@@ -1692,17 +1672,16 @@ msgstr " --auto-orphans - quitar los huérfanos\n"
#: ../urpme:49
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - verificar si la desinstalación se puede llevar a cabo correctamente.\n"
+msgstr ""
+" --test - verificar si la desinstalación se puede llevar a cabo "
+"correctamente.\n"
-#: ../urpme:51
-#: ../urpmi:108
-#: ../urpmq:70
+#: ../urpme:51 ../urpmi:108 ../urpmq:70
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuido entre máquinas de alias.\n"
-#: ../urpme:52
-#: ../urpmi:142
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Volver a empaquetar los archivos antes de borrar\n"
@@ -1712,23 +1691,19 @@ msgstr " --repackage - Volver a empaquetar los archivos antes de borrar\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - usar otra raíz para la desinstalación de rpm.\n"
-#: ../urpme:54
-#: ../urpmf:40
-#: ../urpmi:110
-#: ../urpmi.addmedia:73
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:48
-#: ../urpmq:72
+#: ../urpme:54 ../urpmf:40 ../urpmi:110 ../urpmi.addmedia:73
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:72
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - usar otra raíz para la instalación de rpm y la base de datos de urpmi.\n"
+msgstr ""
+" --urpmi-root - usar otra raíz para la instalación de rpm y la base de "
+"datos de urpmi.\n"
-#: ../urpme:55
-#: ../urpmi:100
+#: ../urpme:55 ../urpmi:100
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - actualizar sólo la BD de rpm, no el sistema de archivos.\n"
+msgstr ""
+" --justdb - actualizar sólo la BD de rpm, no el sistema de archivos.\n"
#: ../urpme:56
#, c-format
@@ -1741,12 +1716,11 @@ msgid ""
" --use-distrib - configure urpme on the fly from a distrib tree, useful\n"
" to (un)install a chroot with --root option.\n"
msgstr ""
-" --use-distrib - configurar urpme al vuelo desde un árbol de distribución,\n"
+" --use-distrib - configurar urpme al vuelo desde un árbol de "
+"distribución,\n"
" útil para (des)instalar un chroot con la opción --root.\n"
-#: ../urpme:59
-#: ../urpmi:153
-#: ../urpmq:91
+#: ../urpme:59 ../urpmi:153 ../urpmq:91
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modo informativo.\n"
@@ -1754,7 +1728,9 @@ msgstr " --verbose, -v - modo informativo.\n"
#: ../urpme:60
#, c-format
msgid " -a - select all packages matching expression.\n"
-msgstr " -a - selecciona todas los paquetes que coincidan con la expresión.\n"
+msgstr ""
+" -a - selecciona todas los paquetes que coincidan con la "
+"expresión.\n"
#: ../urpme:75
#, c-format
@@ -1791,9 +1767,11 @@ msgstr "No hay huérfanos para quitar"
#: ../urpme:151
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
msgstr[0] "Para satisfacer las dependencias, se quitará el paquete siguiente"
-msgstr[1] "Para satisfacer las dependencias, se quitarán los %d paquetes siguientes"
+msgstr[1] ""
+"Para satisfacer las dependencias, se quitarán los %d paquetes siguientes"
#: ../urpme:156
#, c-format
@@ -1829,13 +1807,15 @@ msgstr "Se puede desinstalar"
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage: urpmf [options] pattern-expression\n"
msgstr ""
"urmpf versión %s\n"
"Copyright © 2002-2010 Mandriva.\n"
-"Éste es software libre y puede ser redistribuido bajo los términos de la GNU GPL.\n"
+"Éste es software libre y puede ser redistribuido bajo los términos de la GNU "
+"GPL.\n"
"\n"
"uso: urpmf [opciones] patrón-expresión\n"
@@ -1844,52 +1824,52 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - mostrar el número de versión de esta herramienta.\n"
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:82
+#: ../urpmf:37 ../urpmi:132 ../urpmq:82
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env - usar entorno específico (típicamente para reportar bugs).\n"
+msgstr ""
+" --env - usar entorno específico (típicamente para reportar "
+"bugs).\n"
-#: ../urpmf:38
-#: ../urpmi:73
-#: ../urpmq:49
+#: ../urpmf:38 ../urpmi:73 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - no usar soportes dados, separados por coma.\n"
#: ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l - no coincidir con patrones, usar argumento de manera literal.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l - no coincidir con patrones, usar argumento de manera "
+"literal.\n"
-#: ../urpmf:42
-#: ../urpmi:76
-#: ../urpmq:50
+#: ../urpmf:42 ../urpmi:76 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - clasificar soportes de acuerdo a subcadenas separadas por coma.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia - clasificar soportes de acuerdo a subcadenas separadas por "
+"coma.\n"
#: ../urpmf:43
#, c-format
msgid " --use-distrib - use the given path to access media\n"
msgstr " --use-distrib - usar la ruta dada para acceder a los soportes\n"
-#: ../urpmf:44
-#: ../urpmi:77
-#: ../urpmq:51
+#: ../urpmf:44 ../urpmi:77 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - usar síntesis provista en lugar de base de datos de urpmi.\n"
+msgstr ""
+" --synthesis - usar síntesis provista en lugar de base de datos de "
+"urpmi.\n"
#: ../urpmf:45
#, c-format
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - no imprime líneas idénticas.\n"
-#: ../urpmf:46
-#: ../urpmi:74
-#: ../urpmq:46
+#: ../urpmf:46 ../urpmi:74 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - usa sólo soporte de actualización.\n"
@@ -1902,17 +1882,21 @@ msgstr " --verbose - modo informativo.\n"
#: ../urpmf:48
#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -i - ignora distinción entre mayús. y minús. en los patrones.\n"
+msgstr ""
+" -i - ignora distinción entre mayús. y minús. en los patrones.\n"
#: ../urpmf:49
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - hace la distinción entre mayús. y minús. en los patrones (por omisión).\n"
+msgstr ""
+" -I - hace la distinción entre mayús. y minús. en los patrones "
+"(por omisión).\n"
#: ../urpmf:50
#, c-format
msgid " -F<str> - change field separator (defaults to ':').\n"
-msgstr " -F<cad> - cambiar el separador de campos (':' es el predet.)\n"
+msgstr ""
+" -F<cad> - cambiar el separador de campos (':' es el predet.)\n"
#: ../urpmf:51
#, c-format
@@ -1922,7 +1906,9 @@ msgstr "Expresiones de patrón:\n"
#: ../urpmf:52
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr " texto - cualquier texto se toma como expresión regular, a menos que se use -l.\n"
+msgstr ""
+" texto - cualquier texto se toma como expresión regular, a menos "
+"que se use -l.\n"
#: ../urpmf:53
#, c-format
@@ -1947,7 +1933,8 @@ msgstr " ! - Negación unaria.\n"
#: ../urpmf:57
#, c-format
msgid " ( ) - left and right parentheses.\n"
-msgstr " ( ) - paréntesis izq. y der. para grupos de expresiones.\n"
+msgstr ""
+" ( ) - paréntesis izq. y der. para grupos de expresiones.\n"
#: ../urpmf:58
#, c-format
@@ -2090,11 +2077,11 @@ msgstr " --vendor - fabricante\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - el soporte en el que se encontró el paquete\n"
-#: ../urpmf:85
-#: ../urpmq:101
+#: ../urpmf:85 ../urpmq:101
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - imprime versión, release y arquitectura con nombre.\n"
+msgstr ""
+" -f - imprime versión, release y arquitectura con nombre.\n"
#: ../urpmf:153
#, c-format
@@ -2124,7 +2111,8 @@ msgstr "no hay xml-info para el soporte «%s»"
#: ../urpmi:80
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
-msgstr " --auto-update - actualizar soportes y luego actualizar el sistema.\n"
+msgstr ""
+" --auto-update - actualizar soportes y luego actualizar el sistema.\n"
#: ../urpmi:81
#, c-format
@@ -2141,8 +2129,7 @@ msgstr " --force-key - forzar actualización de clave gpg.\n"
msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - quitar paquetes huérfanos sin preguntar\n"
-#: ../urpmi:84
-#: ../urpmq:56
+#: ../urpmi:84 ../urpmq:56
#, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
msgstr ""
@@ -2151,22 +2138,26 @@ msgstr ""
#: ../urpmi:85
#, c-format
-msgid " --no-uninstall - never ask to uninstall a package, abort the installation.\n"
-msgstr " --no-uninstall - nunca preguntar si desinstalar un paquete, cancelar la instalación.\n"
+msgid ""
+" --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+" --no-uninstall - nunca preguntar si desinstalar un paquete, cancelar la "
+"instalación.\n"
#: ../urpmi:86
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - no instalar paquetes (sólo descargar)\n"
-#: ../urpmi:87
-#: ../urpmq:58
+#: ../urpmi:87 ../urpmq:58
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-" --keep - mantener paquetes existentes si es posible, descartar pedidos\n"
+" --keep - mantener paquetes existentes si es posible, descartar "
+"pedidos\n"
" de paquetes que lleven a quitarlos.\n"
#: ../urpmi:89
@@ -2183,7 +2174,8 @@ msgstr ""
#: ../urpmi:93
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
-msgstr " --split-length - tamaño de transacción pequeña, predeterminado es %d.\n"
+msgstr ""
+" --split-length - tamaño de transacción pequeña, predeterminado es %d.\n"
#: ../urpmi:95
#, c-format
@@ -2212,8 +2204,10 @@ msgstr " --noclean - no eliminar los rpms del cache.\n"
#: ../urpmi:101
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - forzar instalación de paquetes que ya están instalados.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - forzar instalación de paquetes que ya están instalados.\n"
#: ../urpmi:103
#, c-format
@@ -2236,7 +2230,8 @@ msgstr ""
#: ../urpmi:107
#, c-format
msgid " --allow-suggests - auto select \"suggested\" packages.\n"
-msgstr " --allow-suggests - seleccionar automáticamente los paquetes «sugeridos».\n"
+msgstr ""
+" --allow-suggests - seleccionar automáticamente los paquetes «sugeridos».\n"
#: ../urpmi:111
#, c-format
@@ -2244,20 +2239,22 @@ msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-" --use-distrib - configurar urpmi al vuelo desde un árbol de distribución,\n"
+" --use-distrib - configurar urpmi al vuelo desde un árbol de "
+"distribución,\n"
" útil para instalar un chroot con la opción --root.\n"
-#: ../urpmi:113
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:37
+#: ../urpmi:113 ../urpmi.addmedia:60 ../urpmi.update:37
#, c-format
msgid " --metalink - generate and use a local metalink.\n"
msgstr " --metalink - generar y usar un metavínculo local.\n"
#: ../urpmi:114
#, c-format
-msgid " --download-all - download all needed packages before trying to install them\n"
-msgstr " --download-all - descargar los paquetes necesarios antes de instalar\n"
+msgid ""
+" --download-all - download all needed packages before trying to install "
+"them\n"
+msgstr ""
+" --download-all - descargar los paquetes necesarios antes de instalar\n"
#: ../urpmi:115
#, c-format
@@ -2293,9 +2290,7 @@ msgstr " --prozilla-options - opciones adicionales para pasar a prozilla\n"
msgid " --aria2-options - additional options to pass to aria2\n"
msgstr " --aria2-options - opciones adicionales para pasar a aria2\n"
-#: ../urpmi:123
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:61 ../urpmi.update:38
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limitar la velocidad de descarga.\n"
@@ -2306,13 +2301,11 @@ msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-" --resume - resumir transferencia de archivos descargados parcialmente\n"
+" --resume - resumir transferencia de archivos descargados "
+"parcialmente\n"
" (--no-resume lo deshabilita, que es lo predeterminado).\n"
-#: ../urpmi:126
-#: ../urpmi.addmedia:62
-#: ../urpmi.update:39
-#: ../urpmq:78
+#: ../urpmi:126 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -2321,10 +2314,7 @@ msgstr ""
" --proxy - usar proxy HTTP especificado, se asume que el puerto es\n"
" 1080 por defecto (formato <hostproxy[:puerto]>).\n"
-#: ../urpmi:128
-#: ../urpmi.addmedia:64
-#: ../urpmi.update:41
-#: ../urpmq:80
+#: ../urpmi:128 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:80
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -2355,12 +2345,15 @@ msgstr " --excludedocs - excluir archivos de documentación.\n"
#: ../urpmi:138
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - no verificar espacio en disco antes de la instalación.\n"
+msgstr ""
+" --ignoresize - no verificar espacio en disco antes de la instalación.\n"
#: ../urpmi:139
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch - permitir instalar rpms para arquitecturas que no corresponden.\n"
+msgstr ""
+" --ignorearch - permitir instalar rpms para arquitecturas que no "
+"corresponden.\n"
#: ../urpmi:140
#, c-format
@@ -2399,13 +2392,14 @@ msgstr " --nolock - no bloquear la DB de rpm.\n"
#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - actualiza sólo paquetes con la misma arquitectura.\n"
+msgstr ""
+" --strict-arch - actualiza sólo paquetes con la misma arquitectura.\n"
-#: ../urpmi:149
-#: ../urpmq:99
+#: ../urpmi:149 ../urpmq:99
#, c-format
msgid " -a - select all matches on command line.\n"
-msgstr " -a - selecciona todas coincidencias en línea de comando.\n"
+msgstr ""
+" -a - selecciona todas coincidencias en línea de comando.\n"
#: ../urpmi:152
#, c-format
@@ -2425,7 +2419,8 @@ msgstr " se instalan los nombres o archivos rpm dados en línea de comandos.\n"
#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Error: no se puede usar --auto-select junto con la lista de paquetes.\n"
+msgstr ""
+"Error: no se puede usar --auto-select junto con la lista de paquetes.\n"
#: ../urpmi:190
#, c-format
@@ -2433,7 +2428,8 @@ msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-"Error: para generar un reporte de errores, especifique los argumentos usuales\n"
+"Error: para generar un reporte de errores, especifique los argumentos "
+"usuales\n"
"de la línea de comandos, junto con --bug.\n"
#: ../urpmi:220
@@ -2453,13 +2449,19 @@ msgstr "asumiendo --buildrequires"
#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "por favor, use --buildrequires o --install-src, asumiendo --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"por favor, use --buildrequires o --install-src, asumiendo --buildrequires"
#: ../urpmi:253
#, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "El directorio [%s] ya existe, por favor use otro directorio para reportar errores o bórrelo"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"El directorio [%s] ya existe, por favor use otro directorio para reportar "
+"errores o bórrelo"
#: ../urpmi:254
#, c-format
@@ -2501,8 +2503,12 @@ msgstr "%s (para instalar)"
#: ../urpmi:443
#, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
-msgstr "Para satisfacer la dependencia «%s», se necesita uno de los paquetes siguientes:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
+msgstr ""
+"Para satisfacer la dependencia «%s», se necesita uno de los paquetes "
+"siguientes:"
#: ../urpmi:446
#, c-format
@@ -2531,8 +2537,7 @@ msgstr ""
"más antiguos que los ya instalados:\n"
"%s"
-#: ../urpmi:496
-#: ../urpmi:514
+#: ../urpmi:496 ../urpmi:514
#, c-format
msgid ""
"\n"
@@ -2541,10 +2546,7 @@ msgstr ""
"\n"
"¿Seguir adelante con la instalación?"
-#: ../urpmi:497
-#: ../urpmi:515
-#: ../urpmi:630
-#: ../urpmi.addmedia:136
+#: ../urpmi:497 ../urpmi:515 ../urpmi:630 ../urpmi.addmedia:136
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
@@ -2593,10 +2595,12 @@ msgstr "(sólo prueba, no se llevará a cabo la desinstalación)"
#: ../urpmi:566
#, c-format
msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
"%s\n"
msgstr ""
-"Primero debe llamar a urpmi con --buildrequires para instalar las dependencias siguientes:\n"
+"Primero debe llamar a urpmi con --buildrequires para instalar las "
+"dependencias siguientes:\n"
"%s\n"
#: ../urpmi:576
@@ -2609,7 +2613,8 @@ msgstr[1] "Se quitarán los siguientes paquetes huérfanos."
#: ../urpmi:600
#, c-format
msgid "WARNING: %s option is in use. Some strange problems may happen"
-msgstr "ADVERTENCIA: la opción %s está en uso. Pueden ocurrir problemas extraños"
+msgstr ""
+"ADVERTENCIA: la opción %s está en uso. Pueden ocurrir problemas extraños"
#: ../urpmi:612
#, c-format
@@ -2638,12 +2643,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 "Cancelar"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Presione «Intro» cuando el soporte sté montado..."
@@ -2693,29 +2693,22 @@ msgstr ""
"\n"
"y [opciones] es uno o varios de\n"
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:33
-#: ../urpmq:75
+#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:75
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - usa wget para recuperar archivos remotos.\n"
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:34
-#: ../urpmq:76
+#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:76
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - usa curl para recuperar archivos remotos.\n"
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:35
-#: ../urpmq:77
+#: ../urpmi.addmedia:58 ../urpmi.update:35 ../urpmq:77
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - usa curl para recuperar archivos remotos.\n"
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:59 ../urpmi.update:36
#, c-format
msgid " --aria2 - use aria2 to retrieve distant files.\n"
msgstr " --aria2 - usa aria2 para recuperar archivos remotos.\n"
@@ -2734,10 +2727,13 @@ msgstr ""
#, c-format
msgid ""
" --xml-info - use the specific policy for downloading xml info files\n"
-" one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
msgstr ""
-" --xml-info - usar la política específica para descargar archivos xml info\n"
-" una de: never, on-demand, update-only, always. ver urpmi.cfg(5)\n"
+" --xml-info - usar la política específica para descargar archivos xml "
+"info\n"
+" una de: never, on-demand, update-only, always. ver urpmi."
+"cfg(5)\n"
#: ../urpmi.addmedia:70
#, c-format
@@ -2766,7 +2762,8 @@ msgstr ""
#: ../urpmi.addmedia:76
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - con --distrib, pedir confirmación para cada soporte\n"
+msgstr ""
+" --interactive - con --distrib, pedir confirmación para cada soporte\n"
#: ../urpmi.addmedia:77
#, c-format
@@ -2776,10 +2773,10 @@ msgstr " --all-media - con --distrib, añadir cada soporte listado\n"
#: ../urpmi.addmedia:78
#, c-format
msgid " --virtual - create virtual media wich are always up-to-date.\n"
-msgstr " --virtual - crear soportes virtuales que siempre están actualizados.\n"
+msgstr ""
+" --virtual - crear soportes virtuales que siempre están actualizados.\n"
-#: ../urpmi.addmedia:79
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:79 ../urpmi.update:44
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - deshabilitar la prueba MD5SUM sobre el archivo.\n"
@@ -2792,18 +2789,15 @@ msgstr " --nopubkey - no importar la clave pública del soporte añadido\n"
#: ../urpmi.addmedia:81
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - añadir el soporte en config, pero no actualizarlo.\n"
+msgstr ""
+" --raw - añadir el soporte en config, pero no actualizarlo.\n"
-#: ../urpmi.addmedia:82
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - modo silencioso.\n"
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - modo informativo.\n"
@@ -2852,8 +2846,7 @@ msgstr ""
"\n"
"Desea añadir el soporte «%s»"
-#: ../urpmi.addmedia:155
-#: ../urpmi.addmedia:179
+#: ../urpmi.addmedia:155 ../urpmi.addmedia:179
#, c-format
msgid "unable to add medium"
msgstr "no se puede añadir el soporte"
@@ -2873,13 +2866,15 @@ msgstr "No se puede usar %s con un soporte remoto"
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urmpi.recover versión %s\n"
"Copyright (C) 2006 - 2010 Mandriva.\n"
-"Éste es software libre y puede ser redistribuido bajo los términos de la GNU GPL.\n"
+"Éste es software libre y puede ser redistribuido bajo los términos de la GNU "
+"GPL.\n"
"\n"
"uso:\n"
@@ -2891,22 +2886,29 @@ msgstr " --checkpoint - inicializar ahora el punto de referencia\n"
#: ../urpmi.recover:35
#, c-format
msgid " --noclean - don't clean repackage directory on checkpoint\n"
-msgstr " --noclean - no eliminar los rpms del cache en la creación del punto de referencia\n"
+msgstr ""
+" --noclean - no eliminar los rpms del cache en la creación del punto "
+"de referencia\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
-msgstr " --list - lista las transacciones a partir de la fecha/período provistos\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
+msgstr ""
+" --list - lista las transacciones a partir de la fecha/período "
+"provistos\n"
#: ../urpmi.recover:38
#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all - listar todas las transacciones de la rpmdb (largo)\n"
+msgstr ""
+" --list-all - listar todas las transacciones de la rpmdb (largo)\n"
#: ../urpmi.recover:39
#, c-format
msgid " --list-safe - list transactions since checkpoint\n"
-msgstr " --list-safe - lista las transacciones a partir del punto de referencia\n"
+msgstr ""
+" --list-safe - lista las transacciones a partir del punto de referencia\n"
#: ../urpmi.recover:40
#, c-format
@@ -2984,8 +2986,7 @@ msgstr "No se encontró transacción desde %s\n"
msgid "You must be superuser to do this"
msgstr "Debe ser el administrador para realizar esto"
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
#, c-format
msgid "Writing rpm macros file [%s]...\n"
msgstr "Escribiendo archivo rpm macros [%s] ...\n"
@@ -3080,7 +3081,8 @@ msgstr " --probe-rpms - no usar synthesis, usar archivos rpm directamente\n"
#: ../urpmi.update:50
#, c-format
msgid " -a - select all enabled non-removable media.\n"
-msgstr " -a - selecciona todos los soportes no extraíbles habilitados.\n"
+msgstr ""
+" -a - selecciona todos los soportes no extraíbles habilitados.\n"
#: ../urpmi.update:51
#, c-format
@@ -3090,7 +3092,8 @@ msgstr " -f - fuerza actualización de archivos synthesis\n"
#: ../urpmi.update:52
#, c-format
msgid " -ff - really force updating synthesis\n"
-msgstr " -ff - realmente fuerza actualización de archivos synthesis\n"
+msgstr ""
+" -ff - realmente fuerza actualización de archivos synthesis\n"
#: ../urpmi.update:69
#, c-format
@@ -3131,20 +3134,26 @@ msgstr "activando el soporte %s"
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urmpq versión %s\n"
"Copyright (C) 2000-20010 Mandriva.\n"
-"Éste es es software libre y puede ser redistribuido bajo los términos de la GNU GPL.\n"
+"Éste es es software libre y puede ser redistribuido bajo los términos de la "
+"GNU GPL.\n"
"\n"
"uso:\n"
#: ../urpmq:48
#, c-format
-msgid " --searchmedia - use only the given media to search requested (or updated) packages.\n"
-msgstr " --searchmedia - usar sólo soportes dados para la búsqueda de los paquetes pedidos (o actualizados).\n"
+msgid ""
+" --searchmedia - use only the given media to search requested (or updated) "
+"packages.\n"
+msgstr ""
+" --searchmedia - usar sólo soportes dados para la búsqueda de los paquetes "
+"pedidos (o actualizados).\n"
#: ../urpmq:53
#, c-format
@@ -3183,7 +3192,8 @@ msgstr " --list-url - lista los soportes disponibles junto con sus URL.\n"
#: ../urpmq:63
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - lista los nodos disponibles cuando se usa --parallel.\n"
+msgstr ""
+" --list-nodes - lista los nodos disponibles cuando se usa --parallel.\n"
#: ../urpmq:64
#, c-format
@@ -3192,8 +3202,11 @@ msgstr " --list-aliases - lista los alias paralelo disponibles.\n"
#: ../urpmq:65
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - volcar la configuración en forma de argumento para urpmi.addmedia.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - volcar la configuración en forma de argumento para urpmi."
+"addmedia.\n"
#: ../urpmq:66
#, c-format
@@ -3203,12 +3216,15 @@ msgstr " --src - sig. paquete es paquete fuente (igual que -s).\n"
#: ../urpmq:67
#, c-format
msgid " --sources - print source URLs of selected packages\n"
-msgstr " --sources - imprime las URL fuente de los paquetes seleccionados\n"
+msgstr ""
+" --sources - imprime las URL fuente de los paquetes seleccionados\n"
#: ../urpmq:69
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - permitir consultar rpms para arquitecturas que no correspondan.\n"
+msgstr ""
+" --ignorearch - permitir consultar rpms para arquitecturas que no "
+"correspondan.\n"
#: ../urpmq:73
#, c-format
@@ -3216,7 +3232,8 @@ msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-" --use-distrib - configurar urpmi al vuelo desde un árbol de distribución.\n"
+" --use-distrib - configurar urpmi al vuelo desde un árbol de "
+"distribución.\n"
" Esto permite consultar una distro.\n"
#: ../urpmq:83
@@ -3280,7 +3297,8 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr ""
" --whatrequires-recursive\n"
-" - búsqueda inversa extendida (incluye los paquetes virtuales).\n"
+" - búsqueda inversa extendida (incluye los paquetes "
+"virtuales).\n"
#: ../urpmq:97
#, c-format
@@ -3304,7 +3322,9 @@ msgstr " -g - imprimir los grupos junto con los nombres.\n"
#: ../urpmq:103
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - imprimir información útil en formato legible para las personas.\n"
+msgstr ""
+" -i - imprimir información útil en formato legible para las "
+"personas.\n"
#: ../urpmq:104
#, c-format
@@ -3328,8 +3348,12 @@ msgstr " -s - sig. paquete es paquete fuente (igual que --src).\n"
#: ../urpmq:108
#, c-format
-msgid " -u - remove package if a more recent version is already installed.\n"
-msgstr " -u - quitar paquete si ya está instalada una versión más reciente.\n"
+msgid ""
+" -u - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+" -u - quitar paquete si ya está instalada una versión más "
+"reciente.\n"
#: ../urpmq:109
#, c-format
@@ -3339,12 +3363,15 @@ msgstr " -y - forzar búsqueda difusa (lo mismo que --fuzzy).\n"
#: ../urpmq:110
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y - como -y, pero fuerza la no distinción entre mayúsculas y minúsculas.\n"
+msgstr ""
+" -Y - como -y, pero fuerza la no distinción entre mayúsculas y "
+"minúsculas.\n"
#: ../urpmq:111
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " los nombres o archivos rpm dados en línea de comandos se consultan.\n"
+msgstr ""
+" los nombres o archivos rpm dados en línea de comandos se consultan.\n"
#: ../urpmq:158
#, c-format
@@ -3361,27 +3388,37 @@ msgstr "--list-nodes sólo se puede utilizar con --parallel"
msgid "use -l to list files"
msgstr "use -l para listar los archivos"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "no existe xml info para el soporte «%s», sólo resultados parciales para el paquete %s"
+msgstr ""
+"no existe xml info para el soporte «%s», sólo resultados parciales para el "
+"paquete %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "no existe xml info para el soporte «%s», sólo resultados parciales para los paquetes %s"
+msgstr ""
+"no existe xml info para el soporte «%s», sólo resultados parciales para los "
+"paquetes %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "no existe xml info para el soporte «%s», no se retornan resultados para el paquete %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"no existe xml info para el soporte «%s», no se retornan resultados para el "
+"paquete %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "no existe xml info para el soporte «%s», no se pueden retornar resultados para los paquetes %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"no existe xml info para el soporte «%s», no se pueden retornar resultados "
+"para los paquetes %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "No se encontró changelog\n"
@@ -3394,6 +3431,18 @@ msgstr "Instalador de software"
msgid "Graphical front end to install RPM files"
msgstr "Interfaz gráfica para instalar archivos RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Falló la instalación, faltan algunos archivos:\n"
+#~ "%s\n"
+#~ "Puede querer actualizar su base de datos urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
@@ -3506,7 +3555,6 @@ msgstr "Interfaz gráfica para instalar archivos RPM"
#~ msgstr "Error"
#~ msgid "%d installation transaction failed"
-
#~ msgid_plural "%d installation transactions failed"
#~ msgstr[0] "falló una transacción de instalación"
#~ msgstr[1] "fallaron %d transacciones de instalación"
diff --git a/po/et.po b/po/et.po
index 1662aedb..362a060d 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,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: 2012-03-10 11:20+0300\n"
"Last-Translator: Marek Laane <bald@starman.ee>\n"
"Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
@@ -257,7 +257,7 @@ msgstr ""
msgid "Warning"
msgstr "Hoiatus"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Olgu"
@@ -317,7 +317,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakett, %d MB)"
msgstr[1] "(%d paketti, %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 "pakette ei õnnestunud hankida, katkestatakse"
@@ -354,38 +354,41 @@ msgstr "...tõmbamine nurjus: %s"
msgid "_Done"
msgstr "_Tehtud"
-#: ../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 ""
"Paigaldamine nurjus, mõned failid on puudu:\n"
-"%s\n"
-"Te võiksite ehk uuendada urpmi andmebaasi"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Te võiksite ehk uuendada urpmi andmebaasi."
-#: ../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 "Paigaldamine nurjus:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Kõik on juba paigaldatud"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Paigaldus lõpetatud"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "%s eemaldamine"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "urpmi taaskäivitamine"
@@ -515,58 +518,58 @@ msgstr "viga kohalike pakettide registreerimisel"
msgid "This operation is forbidden while running in restricted mode"
msgstr "See operatsioon on piiratud režiimis keelatud"
-#: ../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 "käsureal on määratud vigane puhverserver\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM-faili \"%s\" lugemine nurjus\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "ootamatu avaldis %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "avaldis puudub %s ees"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "ootamatu avaldis %s (soovitus: kasutada võiks võtit -a või -o)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "pole ühtegi avaldist lõpetada"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"vaikimisi ootab urpmf regulaaravaldist, peaksite kasutama võtit \"--literal\""
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-kataloogi ei ole olemas"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "%s kasutamine on võimalik ainult koos %s-ga"
-#: ../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 "%s kasutamine ei ole võimalik %s-ga"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Liiga palju argumente\n"
@@ -615,7 +618,7 @@ msgstr "seadistustefaili [%s] lugemine nurjus"
msgid "medium `%s' is defined twice, aborting"
msgstr "andmekandja '%s' on määratud kaks korda, loobutakse'"
-#: ../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 "seadistustefaili [%s] kirjutamine nurjus"
@@ -730,22 +733,22 @@ msgstr " %s%% valmis, kiirus: %s"
msgid "retrieving %s"
msgstr "%s tõmbamine"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "tõmmati %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "tundmatu protokoll %s jaoks"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "veebitõmbajat ei leitud, toetatud on programm %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ei suuda käsitleda protokolli: %s"
@@ -867,26 +870,17 @@ msgstr "%s andmebaas on lukus, oodatakse..."
msgid "aborting"
msgstr "loobutakse"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Kas proovida uuesti?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Paigaldamine nurjus, mõned failid on puudu:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Te võiksite ehk uuendada urpmi andmebaasi."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -895,7 +889,7 @@ msgstr ""
"Paigaldamine nurjus, vigased RPM-failid:\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 "
@@ -906,68 +900,68 @@ msgstr ""
"(vaja on %s, saadaval %s).\n"
"Kas tõesti jätkata?"
-#: ../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 "Paigaldamine nurjus"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Kas proovida siiski jätkata?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Järgmisel paketil on vigane signatuur"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Järgmistel pakettidel on vigane signatuur"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Kas jätkata paigaldusega?"
-#: ../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 "Paigaldamine nurjus"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "paigaldatud RPM-failide (%s) eemaldamine"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "%s jaotamine"
+msgid "Try to continue anyway?"
+msgstr "Kas proovida siiski jätkata?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "%s paigaldamine andmekandjalt %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "%s paigaldamine"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "%s jaotamine"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Kas proovida paigaldust veel jõulisemalt (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Pole ühtegi paketti uuendada"
-#: ../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 "Paigaldamine on võimalik"
@@ -1513,37 +1507,37 @@ msgstr "Kõigi nende kasutamiseks tuleks anda \"-a\""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Urpmi andmebaasis leiti paketid %s, aga need ei ole paigaldatud"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Pakett %s on juba paigaldatud"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Paketid %s on juba paigaldatud"
-#: ../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 "konflikti tõttu %s-ga"
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, c-format
msgid "due to unsatisfied %s"
msgstr "rahuldamata %s tõttu"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "püüdes välja pakkuda %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "säilitamaks %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"
@@ -1552,7 +1546,7 @@ msgstr ""
"Teiste uuendamiseks tuleb eemaldada järgmine pakett:\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"
@@ -1561,12 +1555,12 @@ msgstr ""
"Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "paigaldamaks %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "puuduva %s tõttu"
@@ -2601,12 +2595,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Kas paigaldada 1 pakett?"
msgstr[1] "Kas paigaldada %d paketti?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Loobu"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Vajutage Enter, kui see on tehtud..."
@@ -3351,33 +3340,33 @@ msgstr "võtit --list-nodes saab kasutada ainult koos võtmega --parallel"
msgid "use -l to list files"
msgstr "faililoendi nägemiseks kasutage võtit -l"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"andmekandjal \"%s\" puudub XML-info, paketil %s on ainult osaline tulemus"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"andmekandjal \"%s\" puudub XML-info, pakettidel %s on ainult osaline tulemus"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"andmekandjal \"%s\" puudub XML-info, paketile %s ei ole mingit tulemust"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"andmekandjal \"%s\" puudub XML-info, pakettidele %s ei ole mingit tulemust"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Muutuste logi ei leitud\n"
@@ -3390,6 +3379,18 @@ msgstr "Tarkvara paigaldaja"
msgid "Graphical front end to install RPM files"
msgstr "Graafiline kasutajaliides pakettide paigaldamiseks"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Paigaldamine nurjus, mõned failid on puudu:\n"
+#~ "%s\n"
+#~ "Te võiksite ehk uuendada urpmi andmebaasi"
+
+#~ msgid "Cancel"
+#~ msgstr "Loobu"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/eu.po b/po/eu.po
index 1e76eabb..c78b4098 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,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: 2009-11-01 09:36+0100\n"
"Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
"Language-Team: Basque <kde-i18n-doc@kde.org>\n"
@@ -262,7 +262,7 @@ msgstr ""
msgid "Warning"
msgstr "Kontuz"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ados"
@@ -322,7 +322,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(pakete %d, %d MB)"
msgstr[1] "(%d pakete, %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 "ezin dira iturburuko paketeak lortu, abortatzen"
@@ -359,38 +359,41 @@ msgstr "...berreskuratzeak huts egin du: %s"
msgid "_Done"
msgstr "_Eginda"
-#: ../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 ""
-"Huts egin du instalatzean, fitxategi batzuk falta dira:\n"
-"%s\n"
-"Zure urpmi datu-basea eguneratzea komeni da"
+"Instalaketak huts egin du, fitxategi batzuk falta dira:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Zure urpmi datu-basea eguneratzea komeni da."
-#: ../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 "Instalaketak huts egin du:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Dena dago instalatuta"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalazioa amaitu da"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "%s kentzen"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "urpmi berrabiarazten"
@@ -519,59 +522,59 @@ msgstr "errorea pakete lokalak erregistratzean"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Eragiketa hau debekatuta dago modu murriztuan exekutatzerakoan"
-#: ../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 "proxy-adierazpen okerra komando-lerroan\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "%s ezusteko adierazpena"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "%s-ren aurretik adierazpena falta da"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "%s ezusteko adierazpena (iradokizuna: erabili -a edo -o ?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "ez dago itxi beharreko adierazpenik"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"era lehenetsian urpmf-k regexp bat espero du. \"--literal\" aukera erabili "
"beharko zenuke"
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot direktorioa ez da existitzen"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Ezin da %s %s gabe erabili"
-#: ../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 "Ezin da %s %s-rekin erabili"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Argumentu gehiegi\n"
@@ -620,7 +623,7 @@ msgstr "ezin da konfig fitxategia irakurri [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "'%s' euskarria bitan definituta dago, galarazten"
-#: ../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 "ezin da [%s] konfigurazio-fitxategia idatzi"
@@ -736,22 +739,22 @@ msgstr " %s%% osatuta, abiadura = %s"
msgid "retrieving %s"
msgstr "%s berreskuratzen"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "%s eskuratuta"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s(e)rako protokolo ezezaguna definitu da"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "webfetch ez da aurkitu, webfetch hauek onartzen dira: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ezin da protokoloa maneiatu: %s"
@@ -875,26 +878,17 @@ msgstr "%s datubasea giltzatuta dago. Itxoiten..."
msgid "aborting"
msgstr "galarazten"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Berriz saiatu?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Instalaketak huts egin du, fitxategi batzuk falta dira:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Zure urpmi datu-basea eguneratzea komeni da."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -903,7 +897,7 @@ msgstr ""
"Instalaketak huts egin du, rpm okerrak:\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 "
@@ -914,68 +908,68 @@ msgstr ""
"beharrezkoa, %s eskuragarri).\n"
"Ziur zaude jarraitu nahi duzula?"
-#: ../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 "Instalazioak huts egin du"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Hala ere jarraitzen saiatu?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Ondoko paketeak sinadura okerra dauka"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Ondoko pakete hauek sinadura okerra dute"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Instalatzen jarraitu nahi duzu?"
-#: ../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 "Instalazioak huts egin du"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "instalatutako rpm-ak ezabatzen (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "%s banatzen"
+msgid "Try to continue anyway?"
+msgstr "Hala ere jarraitzen saiatu?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "%s %s-tik instalatzen"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "%s instalatzen"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "%s banatzen"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Mendekotasunak egiaztatu gabe instalatzen saiatu nahi duzu?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Instalaketa behartu (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Paketeak egunean daude"
-#: ../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 "Instalazioa posible da"
@@ -1524,37 +1518,37 @@ msgid "found package(s) %s in urpmi db, but none are installed"
msgstr ""
"%s paketea(k) aurkitu d(ir)a urpmi db-an, baino ez dago batere instalatuta"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "%s paketea dagoeneko instalatuta dago"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "%s paketeak dagoeneko instalatuta daude"
-#: ../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 "%s(r)ekin gatazkak daudelako"
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s bete gabe dagoelako"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "%s jaso nahian"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "%s gordetzeko"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1563,7 +1557,7 @@ msgstr ""
"Ondoko paketea ezabatu behar da besteak berritu ahal daitezen:\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"
@@ -1572,12 +1566,12 @@ msgstr ""
"Pakete hauek kendu egin behar dira besteak berritzeko:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "%s instalatzeko"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "%s falta delako"
@@ -2613,12 +2607,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Pakete baten instalaketarekin arrera jarraitu nahi duzu?"
msgstr[1] "%d paketeen instalaketarekin jarraitu nahi duzu?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Utzi"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Sakatu 'Sartu' muntatuta dagoenean..."
@@ -3368,21 +3357,21 @@ msgstr "--nodo-zerrendak honekin bakarrik erabil daitezke: --parallel"
msgid "use -l to list files"
msgstr "erabili -l fitxategiak zerrendatzeko"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"ez dago \"%s\" euskarriarentzako xml info, %s paketearentzako emaitza "
"partzialak soilik"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"ez dago \"%s\" euskarriarentzako xml info, %s paketeentzako emaitza "
"partzialak soilik"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3390,7 +3379,7 @@ msgstr ""
"ez dago \"%s\" euskarriarentzako xml info, ezin da %s paketearentzako "
"inolako emaitzarik itzuli"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3398,7 +3387,7 @@ msgstr ""
"ez dago \"%s\" euskarriarentzako xml info, ezin da %s paketeentzako inolako "
"emaitzarik itzuli"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Ez da changelog aurkitu\n"
@@ -3411,6 +3400,18 @@ msgstr "Software Instalatzailea"
msgid "Graphical front end to install RPM files"
msgstr "RPM fitxategiak instalatzeko interfaze grafikoa"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Huts egin du instalatzean, fitxategi batzuk falta dira:\n"
+#~ "%s\n"
+#~ "Zure urpmi datu-basea eguneratzea komeni da"
+
+#~ msgid "Cancel"
+#~ msgstr "Utzi"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/fa.po b/po/fa.po
index e277f7ab..200fcabf 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-fa\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: 2005-02-06 08:42-0500\n"
"Last-Translator: \n"
"Language-Team: <en@li.org>\n"
@@ -255,7 +255,7 @@ msgstr ""
msgid "Warning"
msgstr "هشدار"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "تایید"
@@ -314,7 +314,7 @@ msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(بسته‌های %d، %d مگابایت)"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "نمب‌توان بسته های منبع را دریافت کرد، پایان داده می‌شود"
@@ -351,38 +351,42 @@ msgstr "...دریافت شکست خورد: %s"
msgid "_Done"
msgstr "_انجام شد"
-#: ../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 "نصب شکست خورد"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"نصب شکست خورد، بعضی از پرونده‌ها وجود ندارند:\n"
"%s\n"
"بهتر است بانک اطلاعات 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "نصب شکست خورد"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "همه چیز قبلاً نصب شده است"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "نصب پایان یافت"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "برداشتن %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "راه‌اندازی دوباره‌ی urpmi"
@@ -511,57 +515,57 @@ msgstr "خطا در بایگانی کردن بسته‌های محلی"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "تعریف بد پراکسی بر خط فرمان\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: نمی‌توان پرونده rpm \"%s\" را خواند\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "عدم وجود امضا (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -608,7 +612,7 @@ msgstr "نمی‌توان پرونده‌ی تنظیم [%s] را نوشت"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "نمی‌توان پرونده‌ی تنظیم [%s] را نوشت"
@@ -723,22 +727,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "برداشتن %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...دریافت شکست خورد: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "پایان‌نامه‌ی ناشناس برای %s تعیین شده است"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "هیچ webfetch یافت نشد، webfetch دارای پشتیبانی: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "نمی‌توان پایان‌نامه را اداره کرد: %s"
@@ -859,19 +863,12 @@ msgstr "بانک اطلاعات urpmi قفل شده است"
msgid "aborting"
msgstr "هشدار"
-#: ../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 "نصب شکست خورد"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -879,14 +876,14 @@ msgstr ""
"%s\n"
"بهتر است بانک اطلاعات urpmi را بروزسازی نمایید"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "نصب شکست خورد"
-#: ../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 "
@@ -894,68 +891,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 "نصب شکست خورد"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "آیا می‌خواهید نصب را ادامه دهید؟"
-#: ../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 "نصب شکست خورد"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "نصب %s از %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "انتشار دادن %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 "نصب %s از %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "نصب %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "انتشار دادن %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "تلاش برای نصب بدون بررسی وابستگی‌ها؟ (y/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "تلاش برای نصب حتی قویتر (--force)؟ (y/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "نصب ممکن می‌باشد"
@@ -1482,37 +1479,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "همه چیز قبلاً نصب شده است"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "همه چیز قبلاً نصب شده است"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "همه چیز قبلاً نصب شده است"
-#: ../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 "بدلیل اختلاف با %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 "بدلیل عدم رضایت %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "تلاش برای ترفیع %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "برای نگهداشتن %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1521,7 +1518,7 @@ msgstr ""
"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\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"
@@ -1530,12 +1527,12 @@ msgstr ""
"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "برای نصب %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "بدلیل عدم وجود %s"
@@ -2531,12 +2528,7 @@ msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "لغو"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "وقتی آماده‌اید ورود را فشار دهید..."
@@ -3241,21 +3233,21 @@ msgstr "--list-nodes فقط می‌توانند با --parallel استفاده
msgid "use -l to list files"
msgstr "نمی توان پرونده لیست \"%s\" را نوشت"
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"توجه: چون هیچ رسانه‌ای با استفاده از hdlists جستجو نگردید، urpmf قادر نبود "
"نتیجه‌ای را بازگرداند\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"توجه: چون هیچ رسانه‌ای با استفاده از hdlists جستجو نگردید، urpmf قادر نبود "
"نتیجه‌ای را بازگرداند\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3263,7 +3255,7 @@ msgstr ""
"توجه: چون هیچ رسانه‌ای با استفاده از hdlists جستجو نگردید، urpmf قادر نبود "
"نتیجه‌ای را بازگرداند\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3271,7 +3263,7 @@ msgstr ""
"توجه: چون هیچ رسانه‌ای با استفاده از hdlists جستجو نگردید، urpmf قادر نبود "
"نتیجه‌ای را بازگرداند\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "هیچ ثبت تغییری یافت نشد\n"
@@ -3285,6 +3277,18 @@ msgstr "نصب‌گر نرم‌افزار"
msgid "Graphical front end to install RPM files"
msgstr "ظاهر تصویری برای نصب پرونده‌های RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "نصب شکست خورد، بعضی از پرونده‌ها وجود ندارند:\n"
+#~ "%s\n"
+#~ "بهتر است بانک اطلاعات urpmi را بروزسازی نمایید"
+
+#~ msgid "Cancel"
+#~ msgstr "لغو"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "نمی‌توان پرونده‌ی [%s] را نوشت"
diff --git a/po/fi.po b/po/fi.po
index 46c3f561..b0acdd98 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,7 +15,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: 2009-11-04 17:15+0200\n"
"Last-Translator: Jani Välimaa <wally@mandriva.org>\n"
"Language-Team: Finnish <cooker-i18n@mandrivalinux.org>\n"
@@ -270,7 +270,7 @@ msgstr ""
msgid "Warning"
msgstr "Varoitus"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -330,7 +330,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paketti, %d Mt)"
msgstr[1] "(%d pakettia, %d Mt)"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Lähdekoodipaketteja ei voida hakea, keskeytetään asennus"
@@ -367,38 +367,41 @@ msgstr "...noutaminen epäonnistui: %s"
msgid "_Done"
msgstr "_Valmis"
-#: ../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 ""
"Asennus epäonnistui, joitakin tiedostoja puuttuu:\n"
-"%s\n"
-"Urpmi-tietokanta tulisi päivittää"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Urpmi-tietokanta tulisi päivittää."
-#: ../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 "Asennus epäonnistui:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Paketit on jo asennettu"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Asennus on valmis"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "Poistetaan %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "Käynnistetään urpmi uudelleen"
@@ -527,59 +530,59 @@ msgstr "Virhe rekisteröitäessä paikallisia paketteja"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Toiminto on kielletty, koska ohjelmaa käytetään rajoitetussa tilassa"
-#: ../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 "Virheellinen välityspalvelinmääritys komentorivillä\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm-pakettia %s ei voida lukea\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "Odottamaton hakulauseke %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "Puuttuva hakulauseke ennen %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "Odottamaton hakulauseke %s (ehdotus: käytä valitsimia -a tai -o)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "Ei suljettavaa hakulauseketta"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"urpmf odottaa oletuksena säännöllistä lauseketta. Käytä valitsinta \"--"
"literal\""
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Chroot-kansiota ei ole olemassa"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Valitsinta %s ei voida käyttää ilman valitsinta %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 "Valitsinta %s ei voida käyttää valitsimen %s kanssa"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Liian monta argumenttia\n"
@@ -628,7 +631,7 @@ msgstr "Asetustiedostoa [%s] ei voitu lukea"
msgid "medium `%s' is defined twice, aborting"
msgstr "Media \"%s\" on asetettu kahdesti, keskeytetään"
-#: ../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 "Asetustiedostoon [%s] ei voitu kirjoittaa"
@@ -745,22 +748,22 @@ msgstr " %s%% valmis, nopeus %s"
msgid "retrieving %s"
msgstr "noudetaan %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "noudettiin %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "Määritelty tuntematon protokolla kohteelle %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "Yhtään latausohjelmaa ei löytynyt, tuetut ohjelmat: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "Protokollaa ei voida käsitellä: %s"
@@ -882,26 +885,17 @@ msgstr "%s-tietokanta on lukittu. Odotetaan..."
msgid "aborting"
msgstr "Keskeytetään"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Yritä uudelleen?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Asennus epäonnistui, joitakin tiedostoja puuttuu:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Urpmi-tietokanta tulisi päivittää."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -910,7 +904,7 @@ msgstr ""
"Asennus epäonnistui, viallisia paketteja:\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 "
@@ -921,68 +915,68 @@ msgstr ""
"lataamiseksi (%s tarvitaan, %s vapaana).\n"
"Jatketaanko?"
-#: ../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 "Asennus epäonnistui"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Yritä joka tapauksessa?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Seuraavalla paketilla on virheellinen allekirjoitus"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Seuraavilla paketeilla on virheellinen allekirjoitus"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Jatka asennusta?"
-#: ../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 "Asennus epäonnistui"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "Poistetaan asennetut paketit (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "Levitetään %s"
+msgid "Try to continue anyway?"
+msgstr "Yritä joka tapauksessa?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "Asennetaan %s sijainnista %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "Asennetaan %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "Levitetään %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Yritetäänkö asentaa tarkistamatta riippuvuuksia (k/E)?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Yritetäänkö pakottaa asennus (--force) (k/E)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Paketit ovat ajantasalla"
-#: ../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 "Asennus on mahdollinen"
@@ -1527,37 +1521,37 @@ msgstr ""
"Urpmi-tietokannasta löytyi paketit %s, mutta yhtään paketeista ei ole "
"asennettuna"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Paketti %s on jo asennettu"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Paketit %s ovat jo asennettu"
-#: ../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 "johtuen ristiriidasta %s kanssa"
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, c-format
msgid "due to unsatisfied %s"
msgstr "täyttämättömän %s vuoksi"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "yritettäessä täyttää riippuvuus %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "%s säilyttämiseksi"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1566,7 +1560,7 @@ msgstr ""
"Seuraava paketti on poistettava, jotta toiset voidaan päivittää:\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"
@@ -1575,12 +1569,12 @@ msgstr ""
"Seuraavat paketit on poistettava, jotta toiset voidaan päivittää:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "%s asentamiseksi"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "puuttuvan %s vuoksi"
@@ -2627,12 +2621,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Asennetaanko valittu paketti?"
msgstr[1] "Asennetaanko valitut %d pakettia?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Peruuta"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Paina Enter liittämisen jälkeen..."
@@ -3388,21 +3377,21 @@ msgstr ""
msgid "use -l to list files"
msgstr "Valitsin -l listaa paketin tiedostot"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"Medialla \"%s\" ei ole xml-tietoja, löytyi vain osittainen hakutulos "
"paketille %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Medialla \"%s\" ei ole xml-tietoja, löytyi vain osittainen hakutulos "
"paketeille %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3410,7 +3399,7 @@ msgstr ""
"Medialla \"%s\" ei ole xml-tietoja, paketille %s ei voida palauttaa "
"hakutuloksia"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3418,7 +3407,7 @@ msgstr ""
"Medialla \"%s\" ei ole xml-tietoja, paketeille %s ei voida palauttaa "
"hakutuloksia"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Muutoslokia ei löytynyt\n"
@@ -3431,6 +3420,18 @@ msgstr "Ohjelmien asennin"
msgid "Graphical front end to install RPM files"
msgstr "Graafinen ohjelmien asennin"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Asennus epäonnistui, joitakin tiedostoja puuttuu:\n"
+#~ "%s\n"
+#~ "Urpmi-tietokanta tulisi päivittää"
+
+#~ msgid "Cancel"
+#~ msgstr "Peruuta"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/fr.po b/po/fr.po
index e82b7abd..cfab4275 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2012-03-21 08:44+0100\n"
+"POT-Creation-Date: 2012-06-08 19:19+0200\n"
"PO-Revision-Date: 2012-04-12 21:50+0100\n"
"Last-Translator: Rémi Verschelde <remi@verschelde.fr>\n"
"Language-Team: French <i18n-fr@ml.mageia.org>\n"
@@ -25,9 +25,7 @@ msgstr "Installation du RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Erreur : fichier %s introuvable, annulation de l'opération"
-#: ../gurpmi:47
-#: ../gurpmi2:196
-#: ../gurpmi2:221
+#: ../gurpmi:47 ../gurpmi2:196 ../gurpmi2:221
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -39,7 +37,8 @@ msgid ""
"\n"
"%s\n"
"\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
"\n"
"What would you like to do?"
msgstr ""
@@ -47,12 +46,13 @@ msgstr ""
"\n"
"%s\n"
"\n"
-"Vous ne désirez probablement pas l'installer sur votre ordinateur. (L'installer vous permettra de modifier le code source, puis de le recompiler).\n"
+"Vous ne désirez probablement pas l'installer sur votre ordinateur. "
+"(L'installer vous permettra de modifier le code source, puis de le "
+"recompiler).\n"
"\n"
"Que voulez-vous faire ?"
-#: ../gurpmi:75
-#: ../gurpmi:86
+#: ../gurpmi:75 ../gurpmi:86
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -61,7 +61,8 @@ msgid ""
"\n"
"Proceed?"
msgstr ""
-"Vous êtes sur le point d'installer les paquetages suivants sur votre ordinateur :\n"
+"Vous êtes sur le point d'installer les paquetages suivants sur votre "
+"ordinateur :\n"
"\n"
"%s\n"
"\n"
@@ -76,7 +77,8 @@ msgid ""
"\n"
"You may prefer to just save it. What is your choice?"
msgstr ""
-"Vous êtes sur le point d'installer le paquetage suivant sur votre ordinateur :\n"
+"Vous êtes sur le point d'installer le paquetage suivant sur votre "
+"ordinateur :\n"
"\n"
"%s\n"
"\n"
@@ -92,8 +94,7 @@ msgstr "_Installer"
msgid "_Save"
msgstr "_Sauver"
-#: ../gurpmi:101
-#: ../gurpmi2:196
+#: ../gurpmi:101 ../gurpmi2:196
#, c-format
msgid "_Cancel"
msgstr "_Annuler"
@@ -103,19 +104,20 @@ msgstr "_Annuler"
msgid "Choose location to save file"
msgstr "Choisissez un emplacement pour enregistrer le fichier"
-#: ../gurpmi.pm:39
-#: ../urpmi:66
+#: ../gurpmi.pm:39 ../urpmi:66
#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urpmi version %s\n"
"Copyright © 1999-2010 Mandriva.\n"
-"Ceci est un logiciel libre pouvant être redistribué selon les termes de la licence GNU GPL.\n"
+"Ceci est un logiciel libre pouvant être redistribué selon les termes de la "
+"licence GNU GPL.\n"
"\n"
"utilisation :\n"
@@ -124,42 +126,37 @@ msgstr ""
msgid "Options:"
msgstr "Options :"
-#: ../gurpmi.pm:46
-#: ../urpme:46
-#: ../urpmf:35
-#: ../urpmi:71
-#: ../urpmi.addmedia:55
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:71 ../urpmi.addmedia:55
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - afficher ce message d'aide.\n"
-#: ../gurpmi.pm:47
-#: ../urpmi:78
+#: ../gurpmi.pm:47 ../urpmi:78
#, c-format
-msgid " --auto - non-interactive mode, assume default answers to questions.\n"
-msgstr " --auto - mode non intéractif, utilisation des paramètres par défaut.\n"
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions.\n"
+msgstr ""
+" --auto - mode non intéractif, utilisation des paramètres par "
+"défaut.\n"
-#: ../gurpmi.pm:48
-#: ../urpmi:79
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:79 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - sélection automatique des paquetages à mettre à jour.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - sélection automatique des paquetages à mettre à jour.\n"
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:102
-#: ../urpmq:68
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:102 ../urpmq:68
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - forcer l'invocation même si certains paquetages n'existent pas.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - forcer l'invocation même si certains paquetages "
+"n'existent pas.\n"
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -168,44 +165,48 @@ msgstr ""
" --verify-rpm - vérifier la signature du rpm avant l'installation\n"
" (--no-verify-rpm le désactive, activé par défaut).\n"
-#: ../gurpmi.pm:52
-#: ../urpmf:41
-#: ../urpmi:72
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:72 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
-msgstr " --media - utiliser seulement les médias listés (séparés par des virgules).\n"
+msgstr ""
+" --media - utiliser seulement les médias listés (séparés par des "
+"virgules).\n"
-#: ../gurpmi.pm:53
-#: ../urpmi:150
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - cherche dans les apports pour trouver le paquetage.\n"
+msgstr ""
+" -p - cherche dans les apports pour trouver le paquetage.\n"
-#: ../gurpmi.pm:54
-#: ../urpmi:151
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -P - ne pas chercher dans les apports pour trouver un paquetage.\n"
+msgstr ""
+" -P - ne pas chercher dans les apports pour trouver un "
+"paquetage.\n"
-#: ../gurpmi.pm:55
-#: ../urpmi:109
-#: ../urpmq:71
+#: ../gurpmi.pm:55 ../urpmi:109 ../urpmq:71
#, c-format
msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - utiliser un autre répertoire racine pour l'installation.\n"
+msgstr ""
+" --root - utiliser un autre répertoire racine pour l'installation.\n"
-#: ../gurpmi.pm:56
-#: ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:135
#, c-format
-msgid " --test - only verify if the installation can be achieved correctly.\n"
-msgstr " --test - vérifier si l'installation peut se dérouler correctement.\n"
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - vérifier si l'installation peut se dérouler "
+"correctement.\n"
-#: ../gurpmi.pm:57
-#: ../urpmi:75
+#: ../gurpmi.pm:57 ../urpmi:75
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - utiliser seulement le média spécifié pour rechercher les paquetages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - utiliser seulement le média spécifié pour rechercher les "
+"paquetages.\n"
#: ../gurpmi.pm:100
#, c-format
@@ -237,8 +238,7 @@ msgstr "Installation des paquetages"
msgid "Preparing packages installation..."
msgstr "Préparation de l'installation des paquetages..."
-#: ../gurpmi2:112
-#: ../urpmi:509
+#: ../gurpmi2:112 ../urpmi:509
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -264,7 +264,6 @@ msgid "Warning"
msgstr "Attention"
#: ../gurpmi2:155
-#: ../urpmi:642
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -301,21 +300,25 @@ msgid ""
"%s\n"
"Continue installation anyway?"
msgstr ""
-"Pour permettre la mise à jour, les paquetages suivants doivent être désinstallés :\n"
+"Pour permettre la mise à jour, les paquetages suivants doivent être "
+"désinstallés :\n"
"%s\n"
"Continuer quand même l'installation ?"
-#: ../gurpmi2:276
-#: ../urpmi:609
+#: ../gurpmi2:276 ../urpmi:609
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "Pour satisfaire les dépendances, le paquetage suivant va être installé :"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"Pour satisfaire les dépendances, le paquetage suivant va être installé :"
-#: ../gurpmi2:277
-#: ../urpmi:610
+#: ../gurpmi2:277 ../urpmi:610
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Pour satisfaire les dépendances, les paquetages suivants vont être installés :"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Pour satisfaire les dépendances, les paquetages suivants vont être "
+"installés :"
#: ../gurpmi2:279
#, c-format
@@ -324,14 +327,12 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paquetage, %d Mo)"
msgstr[1] "(%d paquetages, %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 "impossible de récupérer les paquetages de sources, abandon"
-#: ../gurpmi2:319
-#: ../urpm/install.pm:81
+#: ../gurpmi2:319 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Préparation..."
@@ -341,8 +342,7 @@ msgstr "Préparation..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installation du paquetage « %s » (%s/%s)..."
-#: ../gurpmi2:343
-#: ../urpmi:637
+#: ../gurpmi2:343 ../urpmi:637
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Veuillez insérer le média nommé « %s »"
@@ -352,12 +352,8 @@ msgstr "Veuillez insérer le média nommé « %s »"
msgid "Downloading package `%s'..."
msgstr "Téléchargement du paquetage « %s »..."
-#: ../gurpmi2:369
-#: ../urpm.pm:338
-#: ../urpm/download.pm:831
-#: ../urpm/get_pkgs.pm:262
-#: ../urpm/media.pm:981
-#: ../urpm/media.pm:1493
+#: ../gurpmi2:369 ../urpm.pm:338 ../urpm/download.pm:831
+#: ../urpm/get_pkgs.pm:262 ../urpm/media.pm:981 ../urpm/media.pm:1493
#: ../urpm/media.pm:1644
#, c-format
msgid "...retrieving failed: %s"
@@ -368,42 +364,41 @@ msgstr "... échec de la récupération : %s"
msgid "_Done"
msgstr "_Fini"
-#: ../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 ""
-"L'installation a échoué, il manque les fichiers :\n"
-"%s\n"
-"Vous devriez mettre à jour votre base de données urpmi"
+"L'installation a échoué, certains fichiers sont manquants :\n"
+"%s"
-#: ../gurpmi2:408
-#: ../urpm/main_loop.pm:292
-#: ../urpm/main_loop.pm:335
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Vous devriez mettre à jour votre base de données urpmi."
+
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, c-format
msgid "Installation failed:"
msgstr "L'installation a échoué :"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Tous les paquetages sont déjà installés"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "L'installation est terminée"
-#: ../gurpmi2:416
-#: ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "désinstallation de %s"
-#: ../gurpmi2:427
-#: ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "redémarrage de urpmi"
@@ -425,7 +420,9 @@ msgstr " -h|--help - afficher ce message d'aide.\n"
#: ../rpm-find-leaves:18
#, c-format
msgid " --root <path> - use the given root instead of /\n"
-msgstr " --root <chemin>  - utiliser l'emplacement spécifié comme racine à la place de « / »\n"
+msgstr ""
+" --root <chemin>  - utiliser l'emplacement spécifié comme racine à la "
+"place de « / »\n"
#: ../rpm-find-leaves:19
#, c-format
@@ -442,8 +439,7 @@ msgstr " valeur par défaut %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - afficher le nom complet du paquetage (NVRA)\n"
-#: ../rurpmi:11
-#: ../urpmi:269
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Seul l'administrateur système (root) peut installer des paquetages"
@@ -478,9 +474,7 @@ msgstr "Impossible de télécharger dans %s"
msgid "Environment directory %s does not exist"
msgstr "Le répertoire d'environnement %s n'existe pas"
-#: ../urpm.pm:151
-#: ../urpmf:248
-#: ../urpmq:167
+#: ../urpm.pm:151 ../urpmf:248 ../urpmq:167
#, c-format
msgid "using specific environment on %s\n"
msgstr "avec environnement spécifique sur %s\n"
@@ -500,8 +494,7 @@ msgstr "le nom du fichier rpm est invalide [%s]"
msgid "retrieving rpm file [%s] ..."
msgstr "récupération des fichiers rpm [%s]..."
-#: ../urpm.pm:335
-#: ../urpm/get_pkgs.pm:260
+#: ../urpm.pm:335 ../urpm/get_pkgs.pm:260
#, c-format
msgid "...retrieving done"
msgstr "... récupération effectuée"
@@ -536,82 +529,82 @@ msgstr "erreur lors de l'inscription des paquetages locaux"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Cette opération est interdite en mode restreint"
-#: ../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 "mauvaise déclaration de serveur mandataire en ligne de commande\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq : impossible de lire le fichier rpm « %s »\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "expression inattendue %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "expression manquante avant %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "expression inattendue %s (suggestion : utilisez -a ou -o ?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "pas d'expression à fermer"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "par défaut urpmf s'attend à une regexp, utilisez l'option « --literal »"
+msgstr ""
+"par défaut urpmf s'attend à une regexp, utilisez l'option « --literal »"
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "le répertoire chroot n'existe pas"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Impossible d'utiliser %s sans %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 "Impossible d'utiliser %s avec %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Trop d'arguments\n"
-#: ../urpm/bug_report.pm:55
-#: ../urpmi:259
+#: ../urpm/bug_report.pm:55 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "La copie a échoué"
#: ../urpm/cdrom.pm:67
#, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "Vous devez monter le CD-ROM vous-même (ou installer perl-Hal-Cdroms afin que celà soit fait automatiquement)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"Vous devez monter le CD-ROM vous-même (ou installer perl-Hal-Cdroms afin que "
+"celà soit fait automatiquement)"
#: ../urpm/cdrom.pm:69
#, c-format
msgid "Udisks daemon (udisks-daemon) is not running or not ready"
msgstr "Le démon Udisks (udisks-daemon) n'est pas lancé ou n'est pas prêt"
-#: ../urpm/cdrom.pm:161
-#: ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "le média « %s » n'est pas disponible"
@@ -636,8 +629,7 @@ msgstr "impossible de lire le fichier de configuration [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "le média « %s » est défini deux fois, interruption"
-#: ../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 "impossible d'écrire le fichier de configuration [%s]"
@@ -752,22 +744,22 @@ msgstr " %s%% terminé, débit = %s"
msgid "retrieving %s"
msgstr "récupération de %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "%s récupéré"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocole inconnu défini pour %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "aucun programme de téléchargement trouvé, ceux supportés sont : %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "impossible d'utiliser le protocole : %s"
@@ -794,8 +786,11 @@ msgstr "[regénération]"
#: ../urpm/install.pm:168
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "transaction créée pour l'installation sur %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"transaction créée pour l'installation sur %s (remove=%d, install=%d, upgrade="
+"%d)"
#: ../urpm/install.pm:171
#, c-format
@@ -817,8 +812,7 @@ msgstr "impossible d'installer le paquetage %s"
msgid "removing bad rpm (%s) from %s"
msgstr "suppression des paquetages bogués (%s) de %s"
-#: ../urpm/install.pm:213
-#: ../urpm/install.pm:278
+#: ../urpm/install.pm:213 ../urpm/install.pm:278
#, c-format
msgid "removing %s failed: %s"
msgstr "la suppression de %s a échouée : %s"
@@ -863,8 +857,7 @@ msgstr "Aucun serveur défini : uri ou hôte manquant"
msgid "No base defined"
msgstr "Pas de base spécifiée"
-#: ../urpm/ldap.pm:173
-#: ../urpm/ldap.pm:176
+#: ../urpm/ldap.pm:173 ../urpm/ldap.pm:176
#, c-format
msgid "Cannot connect to ldap uri:"
msgstr "Impossible de se connecter à l'uri ldap :"
@@ -889,26 +882,17 @@ msgstr "la base de donnée %s est verrouillée, mise en attente..."
msgid "aborting"
msgstr "abandon"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Essayer de nouveau ?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"L'installation a échoué, certains fichiers sont manquants :\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Vous devriez mettre à jour votre base de données urpmi."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -917,80 +901,79 @@ msgstr ""
"L'installation a échoué à cause de paquets bogués :\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 needed, %s available).\n"
+"There is not enough space on your filesystem to download all packages (%s "
+"needed, %s available).\n"
"Are you sure you want to continue?"
msgstr ""
-"Il n'y a pas assez d'espace sur votre système de fichier pour télécharger tous les paquets (%s sont nécessaires, %s sont disponibles).\n"
+"Il n'y a pas assez d'espace sur votre système de fichier pour télécharger "
+"tous les paquets (%s sont nécessaires, %s sont disponibles).\n"
"Êtes-vous sur de vouloir continuer ?"
-#: ../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'installation a échoué"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Essayer de continuer néanmoins ?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Le paquetage suivant a une signature invalide"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Les paquetages suivants ont des signatures non valides"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Voulez-vous continuer l'installation ?"
-#: ../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'installation a échoué"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "suppression des paquetages installés (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "distribution de %s"
+msgid "Try to continue anyway?"
+msgstr "Essayer de continuer néanmoins ?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "installation de %s depuis %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "installation de %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "distribution de %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Essayer d'installer sans vérifier les dépendances ?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Essayer de forcer l'installation (--force) ?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Les paquetages sont à jour"
-#: ../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'installation est possible"
@@ -1033,7 +1016,8 @@ msgstr "le fichier de configuration [%s] a été écrit"
#: ../urpm/media.pm:586
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Le mode distribué ne peut pas être utilisé avec le mode « use-distrib »"
+msgstr ""
+"Le mode distribué ne peut pas être utilisé avec le mode « use-distrib »"
#: ../urpm/media.pm:594
#, c-format
@@ -1042,8 +1026,12 @@ msgstr "utilisation du média associé pour le mode distribué : %s"
#: ../urpm/media.pm:610
#, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "--synthesis ne peut être utilisé avec --media, --excludemedia, --sortmedia, --update, --use-distrib ou --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--synthesis ne peut être utilisé avec --media, --excludemedia, --sortmedia, "
+"--update, --use-distrib ou --parallel"
#: ../urpm/media.pm:719
#, c-format
@@ -1103,7 +1091,9 @@ msgstr "impossible d'analyser media.cfg"
#: ../urpm/media.pm:982
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "impossible d'accéder au média de distribution (pas de fichier media.cfg trouvé)"
+msgstr ""
+"impossible d'accéder au média de distribution (pas de fichier media.cfg "
+"trouvé)"
#: ../urpm/media.pm:1003
#, c-format
@@ -1170,15 +1160,12 @@ msgstr "examen de la liste de synthèse [%s]"
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problème de lecture du fichier de synthèse du média « %s »"
-#: ../urpm/media.pm:1370
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1370 ../urpm/media.pm:1465
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "copie en cours [%s] pour le média « %s »..."
-#: ../urpm/media.pm:1372
-#: ../urpm/media.pm:1442
-#: ../urpm/media.pm:1695
+#: ../urpm/media.pm:1372 ../urpm/media.pm:1442 ../urpm/media.pm:1695
#, c-format
msgid "...copying failed"
msgstr "... copie impossible"
@@ -1188,8 +1175,7 @@ msgstr "... copie impossible"
msgid "copying description file of \"%s\"..."
msgstr "copie du fichier description de « %s »..."
-#: ../urpm/media.pm:1440
-#: ../urpm/media.pm:1469
+#: ../urpm/media.pm:1440 ../urpm/media.pm:1469
#, c-format
msgid "...copying done"
msgstr "... copie effectuée"
@@ -1204,8 +1190,7 @@ msgstr "La copie de [%s] a échoué (le fichier est étrangement petit)"
msgid "computing md5sum of retrieved source synthesis"
msgstr "calcul de la somme de contrôle MD5 du fichier synthesis"
-#: ../urpm/media.pm:1521
-#: ../urpm/media.pm:1961
+#: ../urpm/media.pm:1521 ../urpm/media.pm:1961
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "échec de la récupération de [%s] (inégalité md5sum)"
@@ -1275,8 +1260,7 @@ msgstr "média « %s » mis à jour"
msgid "retrieval of [%s] failed"
msgstr "échec de la récupération de [%s]"
-#: ../urpm/mirrors.pm:19
-#: ../urpm/mirrors.pm:40
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "nouvel essai avec le miroir %s"
@@ -1296,25 +1280,18 @@ msgstr "géolocalisation trouvée %s %.2f %.2f du fuseau horaire %s"
msgid "getting mirror list from %s"
msgstr "récupération de la liste des miroirs depuis %s"
-#: ../urpm/msg.pm:76
-#: ../urpmi:495
-#: ../urpmi:513
-#: ../urpmi:629
+#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:629
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77
-#: ../urpme:38
-#: ../urpmi.addmedia:133
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi.addmedia:133
#, c-format
msgid "Yy"
msgstr "OoYy"
-#: ../urpm/msg.pm:107
-#: ../urpme:163
-#: ../urpmi.addmedia:136
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:136
#, c-format
msgid " (y/N) "
msgstr " (o/N) "
@@ -1379,8 +1356,7 @@ msgstr "Mo"
msgid "GB"
msgstr "Go"
-#: ../urpm/msg.pm:208
-#: ../urpm/msg.pm:217
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
#, c-format
msgid "TB"
msgstr "To"
@@ -1388,7 +1364,9 @@ msgstr "To"
#: ../urpm/orphans.pm:51
#, c-format
msgid "Marking %s as manually installed, it won't be auto-orphaned"
-msgstr "Marque %s comme étant manuellement installé, il ne sera pas considéré comme un paquet orphelin"
+msgstr ""
+"Marque %s comme étant manuellement installé, il ne sera pas considéré comme "
+"un paquet orphelin"
#: ../urpm/orphans.pm:448
#, c-format
@@ -1421,19 +1399,23 @@ msgstr[1] "Vous pouvez souhaiter l'effacer."
msgid ""
"The following package:\n"
"%s\n"
-"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans\""
+"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans"
+"\""
msgid_plural ""
"The following packages:\n"
"%s\n"
-"are now orphaned, if you wish to remove them, you can use \"urpme --auto-orphans\""
+"are now orphaned, if you wish to remove them, you can use \"urpme --auto-"
+"orphans\""
msgstr[0] ""
"Le paquetage suivant :\n"
"%s\n"
-"est désormais orphelin, si vous voulez le désinstaller, vous pouvez utiliser « urpme --auto-orphans »"
+"est désormais orphelin, si vous voulez le désinstaller, vous pouvez utiliser "
+"« urpme --auto-orphans »"
msgstr[1] ""
"Les paquetages suivants :\n"
"%s\n"
-"sont désormais orphelins, si vous voulez les désinstaller, vous pouvez utiliser « urpme --auto-orphans »"
+"sont désormais orphelins, si vous voulez les désinstaller, vous pouvez "
+"utiliser « urpme --auto-orphans »"
#: ../urpm/parallel.pm:15
#, c-format
@@ -1487,16 +1469,19 @@ msgstr "cp a échoué sur l'hôte %s (%d)"
#: ../urpm/parallel_ssh.pm:86
#, c-format
-msgid "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit code: %d)"
-msgstr "%s a échoué sur l'hôte %s (peut-être n'a-t-il pas la bonne version d'urpmi ?) (code de sortie : %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"%s a échoué sur l'hôte %s (peut-être n'a-t-il pas la bonne version "
+"d'urpmi ?) (code de sortie : %d)"
#: ../urpm/removable.pm:33
#, c-format
msgid "unable to access medium \"%s\"."
msgstr "impossible d'accéder au média « %s »."
-#: ../urpm/removable.pm:73
-#: ../urpm/removable.pm:91
+#: ../urpm/removable.pm:73 ../urpm/removable.pm:91
#, c-format
msgid "mounting %s"
msgstr "montage de %s"
@@ -1509,20 +1494,23 @@ msgstr "démontage de %s"
#: ../urpm/select.pm:31
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi a été relancé et la liste des paquetages prioritaires est inchangée"
+msgstr ""
+"urpmi a été relancé et la liste des paquetages prioritaires est inchangée"
#: ../urpm/select.pm:33
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi a été relancé et la liste des paquetages prioritaires a changé : %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi a été relancé et la liste des paquetages prioritaires a changé : %s vs "
+"%s"
#: ../urpm/select.pm:186
#, c-format
msgid "No package named %s"
msgstr "Pas de paquetage nommé %s"
-#: ../urpm/select.pm:188
-#: ../urpme:117
+#: ../urpm/select.pm:188 ../urpme:117
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Les paquetages suivants contiennent %s : %s"
@@ -1537,62 +1525,62 @@ msgstr "Vous pouvez utiliser « -a » pour les sélectionner tous"
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "paquetage(s) %s dans la base urpmi mais aucun n'est installé"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Le paquetage %s est déjà installé"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Les paquetages %s sont déjà installé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 "en raison de conflit avec %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 "car %s est non satisfait"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "Tentative de promouvoir %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "afin de garder %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"
"%s"
msgstr ""
-"Afin de poursuivre la mise à jour, le paquetage suivant doit être désinstallé :\n"
+"Afin de poursuivre la mise à jour, le paquetage suivant doit être "
+"désinstallé :\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"
"%s"
msgstr ""
-"Afin de poursuivre la mise à jour, les paquetages suivants doivent être désinstallés :\n"
+"Afin de poursuivre la mise à jour, les paquetages suivants doivent être "
+"désinstallés :\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "pour installer le paquetage %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "en raison du manque de %s"
@@ -1652,20 +1640,24 @@ msgstr "Impossible de déplacer %s vers %s"
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urpme version %s\n"
"Copyright © 1999-2010 Mandriva.\n"
-"Ceci est un logiciel libre pouvant être redistribué selon les termes de la licence GNU GPL.\n"
+"Ceci est un logiciel libre pouvant être redistribué selon les termes de la "
+"licence GNU GPL.\n"
"\n"
"usage : \n"
#: ../urpme:47
#, c-format
msgid " --auto - automatically select a package in choices.\n"
-msgstr " --auto - sélectionner automatiquement un paquetage parmi les choix\n"
+msgstr ""
+" --auto - sélectionner automatiquement un paquetage parmi les "
+"choix\n"
#: ../urpme:48
#, c-format
@@ -1675,17 +1667,17 @@ msgstr " --auto-orphans - supprimer les orphelins\n"
#: ../urpme:49
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - vérifier si la désinstallation peut être achevée correctement.\n"
+msgstr ""
+" --test - vérifier si la désinstallation peut être achevée "
+"correctement.\n"
-#: ../urpme:51
-#: ../urpmi:108
-#: ../urpmq:70
+#: ../urpme:51 ../urpmi:108 ../urpmq:70
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
-msgstr " --parallel - urpmi distribué sur plusieurs machines de l'alias.\n"
+msgstr ""
+" --parallel - urpmi distribué sur plusieurs machines de l'alias.\n"
-#: ../urpme:52
-#: ../urpmi:142
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Réempaqueter les fichiers avant effacement\n"
@@ -1693,25 +1685,24 @@ msgstr " --repackage - Réempaqueter les fichiers avant effacement\n"
#: ../urpme:53
#, c-format
msgid " --root - use another root for rpm removal.\n"
-msgstr " --root - utiliser un autre répertoire racine pour la désinstallation.\n"
+msgstr ""
+" --root - utiliser un autre répertoire racine pour la "
+"désinstallation.\n"
-#: ../urpme:54
-#: ../urpmf:40
-#: ../urpmi:110
-#: ../urpmi.addmedia:73
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:48
-#: ../urpmq:72
+#: ../urpme:54 ../urpmf:40 ../urpmi:110 ../urpmi.addmedia:73
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:72
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - utiliser un autre répertoire racine pour l'installation et la base de donnée urpmi.\n"
+msgstr ""
+" --urpmi-root - utiliser un autre répertoire racine pour l'installation "
+"et la base de donnée urpmi.\n"
-#: ../urpme:55
-#: ../urpmi:100
+#: ../urpme:55 ../urpmi:100
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - mettre à jour la base rpm mais pas le système de fichiers.\n"
+msgstr ""
+" --justdb - mettre à jour la base rpm mais pas le système de "
+"fichiers.\n"
#: ../urpme:56
#, c-format
@@ -1728,9 +1719,7 @@ msgstr ""
" distribution, utile pour (dés)installer un chroot avec\n"
" l'option --root.\n"
-#: ../urpme:59
-#: ../urpmi:153
-#: ../urpmq:91
+#: ../urpme:59 ../urpmi:153 ../urpmq:91
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - mode verbeux.\n"
@@ -1761,8 +1750,10 @@ msgstr "paquetage inconnu"
#, c-format
msgid "Removing the following package will break your system:"
msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "La désinstallation du paquetage suivant rendra votre système instable"
-msgstr[1] "La désinstallation des paquetages suivants rendra votre système instable"
+msgstr[0] ""
+"La désinstallation du paquetage suivant rendra votre système instable"
+msgstr[1] ""
+"La désinstallation des paquetages suivants rendra votre système instable"
#: ../urpme:128
#, c-format
@@ -1777,9 +1768,13 @@ msgstr "Aucun orphelin à supprimer"
#: ../urpme:151
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Pour satisfaire les dépendances, le paquetages suivant va être désinstallé"
-msgstr[1] "Pour satisfaire les dépendances, les %d paquetages suivants vont être désinstallés"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Pour satisfaire les dépendances, le paquetages suivant va être désinstallé"
+msgstr[1] ""
+"Pour satisfaire les dépendances, les %d paquetages suivants vont être "
+"désinstallés"
#: ../urpme:156
#, c-format
@@ -1815,13 +1810,15 @@ msgstr "La suppression est possible"
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage: urpmf [options] pattern-expression\n"
msgstr ""
"urpmf version %s\n"
"Copyright (C) 2002-2010 Mandriva.\n"
-"Ceci est un logiciel libre pouvant être redistribué selon les termes de la licence GNU GPL.\n"
+"Ceci est un logiciel libre pouvant être redistribué selon les termes de la "
+"licence GNU GPL.\n"
"\n"
"syntaxe : urpmf [options] expression\n"
@@ -1830,18 +1827,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - afficher la version de cet utilitaire\n"
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:82
+#: ../urpmf:37 ../urpmi:132 ../urpmq:82
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - utiliser un environment spécifique (en général\n"
" un rapport d'anomalie).\n"
-#: ../urpmf:38
-#: ../urpmi:73
-#: ../urpmq:49
+#: ../urpmf:38 ../urpmi:73 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1850,14 +1843,16 @@ msgstr ""
#: ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l - ne remplace pas les jokers, applique l'argument tel quel.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l - ne remplace pas les jokers, applique l'argument tel "
+"quel.\n"
-#: ../urpmf:42
-#: ../urpmi:76
-#: ../urpmq:50
+#: ../urpmf:42 ../urpmi:76 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr ""
" --sortmedia - trier les médias selon des sous-chaînes (séparées\n"
" par des virgules).\n"
@@ -1867,9 +1862,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --use-distrib - utiliser le chemin spécifié pour accéder au média\n"
-#: ../urpmf:44
-#: ../urpmi:77
-#: ../urpmq:51
+#: ../urpmf:44 ../urpmi:77 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1881,9 +1874,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - ne pas afficher les lignes identiques.\n"
-#: ../urpmf:46
-#: ../urpmi:74
-#: ../urpmq:46
+#: ../urpmf:46 ../urpmi:74 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - n'utiliser que les médias de mise à jour.\n"
@@ -1906,7 +1897,8 @@ msgstr " -I - respecter la distinction majuscules/minuscules.\n"
#: ../urpmf:50
#, c-format
msgid " -F<str> - change field separator (defaults to ':').\n"
-msgstr " -F<str> - remplacer le séparateur par <str> (par défaut ':').\n"
+msgstr ""
+" -F<str> - remplacer le séparateur par <str> (par défaut ':').\n"
#: ../urpmf:51
#, c-format
@@ -1916,7 +1908,8 @@ msgstr "Motifs de substitution :\n"
#: ../urpmf:52
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr " texte - texte traité en expression régulière, sauf si option -l.\n"
+msgstr ""
+" texte - texte traité en expression régulière, sauf si option -l.\n"
#: ../urpmf:53
#, c-format
@@ -1976,7 +1969,8 @@ msgstr " --buildtime - chercher dans le champ « BuildTime »\n"
#: ../urpmf:64
#, c-format
msgid " --conffiles - configuration files\n"
-msgstr " --conffiles - chercher dans la liste des fichiers de configuration\n"
+msgstr ""
+" --conffiles - chercher dans la liste des fichiers de configuration\n"
#: ../urpmf:65
#, c-format
@@ -2006,7 +2000,8 @@ msgstr " --filename - chercher dans le nom de fichier du paquetage\n"
#: ../urpmf:70
#, c-format
msgid " --files - list of files contained in the package\n"
-msgstr " --files - chercher dans la liste des fichiers d'un paquetage\n"
+msgstr ""
+" --files - chercher dans la liste des fichiers d'un paquetage\n"
#: ../urpmf:71
#, c-format
@@ -2076,10 +2071,10 @@ msgstr " --vendor - chercher dans le nom du fournisseur\n"
#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
-msgstr " -m - chercher dans le média où le paquetage a été trouvé\n"
+msgstr ""
+" -m - chercher dans le média où le paquetage a été trouvé\n"
-#: ../urpmf:85
-#: ../urpmq:101
+#: ../urpmf:85 ../urpmq:101
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -2094,7 +2089,8 @@ msgstr "expression non terminée (%s)"
#: ../urpmf:198
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Format incorrect : vous ne pouvez utiliser qu'une seule option multi-valeur"
+msgstr ""
+"Format incorrect : vous ne pouvez utiliser qu'une seule option multi-valeur"
#: ../urpmf:291
#, c-format
@@ -2114,12 +2110,14 @@ msgstr "pas de fichier xml-info disponible pour le média « %s »"
#: ../urpmi:80
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
-msgstr " --auto-update - rafraîchir les média lors de la mise à jour du système.\n"
+msgstr ""
+" --auto-update - rafraîchir les média lors de la mise à jour du système.\n"
#: ../urpmi:81
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - ne pas effectuer la vérification du fichier MD5SUM.\n"
+msgstr ""
+" --no-md5sum - ne pas effectuer la vérification du fichier MD5SUM.\n"
#: ../urpmi:82
#, c-format
@@ -2131,15 +2129,16 @@ msgstr " --force-key - force la mise à jour de la clef gpg.\n"
msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - supprimer les orphelins sans confirmation\n"
-#: ../urpmi:84
-#: ../urpmq:56
+#: ../urpmi:84 ../urpmq:56
#, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
msgstr " --no-suggests - pas de sélection auto des paquetages \"suggérés\"\n"
#: ../urpmi:85
#, c-format
-msgid " --no-uninstall - never ask to uninstall a package, abort the installation.\n"
+msgid ""
+" --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
msgstr ""
" --no-uninstall - ne jamais demander de désinstallation, plutôt annuler\n"
" l'installation.\n"
@@ -2147,17 +2146,20 @@ msgstr ""
#: ../urpmi:86
#, c-format
msgid " --no-install - don't install packages (only download)\n"
-msgstr " --no-install - ne pas installer les paquetages (les télécharger seulement)\n"
+msgstr ""
+" --no-install - ne pas installer les paquetages (les télécharger "
+"seulement)\n"
-#: ../urpmi:87
-#: ../urpmq:58
+#: ../urpmi:87 ../urpmq:58
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-" --keep - conserve les paquetages existants si possible, rejette les\n"
-" paquetages demandés qui nécessitent des désinstallations.\n"
+" --keep - conserve les paquetages existants si possible, rejette "
+"les\n"
+" paquetages demandés qui nécessitent des "
+"désinstallations.\n"
#: ../urpmi:89
#, c-format
@@ -2166,7 +2168,8 @@ msgid ""
" are going to be installed or upgraded,\n"
" default is %d.\n"
msgstr ""
-" --split-level - découper en petites transactions si plus du nombre spécifié\n"
+" --split-level - découper en petites transactions si plus du nombre "
+"spécifié\n"
" de paquetages doivent être installés ou mis à jour.\n"
" (%d par défaut).\n"
@@ -2195,7 +2198,8 @@ msgstr ""
#: ../urpmi:98
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
-msgstr " --clean - enlever tous les rpm du cache avant toute opération.\n"
+msgstr ""
+" --clean - enlever tous les rpm du cache avant toute opération.\n"
#: ../urpmi:99
#, c-format
@@ -2204,8 +2208,11 @@ msgstr " --noclean - ne supprime aucun paquetage du cache.\n"
#: ../urpmi:101
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - force l'installation des paquetages qui sont déjà installés.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - force l'installation des paquetages qui sont déjà "
+"installés.\n"
#: ../urpmi:103
#, c-format
@@ -2240,17 +2247,19 @@ msgstr ""
" distribution; utile pour (dés)installer un chroot avec\n"
" l'option --root.\n"
-#: ../urpmi:113
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:37
+#: ../urpmi:113 ../urpmi.addmedia:60 ../urpmi.update:37
#, c-format
msgid " --metalink - generate and use a local metalink.\n"
msgstr " --metalink - générer et utiliser un metalink local.\n"
#: ../urpmi:114
#, c-format
-msgid " --download-all - download all needed packages before trying to install them\n"
-msgstr " --download-all - télécharger tous les paquetages nécessaires avant installation\n"
+msgid ""
+" --download-all - download all needed packages before trying to install "
+"them\n"
+msgstr ""
+" --download-all - télécharger tous les paquetages nécessaires avant "
+"installation\n"
#: ../urpmi:115
#, c-format
@@ -2286,9 +2295,7 @@ msgstr " --prozilla-options - options supplémentaires à passer à prozilla\n"
msgid " --aria2-options - additional options to pass to aria2\n"
msgstr " --aria2-options - options supplémentaires à passer à aria2\n"
-#: ../urpmi:123
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:61 ../urpmi.update:38
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limiter la vitesse de téléchargement.\n"
@@ -2302,29 +2309,25 @@ msgstr ""
" --resume - reprendre le transfert des fichiers incomplets\n"
" (--no-resume le désactive, il est désactivé par défaut).\n"
-#: ../urpmi:126
-#: ../urpmi.addmedia:62
-#: ../urpmi.update:39
-#: ../urpmq:78
+#: ../urpmi:126 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
" to be 1080 by default (format is <proxyhost[:port]>).\n"
msgstr ""
" --proxy - utiliser le proxy HTTP indiqué, le n° de port\n"
-" étant 1080 à défaut d'indication (format <proxy[:port]>).\n"
+" étant 1080 à défaut d'indication (format <proxy[:port]"
+">).\n"
-#: ../urpmi:128
-#: ../urpmi.addmedia:64
-#: ../urpmi.update:41
-#: ../urpmq:80
+#: ../urpmi:128 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:80
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
" --proxy-user - spécifier l'utilisateur et le mot de passe pour\n"
-" l'authentification sur le proxy (<utilisateur:motdepasse>).\n"
+" l'authentification sur le proxy (<utilisateur:"
+"motdepasse>).\n"
#: ../urpmi:130
#, c-format
@@ -2338,7 +2341,8 @@ msgstr ""
#: ../urpmi:136
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
-msgstr " --excludepath - exclure les chemins indiqués, séparés par des virgules.\n"
+msgstr ""
+" --excludepath - exclure les chemins indiqués, séparés par des virgules.\n"
#: ../urpmi:137
#, c-format
@@ -2348,13 +2352,15 @@ msgstr " --excludedocs - exclure les fichiers de documentation.\n"
#: ../urpmi:138
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - ne pas vérifier la place disque avant installation.\n"
+msgstr ""
+" --ignoresize - ne pas vérifier la place disque avant installation.\n"
#: ../urpmi:139
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
-" --ignorearch - autoriser l'installation de paquetages prévus pour d'autres\n"
+" --ignorearch - autoriser l'installation de paquetages prévus pour "
+"d'autres\n"
" architectures.\n"
#: ../urpmi:140
@@ -2383,7 +2389,8 @@ msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-" --more-choices - lorsque beaucoup de paquetages sont trouvés, proposer plus\n"
+" --more-choices - lorsque beaucoup de paquetages sont trouvés, proposer "
+"plus\n"
" de choix que par défaut.\n"
#: ../urpmi:147
@@ -2398,8 +2405,7 @@ msgstr ""
" --strict-arch - mettre à jour uniquement les paquetages avec la même\n"
" architecture.\n"
-#: ../urpmi:149
-#: ../urpmq:99
+#: ../urpmi:149 ../urpmq:99
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
@@ -2419,12 +2425,15 @@ msgstr " --debug - mode de déboguage.\n"
#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " les noms ou les fichiers rpm donnés en ligne de commande seront installés.\n"
+msgstr ""
+" les noms ou les fichiers rpm donnés en ligne de commande seront "
+"installés.\n"
#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Erreur : options --auto-select et la liste de paquetages incompatibles.\n"
+msgstr ""
+"Erreur : options --auto-select et la liste de paquetages incompatibles.\n"
#: ../urpmi:190
#, c-format
@@ -2438,7 +2447,8 @@ msgstr ""
#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
-msgstr "Installation de paquetages binaires impossible avec l'option --install-src"
+msgstr ""
+"Installation de paquetages binaires impossible avec l'option --install-src"
#: ../urpmi:221
#, c-format
@@ -2452,13 +2462,19 @@ msgstr "repli vers --buildrequires"
#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "merci d'utiliser --buildrequires ou --install-src, par défaut --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"merci d'utiliser --buildrequires ou --install-src, par défaut --buildrequires"
#: ../urpmi:253
#, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Le répertoire [%s] existe déjà, merci d'en utiliser un autre pour le rapport d'anomalie, ou de l'effacer."
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Le répertoire [%s] existe déjà, merci d'en utiliser un autre pour le rapport "
+"d'anomalie, ou de l'effacer."
#: ../urpmi:254
#, c-format
@@ -2500,8 +2516,12 @@ msgstr "%s (à installer)"
#: ../urpmi:443
#, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
-msgstr "Afin de satisfaire les dépendances de « %s », un des paquetages suivants est nécessaire :"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
+msgstr ""
+"Afin de satisfaire les dépendances de « %s », un des paquetages suivants est "
+"nécessaire :"
#: ../urpmi:446
#, c-format
@@ -2530,8 +2550,7 @@ msgstr ""
"de paquetages qui sont plus anciens que les versions installées :\n"
"%s"
-#: ../urpmi:496
-#: ../urpmi:514
+#: ../urpmi:496 ../urpmi:514
#, c-format
msgid ""
"\n"
@@ -2540,10 +2559,7 @@ msgstr ""
"\n"
"Désirez-vous tout de même continuer ?"
-#: ../urpmi:497
-#: ../urpmi:515
-#: ../urpmi:630
-#: ../urpmi.addmedia:136
+#: ../urpmi:497 ../urpmi:515 ../urpmi:630 ../urpmi.addmedia:136
#, c-format
msgid " (Y/n) "
msgstr " (O/n) "
@@ -2592,10 +2608,12 @@ msgstr "(test uniquement, la suppression ne sera pas effectuée)"
#: ../urpmi:566
#, c-format
msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
"%s\n"
msgstr ""
-"Vous devez d'abord utiliser urpmi --buildrequires pour installer les dépendances suivantes :\n"
+"Vous devez d'abord utiliser urpmi --buildrequires pour installer les "
+"dépendances suivantes :\n"
"%s\n"
#: ../urpmi:576
@@ -2608,7 +2626,9 @@ msgstr[1] "Les paquetages orphelins suivants vont être désinstallés."
#: ../urpmi:600
#, c-format
msgid "WARNING: %s option is in use. Some strange problems may happen"
-msgstr "ATTENTION : L'option %s est activée. Des problèmes étranges peuvent se produire"
+msgstr ""
+"ATTENTION : L'option %s est activée. Des problèmes étranges peuvent se "
+"produire"
#: ../urpmi:612
#, c-format
@@ -2637,12 +2657,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Procéder à l'installation d'un paquetage ?"
msgstr[1] "Procéder à l'installation des %d paquetages ?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Annuler"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Veuillez sur appuyez sur « Entrée » une fois le média monté ..."
@@ -2681,7 +2696,8 @@ msgstr ""
" cdrom://<chemin>\n"
"\n"
"utilisation : urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
-"utilisation : urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
+"utilisation : urpmi.addmedia [options] --mirrorlist <url> <name> <relative "
+"path>\n"
"\n"
"exemples:\n"
"\n"
@@ -2692,32 +2708,29 @@ msgstr ""
"\n"
"et [options] sont choisies parmi\n"
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:33
-#: ../urpmq:75
+#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:75
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
-msgstr " --wget - utiliser wget pour récupérer les fichiers distants.\n"
+msgstr ""
+" --wget - utiliser wget pour récupérer les fichiers distants.\n"
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:34
-#: ../urpmq:76
+#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:76
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
-msgstr " --curl - utiliser curl pour récupérer les fichiers distants.\n"
+msgstr ""
+" --curl - utiliser curl pour récupérer les fichiers distants.\n"
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:35
-#: ../urpmq:77
+#: ../urpmi.addmedia:58 ../urpmi.update:35 ../urpmq:77
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - utiliser prozilla pour récupérer les fichiers distants.\n"
+msgstr ""
+" --prozilla - utiliser prozilla pour récupérer les fichiers distants.\n"
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:59 ../urpmi.update:36
#, c-format
msgid " --aria2 - use aria2 to retrieve distant files.\n"
-msgstr " --aria2 - utiliser aria2 pour récupérer les fichiers distants.\n"
+msgstr ""
+" --aria2 - utiliser aria2 pour récupérer les fichiers distants.\n"
#: ../urpmi.addmedia:66
#, c-format
@@ -2726,16 +2739,20 @@ msgid ""
" or discard non-update media (when used with --distrib)\n"
msgstr ""
" --update - créer une source «mise à jour» ou forcer l'utilisation,\n"
-" des sources type «mise à jour» (si utilisé avec --distrib)\n"
+" des sources type «mise à jour» (si utilisé avec --"
+"distrib)\n"
#: ../urpmi.addmedia:68
#, c-format
msgid ""
" --xml-info - use the specific policy for downloading xml info files\n"
-" one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
msgstr ""
-" --xml-info - télécharger les fichiers xml-info avec la politique donnée\n"
-" parmi : never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" --xml-info - télécharger les fichiers xml-info avec la politique "
+"donnée\n"
+" parmi : never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
#: ../urpmi.addmedia:70
#, c-format
@@ -2745,7 +2762,8 @@ msgstr " --probe-synthesis - utiliser un fichier de synthèse.\n"
#: ../urpmi.addmedia:71
#, c-format
msgid " --probe-rpms - use rpm files (instead of synthesis).\n"
-msgstr " --probe-rpms - utiliser les fichiers rpm (au lieu des synthesis).\n"
+msgstr ""
+" --probe-rpms - utiliser les fichiers rpm (au lieu des synthesis).\n"
#: ../urpmi.addmedia:72
#, c-format
@@ -2764,7 +2782,8 @@ msgstr ""
#: ../urpmi.addmedia:76
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - avec --distrib, demande confirmation pour chaque média\n"
+msgstr ""
+" --interactive - avec --distrib, demande confirmation pour chaque média\n"
#: ../urpmi.addmedia:77
#, c-format
@@ -2776,32 +2795,31 @@ msgstr " --all-media - avec --distrib, ajoute tous les médias listés\n"
msgid " --virtual - create virtual media wich are always up-to-date.\n"
msgstr " --virtual - créer un média virtuel qui est toujours à jour,\n"
-#: ../urpmi.addmedia:79
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:79 ../urpmi.update:44
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - Supprime la vérification de la somme de contrôle MD5.\n"
+msgstr ""
+" --no-md5sum - Supprime la vérification de la somme de contrôle MD5.\n"
#: ../urpmi.addmedia:80
#, c-format
msgid " --nopubkey - don't import pubkey of added media\n"
-msgstr " --nopubkey - ne pas importer la clé publique des nouveaux médias\n"
+msgstr ""
+" --nopubkey - ne pas importer la clé publique des nouveaux médias\n"
#: ../urpmi.addmedia:81
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - ajoute le média dans la configuration, mais sans le mettre à jour.\n"
+msgstr ""
+" --raw - ajoute le média dans la configuration, mais sans le "
+"mettre à jour.\n"
-#: ../urpmi.addmedia:82
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - mode silencieux.\n"
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - mode verbeux.\n"
@@ -2819,7 +2837,8 @@ msgstr "pas d'arguments requis pour --distrib --mirrorlist <url>"
#: ../urpmi.addmedia:112
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "<url> incorrecte (pour un répertoire local, le chemin doit être absolu)"
+msgstr ""
+"<url> incorrecte (pour un répertoire local, le chemin doit être absolu)"
#: ../urpmi.addmedia:116
#, c-format
@@ -2850,8 +2869,7 @@ msgstr ""
"\n"
"Voulez-vous ajouter le média « %s » ?"
-#: ../urpmi.addmedia:155
-#: ../urpmi.addmedia:179
+#: ../urpmi.addmedia:155 ../urpmi.addmedia:179
#, c-format
msgid "unable to add medium"
msgstr "impossible d'ajouter le média"
@@ -2871,13 +2889,15 @@ msgstr "Impossible d'utiliser %s avec un média distant"
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urpmi.recover version %s\n"
"Copyright (C) 2006-2010 Mandriva.\n"
-"Ceci est un logiciel libre pouvant être redistribué selon les termes de la licence GNU GPL.\n"
+"Ceci est un logiciel libre pouvant être redistribué selon les termes de la "
+"licence GNU GPL.\n"
"\n"
"syntaxe :\n"
@@ -2889,22 +2909,29 @@ msgstr " --checkpoint - spécifier le point de départ de l'empaquetage\n"
#: ../urpmi.recover:35
#, c-format
msgid " --noclean - don't clean repackage directory on checkpoint\n"
-msgstr " --noclean - ne pas effacer le répertoire d'empaquetage au point de contrôle\n"
+msgstr ""
+" --noclean - ne pas effacer le répertoire d'empaquetage au point de "
+"contrôle\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
-msgstr " --list - liste les transactions depuis la date ou pendant la durée fournie comme argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
+msgstr ""
+" --list - liste les transactions depuis la date ou pendant la durée "
+"fournie comme argument\n"
#: ../urpmi.recover:38
#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all - liste toutes les transactions dans la base rpmdb (long)\n"
+msgstr ""
+" --list-all - liste toutes les transactions dans la base rpmdb (long)\n"
#: ../urpmi.recover:39
#, c-format
msgid " --list-safe - list transactions since checkpoint\n"
-msgstr " --list-safe - liste les transactions depuis le point de contrôle\n"
+msgstr ""
+" --list-safe - liste les transactions depuis le point de contrôle\n"
#: ../urpmi.recover:40
#, c-format
@@ -2988,8 +3015,7 @@ msgstr "Aucune transaction trouvée depuis %s\n"
msgid "You must be superuser to do this"
msgstr "Vous devez être connecté en superutilisateur pour faire çà"
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
#, c-format
msgid "Writing rpm macros file [%s]...\n"
msgstr "Ecriture du fichier de macros rpm [%s]...\n"
@@ -3071,12 +3097,14 @@ msgstr " --force-key - force la mise à jour de la clef gpg.\n"
#: ../urpmi.update:46
#, c-format
msgid " --ignore - don't update, mark the media as ignored.\n"
-msgstr " --ignore - sans mettre à jour, marquer le média en tant qu'ignoré.\n"
+msgstr ""
+" --ignore - sans mettre à jour, marquer le média en tant qu'ignoré.\n"
#: ../urpmi.update:47
#, c-format
msgid " --no-ignore - don't update, mark the media as enabled.\n"
-msgstr " --no-ignore - sans mettre à jour, marquer le média en tant qu'actif.\n"
+msgstr ""
+" --no-ignore - sans mettre à jour, marquer le média en tant qu'actif.\n"
#: ../urpmi.update:49
#, c-format
@@ -3086,7 +3114,8 @@ msgstr " --probe-rpms - ignorer le synthesis et utiliser les fichiers rpm\n"
#: ../urpmi.update:50
#, c-format
msgid " -a - select all enabled non-removable media.\n"
-msgstr " -a - sélectionner tous les médias non amovibles activés\n"
+msgstr ""
+" -a - sélectionner tous les médias non amovibles activés\n"
#: ../urpmi.update:51
#, c-format
@@ -3096,7 +3125,8 @@ msgstr " -f - forcer la mise à jour des fichiers synthesis.\n"
#: ../urpmi.update:52
#, c-format
msgid " -ff - really force updating synthesis\n"
-msgstr " -ff - vraiment forcer la mise à jour des fichiers synthesis\n"
+msgstr ""
+" -ff - vraiment forcer la mise à jour des fichiers synthesis\n"
#: ../urpmi.update:69
#, c-format
@@ -3137,19 +3167,23 @@ msgstr "activation du média %s"
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urpmq version %s\n"
"Copyright © 2000-2010 Mandriva.\n"
-"Ceci est un logiciel libre pouvant être redistribué selon les termes de la licence GNU GPL.\n"
+"Ceci est un logiciel libre pouvant être redistribué selon les termes de la "
+"licence GNU GPL.\n"
"\n"
"syntaxe :\n"
#: ../urpmq:48
#, c-format
-msgid " --searchmedia - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested (or updated) "
+"packages.\n"
msgstr ""
" --searchmedia - utiliser seulement le média spécifié pour rechercher\n"
" (ou mettre à jour) les paquetages\n"
@@ -3166,7 +3200,8 @@ msgid ""
" - list installed packages not available on any media.\n"
msgstr ""
" --not-available\n"
-" - liste les paquetages installés disponibles sur aucun média.\n"
+" - liste les paquetages installés disponibles sur aucun "
+"média.\n"
#: ../urpmq:57
#, c-format
@@ -3202,7 +3237,8 @@ msgstr " --list-aliases - lister les alias parallèles disponibles.\n"
#: ../urpmq:65
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - afficher la configuration sous forme d'un argument\n"
" pour urpmi.addmedia.\n"
@@ -3217,7 +3253,8 @@ msgstr ""
#: ../urpmq:67
#, c-format
msgid " --sources - print source URLs of selected packages\n"
-msgstr " --sources - affiche les URLs de source des paquetages sélectionnés\n"
+msgstr ""
+" --sources - affiche les URLs de source des paquetages sélectionnés\n"
#: ../urpmq:69
#, c-format
@@ -3287,7 +3324,8 @@ msgstr ""
#: ../urpmq:94
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
-msgstr " --whatrequires - recherche inversée des items nécessitant ce paquetage.\n"
+msgstr ""
+" --whatrequires - recherche inversée des items nécessitant ce paquetage.\n"
#: ../urpmq:95
#, c-format
@@ -3296,7 +3334,8 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr ""
" --whatrequires-recursive\n"
-" - recherche inversée étendue (paquetages virtuels compris).\n"
+" - recherche inversée étendue (paquetages virtuels "
+"compris).\n"
#: ../urpmq:97
#, c-format
@@ -3322,7 +3361,9 @@ msgstr " -g - afficher les groupes ainsi que les noms.\n"
#: ../urpmq:103
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - afficher les informations utiles de manière plus lisible.\n"
+msgstr ""
+" -i - afficher les informations utiles de manière plus "
+"lisible.\n"
#: ../urpmq:104
#, c-format
@@ -3348,9 +3389,12 @@ msgstr ""
#: ../urpmq:108
#, c-format
-msgid " -u - remove package if a more recent version is already installed.\n"
+msgid ""
+" -u - remove package if a more recent version is already "
+"installed.\n"
msgstr ""
-" -u - enlever le paquetage si une version plus récente est déjà\n"
+" -u - enlever le paquetage si une version plus récente est "
+"déjà\n"
" installée.\n"
#: ../urpmq:109
@@ -3366,7 +3410,9 @@ msgstr " -Y - comme -y mais n'est pas sensible à la casse\n"
#: ../urpmq:111
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " les noms ou fichiers rpm indiqués sur la ligne de commande sont interrogés.\n"
+msgstr ""
+" les noms ou fichiers rpm indiqués sur la ligne de commande sont "
+"interrogés.\n"
#: ../urpmq:158
#, c-format
@@ -3383,27 +3429,37 @@ msgstr "--list-nodes peut seulement être utilisé avec --parallel"
msgid "use -l to list files"
msgstr "utilisez -l pour lister les fichiers"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "pas d'information xml pour le média « %s », uniquement un résultat partiel pour le paquetage %s"
+msgstr ""
+"pas d'information xml pour le média « %s », uniquement un résultat partiel "
+"pour le paquetage %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "pas d'information xml pour le média « %s », uniquement un résultat partiel pour les paquetages %s"
+msgstr ""
+"pas d'information xml pour le média « %s », uniquement un résultat partiel "
+"pour les paquetages %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "pas d'information xml pour le média « %s », impossible de retourner un résultat pour le paquetage %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"pas d'information xml pour le média « %s », impossible de retourner un "
+"résultat pour le paquetage %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "pas d'information xml pour le média « %s », impossible de retourner un résultat pour les paquetages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"pas d'information xml pour le média « %s », impossible de retourner un "
+"résultat pour les paquetages %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Aucun Changelog trouvé\n"
@@ -3417,6 +3473,18 @@ msgid "Graphical front end to install RPM files"
msgstr "Interface graphique pour l'installation de paquetages RPM"
#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "L'installation a échoué, il manque les fichiers :\n"
+#~ "%s\n"
+#~ "Vous devriez mettre à jour votre base de données urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuler"
+
+#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
#~ "# Line format is : <date time of generation> <uid>\n"
#~ "# You can use uids to see the content of your uploads at this url :\n"
diff --git a/po/fur.po b/po/fur.po
index d50bfd75..924656e6 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-fur\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-05-21 14:55+0200\n"
"Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
"Language-Team: Furlan <gft@freelists.org>\n"
@@ -256,7 +256,7 @@ msgstr ""
msgid "Warning"
msgstr "Avertence"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -317,7 +317,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no rivi a recuperâ i pachets sorzint, o fermi"
@@ -354,38 +354,42 @@ msgstr "...copie falade: %s"
msgid "_Done"
msgstr "Fat"
-#: ../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 "Instalazion falade"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Instalazion falade, cualchi file al mancje:\n"
"%s\n"
"Tu podaressis ve voe di atualizâ il to database 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalazion falade"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Al è dut dizà instalât"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalazion finide"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "rimozion di %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "rinviament di urpmi"
@@ -515,57 +519,57 @@ msgstr "fal te regjistrazion dai pachets locâi"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "declarazion di proxy falade doprant le rie di comant\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: no rivi a lei il file rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Firme mancjant (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -612,7 +616,7 @@ msgstr "no rivi a scrivi tal file di configurazion [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "no rivi a scrivi tal file di configurazion [%s]"
@@ -727,22 +731,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "rimozion di %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...copie falade: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocol no cognosût definît par %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "nissun webfetch cjatât, chei sopuartâts e son: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "no rivi a gjestî il protocol: %s"
@@ -865,19 +869,12 @@ msgstr "database urpmi blocât"
msgid "aborting"
msgstr "Avertence"
-#: ../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 "Instalazion falade"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -885,14 +882,14 @@ msgstr ""
"%s\n"
"Tu podaressis ve voe di atualizâ il to database urpmi"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalazion falade"
-#: ../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 "
@@ -900,70 +897,70 @@ 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 "Instalazion falade"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Chiscj pachets e an firmis no valevulis"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Chiscj pachets e an firmis no valevulis"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Âstu voie di continuâ le instalazion?"
-#: ../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 "Instalazion falade"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "instalazion di %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "distribuzion di %s"
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "instalazion di %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "instalazion di %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "distribuzion di %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Provjo a instalâ cence controlâ les dipendencis? (s/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr ""
"Ajo di provâ le instalazion in maniere ancjimò plui sfuarçâde (--force)? (s/"
"N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Le instalazion e je pussibil"
@@ -1493,37 +1490,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Al è dut dizà instalât"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Al è dut dizà instalât"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Al è dut dizà instalât"
-#: ../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 "cause di conflits cun %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 "cause che %s no l'è sodisfat"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "ricercje dal miôr pachet %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "par tignî %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1532,7 +1529,7 @@ msgstr ""
"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\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"
@@ -1541,12 +1538,12 @@ msgstr ""
"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "par instalâ %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "cause cal mancje %s"
@@ -2581,12 +2578,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Scancele"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Frache Enter cuant che tu sês pront..."
@@ -3299,21 +3291,21 @@ msgstr "--list-nodes al po sedi doprât dome cun --parallel"
msgid "use -l to list files"
msgstr "no rivi a scrivi il file liste di \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"Note: fin che nissune font cirude e dopre hdlists, urpmf nol podarà dâ "
"nissun risultât\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Note: fin che nissune font cirude e dopre hdlists, urpmf nol podarà dâ "
"nissun risultât\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3321,7 +3313,7 @@ msgstr ""
"Note: fin che nissune font cirude e dopre hdlists, urpmf nol podarà dâ "
"nissun risultât\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3329,7 +3321,7 @@ msgstr ""
"Note: fin che nissune font cirude e dopre hdlists, urpmf nol podarà dâ "
"nissun risultât\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Nissun changelog cjatât\n"
@@ -3343,6 +3335,18 @@ msgstr "Gjestôr des Fonts Software"
msgid "Graphical front end to install RPM files"
msgstr ""
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Instalazion falade, cualchi file al mancje:\n"
+#~ "%s\n"
+#~ "Tu podaressis ve voe di atualizâ il to database urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Scancele"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "no rivi a scrivi tal file di configurazion [%s]"
diff --git a/po/ga.po b/po/ga.po
index 3679d361..d04f3af1 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 1.5\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: 2000-04-06 10:25+0100\n"
"Last-Translator: Proinnsias Breathnach <breatpro@dublin.ml.com>\n"
"Language-Team: Gaeilge <ga@li.org>\n"
@@ -217,7 +217,7 @@ msgstr "tá gach rud ann cheana féin"
msgid "Warning"
msgstr "Rabhadh"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ceart go Leor"
@@ -274,7 +274,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d pacáistí"
msgstr[1] "%d pacáistí"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
@@ -313,35 +313,39 @@ msgstr "Theip ar uathathmhéadú FAT: %s"
msgid "_Done"
msgstr "Críochnithe"
-#: ../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 "Theip ag feistiú"
+
+#: ../gurpmi2:405
+#, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Theip ag feistiú"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "tá gach rud ann cheana féin"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, fuzzy, c-format
msgid "Installation finished"
msgstr "Theip ag feistiú"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, fuzzy, c-format
msgid "removing %s"
msgstr "ag feistiú %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -468,57 +472,57 @@ msgstr ""
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "Teip ag leámh comhad chlár: %s"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr ""
-#: ../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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -565,7 +569,7 @@ msgstr "Téip ag oscailt comhad: %s\n"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:252 ../urpm/media.pm:541
+#: ../urpm/cfg.pm:254 ../urpm/media.pm:541
#, fuzzy, c-format
msgid "unable to write config file [%s]"
msgstr "Téip ag oscailt comhad: %s\n"
@@ -680,22 +684,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "ag feistiú %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "Theip ar uathathmhéadú FAT: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr ""
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr "Ag feistiál pacáiste %s"
@@ -816,31 +820,24 @@ msgstr ""
msgid "aborting"
msgstr "Rabhadh"
-#: ../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 "Theip ag feistiú"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr ""
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Theip ag feistiú"
-#: ../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 "
@@ -848,68 +845,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 "Theip ag feistiú"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
-#: ../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 "Theip ag feistiú"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "ag feistiú %s\n"
-#: ../urpm/main_loop.pm:237
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "ag feistiú %s\n"
+#: ../urpm/main_loop.pm:160
+#, c-format
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "ag feistiú %s\n"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, fuzzy, c-format
msgid "installing %s"
msgstr "ag feistiú %s\n"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "ag feistiú %s\n"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr ""
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "téama le haighaidh taobh an fuinneog"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:356 ../urpm/parallel.pm:299
+#: ../urpm/main_loop.pm:442 ../urpm/parallel.pm:299
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "Theip ag feistiú"
@@ -1435,56 +1432,56 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "tá gach rud ann cheana féin"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "tá gach rud ann cheana féin"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "tá gach rud ann cheana féin"
-#: ../urpm/select.pm:573 ../urpm/select.pm:660
+#: ../urpm/select.pm:572 ../urpm/select.pm:659
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "kdesu ar iarraidh"
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "kdesu ar iarraidh"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "téama le haighaidh taobh an fuinneog"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-#: ../urpm/select.pm:623
+#: ../urpm/select.pm:622
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "téama le haighaidh taobh an fuinneog"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "kdesu ar iarraidh"
@@ -2424,12 +2421,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Cealaigh"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Brú Enter nuair atá sin déanta agat..."
@@ -3084,29 +3076,29 @@ msgstr ""
msgid "use -l to list files"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr ""
@@ -3120,6 +3112,9 @@ msgstr "Suiteálaí Clófhoirne"
msgid "Graphical front end to install RPM files"
msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "Cealaigh"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "Téip ag oscailt comhad: %s\n"
diff --git a/po/gl.po b/po/gl.po
index 0cada24d..b4b2f81c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-gl\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: 2009-10-05 18:16+0200\n"
"Last-Translator: Alejo Pacín Jul <alejopj@gmail.com>\n"
"Language-Team: Galician <cooker-i18n@mandrivalinux.org>\n"
@@ -264,7 +264,7 @@ msgstr ""
msgid "Warning"
msgstr "Advertencia"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Aceptar"
@@ -324,7 +324,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 "Non foi posible consegui-los paquetes fonte, abortando"
@@ -361,38 +361,44 @@ msgstr "...fallo ó obter: %s"
msgid "_Done"
msgstr "_Feito"
-#: ../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 ""
+"Fallou a instalación, rpms incorrectos:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Erro ó instalar, faltan algúns ficheiros:\n"
"%s\n"
"Pode ser que desexe actualizar a base de datos do seu 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 "A instalación fallou:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Xa está todo instalado"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalación rematada"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "eliminando %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
@@ -521,59 +527,59 @@ msgstr "erro ó rexistra-los paquetes locais"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operación está prohibida mentres se executa en modo restrinxido"
-#: ../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 errónea do proxy na liña de comandos\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: non se puido ler o ficheiro rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "Expresións patrón:\n"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Falta a sinatura (%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 "Expresións patrón:\n"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"por defecto urpmf agarda unha expresión regular. Debería usar a opción \"--"
"literal\""
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "o directorio de chroot non existe"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Non se pode usar %s sen %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 "Non se pode usar %s con %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
@@ -622,7 +628,7 @@ msgstr "non foi posible ler o ficheiro de configuración [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "o soporte `%s' está definido dúas veces, abortando"
-#: ../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 "non foi posible escribir o ficheiro de configuración [%s]"
@@ -737,22 +743,22 @@ msgstr " %s%% completado, velocidade = %s"
msgid "retrieving %s"
msgstr "obtendo %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "obteuse %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocolo descoñecido definido por %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "non foi posible manexar o protocolo: %s"
@@ -875,21 +881,12 @@ msgstr "a base de datos de %s está bloqueada. Agardando..."
msgid "aborting"
msgstr "abortando"
-#: ../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 ""
-"Fallou a instalación, rpms incorrectos:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -897,7 +894,7 @@ msgstr ""
"%s\n"
"Pode ser que desexe actualizar a base de datos do seu urpmi"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -906,7 +903,7 @@ msgstr ""
"Fallou a instalación, rpms incorrectos:\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 "
@@ -914,68 +911,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 "A instalación fallou"
-
-#: ../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 "O seguinte paquete ten unha sinatura incorrecta"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Os seguintes paquetes teñen sinaturas incorrectas"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "¿Desexa continuar ca 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 "A instalación fallou"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "eliminando os rpms instalados (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "distribuíndo %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 "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 "distribuíndo %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "¿Probar a instalación sen comprobar as dependencias? (s/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "¿Probar a instalación con menos comprobacións (--force)? (s/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Os paquetes están actualizados"
-#: ../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 "A instalación é viable"
@@ -1508,37 +1505,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Non se poden instalar os paquetes %s"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "O paquete %s xa está instalado"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Os paquetes %s xa están instalados"
-#: ../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 "debido 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 "debido a %s non satisfeitas"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "para manter %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 +1544,7 @@ msgstr ""
"Teñe que eliminarse o seguinte paquete para poder actualizar outros:\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 +1553,12 @@ msgstr ""
"Teñen que eliminarse os seguintes paquetes para poder actualizar outros:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "debido a que falta %s"
@@ -2601,12 +2598,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Continuar ca instalación dun paquete?"
msgstr[1] "Continuar ca instalación dos %d paquetes?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Prema Enter cando estea montado..."
@@ -3327,21 +3319,21 @@ msgstr "--list-nodes só se pode usar con --parallel"
msgid "use -l to list files"
msgstr "use -l para listar os ficheiros"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"non hai información xml do soporte \"%s\", só resultado parcial para o "
"paquete %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"non hai información xml do soporte \"%s\", só resultado parcial para os "
"paquetes %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3349,7 +3341,7 @@ msgstr ""
"non hai información xml do soporte \"%s\", non foi posible devolver ningún "
"resultado para o paquete %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3357,7 +3349,7 @@ msgstr ""
"non hai información xml do soporte \"%s\", non foi posible devolver ningún "
"resultado para os paquetes %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Non se atopou o changelog\n"
@@ -3370,6 +3362,18 @@ msgstr "Instalador de Software"
msgid "Graphical front end to install RPM files"
msgstr "Interface gráfica para instalar ficheiros RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Erro ó instalar, faltan algúns ficheiros:\n"
+#~ "%s\n"
+#~ "Pode ser que desexe actualizar a base de datos do seu urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "Non se puido escribir o ficheiro"
diff --git a/po/he.po b/po/he.po
index ca1e3232..0b4b9e09 100644
--- a/po/he.po
+++ b/po/he.po
@@ -14,7 +14,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: 2008-03-22 15:41+0200\n"
"Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
"Language-Team: Hebrew\n"
@@ -256,7 +256,7 @@ msgstr ""
msgid "Warning"
msgstr "אזהרה"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "אישור"
@@ -316,7 +316,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(חבילה %d, %d MB)"
msgstr[1] "(%d חבילות, %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 "אין אפשרות לקרוא חבילות מהמאגר, הפעולה מתבטלת"
@@ -353,38 +353,44 @@ msgstr "...האיחזור נכשל: %s"
msgid "_Done"
msgstr "_סיום"
-#: ../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 ""
+"ההתקנה כשלה, חבילות תקולות:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"ההתקנה נכשלה מכיוון שכמה קבצים חסרים:\n"
"%s\n"
"יתכן ועליך לעדכן את מאגר הנתונים של 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 "ההתקנה כשלה:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "הכל כבר מותקן"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "ההתקנה הסתיימה"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "מסיר %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "מפעיל מחדש את urpmi"
@@ -513,57 +519,57 @@ msgstr "חלה שגיאה בעת רישום חבילות מקומיות"
msgid "This operation is forbidden while running in restricted mode"
msgstr "פעולה זו אינה מותרת באופן עבודה מוגבל"
-#: ../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 "הכרזת proxy לא תקנית בשורת הפקודה\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: לא יכול קובץ RPM \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "חתימה חסרה (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 "ספרית ה-chroot אינה קיימת"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "לא ניתן להשתמש ב-%s ללא %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 "לא ניתן להשתמש ב-%s עם %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "יותר מדי משתנים\n"
@@ -610,7 +616,7 @@ msgstr "לא ניתן לקרוא את קובץ התצורה [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "המקור '%s' מוגדר פעמים, נוטש"
-#: ../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 "כתיבת קובץ ההגדרות [%s] נכשלה"
@@ -725,22 +731,22 @@ msgstr " %s%% הורדו, מהירות = %s"
msgid "retrieving %s"
msgstr "מאחזר %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "אוחזרו %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "פרוטוקול לא מזוהה הוגדר עבור %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "לא נמצא webfetch מבין אלו הנתמכים: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "השימוש בפרוטוקול : %s נכשל"
@@ -861,21 +867,12 @@ msgstr "בסיס הנתונים %s נעול. ממתין..."
msgid "aborting"
msgstr "נוטש"
-#: ../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 ""
-"ההתקנה כשלה, חבילות תקולות:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -883,7 +880,7 @@ msgstr ""
"%s\n"
"יתכן ועליך לעדכן את מאגר הנתונים של urpmi"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -892,7 +889,7 @@ msgstr ""
"ההתקנה כשלה, חבילות תקולות:\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 "
@@ -900,68 +897,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 "ההתקנה נכשלה"
-
-#: ../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 "לחבילות הבאות יש בעיה בחתימות"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "לחבילות הבאות יש בעיה בחתימות"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "האם להמשיך בתהליך ההתקנה?"
-#: ../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 "ההתקנה נכשלה"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "מסיר חבילות מותקנות (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "מפיץ %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 "מתקין את %s מתוך %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "מתקין %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "מפיץ %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "האם לנסות להתקין ללא בדיקת תלויות? (כן/*לא)"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "האם לנסות להתקין תוך אילוץ תלויות (--force)? (כן/לא) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "החבילות עדכניות"
-#: ../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 "ניתן לבצע את ההתקנה"
@@ -1489,37 +1486,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "לא ניתן להתקין את החבילות %s"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "החבילה %s כבר מותקנת"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "החבילות %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 "עקב התנגשות עם %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 "עקב תלות %s שלא מולאה"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "מנסה לקדם %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "בכדי לשמור %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"
@@ -1528,7 +1525,7 @@ msgstr ""
"החבילה הבאה עומדת להימחק כדי שניתן יהיה לשדרג חבילות אחרות: \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"
@@ -1537,12 +1534,12 @@ msgstr ""
"החבילות הבאות עומדות להימחק בכדי שניתן יהיה לשדרג חבילות אחרות: \n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "בכדי להתקין %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "עקב %s חסר"
@@ -2542,12 +2539,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "להמשיך בהתקנת החבילה?"
msgstr[1] "להמשיך בהתקנת %d החבילות?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "ביטול"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr ""
@@ -3233,29 +3225,29 @@ msgstr "--list-nodes ניתן לשימוש רק עם --parallel"
msgid "use -l to list files"
msgstr ""
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "אין מידע ב-xml למקור \"%s\", תוצאה חלקית בלבד עבור החבילה %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr "אין מידע ב-xml למקור \"%s\", תוצאה חלקית בלבד עבור החבילות %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr "אין מידע ב-xml למקור \"%s\", אין כל תוצאה עבור החבילה %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr "אין מידע ב-xml למקור \"%s\", אין כל תוצאה עבור החבילות %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "לא נמצאה רשימת שינויים\n"
@@ -3268,6 +3260,18 @@ msgstr "מתקין חבילות תוכנה"
msgid "Graphical front end to install RPM files"
msgstr "ממשק גרפי להתקנת חבילות RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "ההתקנה נכשלה מכיוון שכמה קבצים חסרים:\n"
+#~ "%s\n"
+#~ "יתכן ועליך לעדכן את מאגר הנתונים של urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "ביטול"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "לא מצליח לכתוב קובץ"
diff --git a/po/hi.po b/po/hi.po
index 53ea8613..c951e708 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-hi\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: 2005-08-23 20:11+0530\n"
"Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
"Language-Team: Hindi, India\n"
@@ -255,7 +255,7 @@ msgstr ""
msgid "Warning"
msgstr "चेतावनी"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "ओ०के०"
@@ -317,7 +317,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d पैकेज"
msgstr[1] "%d पैकेज"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "स्रोत्र पैकेजों को पाने में असमर्थ, कार्यक्रम विफ़ल किया जा रहा है"
@@ -354,38 +354,42 @@ msgstr "...पुनः प्राप्त करने में असफ़
msgid "_Done"
msgstr "किया गया(_D)"
-#: ../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 "संसाधन असफ़ल"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"संसाधन असफ़ल, कुछ संचिकाऐं नहीं मिली है:\n"
"%s\n"
"आपको अपना यू०आर०पी०एम०आई० डाटाबेस को अपडेट करना चाहिए"
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "संसाधन असफ़ल"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "सभी कुछ पहिले से ही संसाधित है"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "संसाधन समाप्त"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "%s को हटाया जा रहा है"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "यू०आर०पी०एम०आई० को पुनः आरम्भ किया जा रहा है"
@@ -514,57 +518,57 @@ msgstr "स्थानीय पैकेजों का पंजीकरण
msgid "This operation is forbidden while running in restricted mode"
msgstr "सीमित विधा में चलते समय, इस संक्रिया को मनाही है"
-#: ../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 "निर्देश वाक्य पर निकृष्ट प्रोक्सी की घोषणा\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: आर०पी०एम० संचिका \"%s\" को नहीं पढ़ सकता है\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "विलुप्त हस्ताक्षर (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -611,7 +615,7 @@ msgstr "संरचना-संचिका [%s] को लिखने मे
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "संरचना-संचिका [%s] को लिखने में असमर्थ"
@@ -726,22 +730,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "%s को हटाया जा रहा है"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "अज्ञात प्रोटोकॉल %s के लिए परिभाषित"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "कोई वेबफ़ेच्च नहीं मिला, समर्थित वेबफ़ेच्च है: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "प्रोटोकॉल: %s को काबू करने में असमर्थ"
@@ -864,19 +868,12 @@ msgstr "यू०आर०पी०एम०आई० डाटाबेस ब
msgid "aborting"
msgstr "चेतावनी"
-#: ../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 "संसाधन असफ़ल"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -884,14 +881,14 @@ msgstr ""
"%s\n"
"आपको अपना यू०आर०पी०एम०आई० डाटाबेस को अपडेट करना चाहिए"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "संसाधन असफ़ल"
-#: ../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 "
@@ -899,68 +896,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 "संसाधन असफ़ल"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "क्या आप संसाधन जारी रखना चाहते है ?"
-#: ../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 "संसाधन असफ़ल"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%s को %s से संसाधित किया जा रहा है"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "%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 "%s को %s से संसाधित किया जा रहा है"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "%s का संसाधन किया जा रहा है"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "%s वितिरण किया जा रहा है"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "संसाधन का प्रयास बिना आधिनताओं की जाँच किये हुए किया जाये? (हाँ/ना)(y/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "संसाधन का प्रयास और जोर से (बलपूर्वक) किया जाये (--force)? (हाँ/ना)(y/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "संसाधन संभव है"
@@ -1491,37 +1488,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "सभी कुछ पहिले से ही संसाधित है"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "सभी कुछ पहिले से ही संसाधित है"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "सभी कुछ पहिले से ही संसाधित है"
-#: ../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 "%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 "असन्तुष्ट %s के कारण"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "%s को प्रोत्साहित करने का प्रयास किया जा रहा है"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "%s को रखने के लिए"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1530,7 +1527,7 @@ msgstr ""
"अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\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"
@@ -1539,12 +1536,12 @@ msgstr ""
"अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "%s को संसाधित के लिए"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "%s के ना मिलने के कारण"
@@ -2560,12 +2557,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "निरस्त"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "तैयार होने पर इन्टर (Enter) कुंजी को दबायें..."
@@ -3275,21 +3267,21 @@ msgstr "--list-nodes को सिर्फ़ --parallel के साथ उप
msgid "use -l to list files"
msgstr "\"%s\" की सूची संचिका को लिखने में असमर्थ"
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"सूचना: क्योंकि खोज किये गये माध्यम ने एचडीसूचियों का उपयोग किया, अतैव यूआरपीएमएफ़ किसी "
"परिणाम को बताने में असमर्थ रहा था\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"सूचना: क्योंकि खोज किये गये माध्यम ने एचडीसूचियों का उपयोग किया, अतैव यूआरपीएमएफ़ किसी "
"परिणाम को बताने में असमर्थ रहा था\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3297,7 +3289,7 @@ msgstr ""
"सूचना: क्योंकि खोज किये गये माध्यम ने एचडीसूचियों का उपयोग किया, अतैव यूआरपीएमएफ़ किसी "
"परिणाम को बताने में असमर्थ रहा था\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3305,7 +3297,7 @@ msgstr ""
"सूचना: क्योंकि खोज किये गये माध्यम ने एचडीसूचियों का उपयोग किया, अतैव यूआरपीएमएफ़ किसी "
"परिणाम को बताने में असमर्थ रहा था\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "कोई परिवर्तनलॉग नहीं मिला\n"
@@ -3318,6 +3310,18 @@ msgstr "सॉफ़्टवेयर स्थापन-कर्ता"
msgid "Graphical front end to install RPM files"
msgstr "आरपीएम संचिकाओं के संसाधित करने के लिए ग्रफ़िक्ल फ़्रन्ट एन्ड"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "संसाधन असफ़ल, कुछ संचिकाऐं नहीं मिली है:\n"
+#~ "%s\n"
+#~ "आपको अपना यू०आर०पी०एम०आई० डाटाबेस को अपडेट करना चाहिए"
+
+#~ msgid "Cancel"
+#~ msgstr "निरस्त"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "संरचना-संचिका [%s] को निर्माण नहीं कर सकता है"
diff --git a/po/hr.po b/po/hr.po
index 7f872ec0..13851e33 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 0\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: 2005-01-04 21:27+CET\n"
"Last-Translator: auto\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -232,7 +232,7 @@ msgstr ""
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "U redu"
@@ -292,7 +292,7 @@ msgstr[0] "%d paketa"
msgstr[1] "%d paketa"
msgstr[2] "%d paketa"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
@@ -329,37 +329,41 @@ msgstr "...dohvaćanje neuspješno: %s"
msgid "_Done"
msgstr "Gotov"
-#: ../gurpmi2:402
+#: ../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 "Instalacija nije uspjela"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Instalacija neuspješna, neke datoteke nedostaju.\n"
"Možda ćete poželjeti dograditi vašu urpmi bazu"
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalacija nije uspjela"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "sve je već instalirano"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalirano"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, fuzzy, c-format
msgid "removing %s"
msgstr "Uklanjam %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "restartam urpmi"
@@ -490,57 +494,57 @@ msgstr "greška prilikom registriranja lokalnih paketa"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "pogrešna deklaracija proxyja u komandnom retku\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nedostaje potpis (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -587,7 +591,7 @@ msgstr "ne mogu zapisati config datoteku [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "ne mogu zapisati config datoteku [%s]"
@@ -702,22 +706,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "Uklanjam %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...dohvaćanje neuspješno: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "definiran je nepoznati protokol za %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr "ne mogu pristupiti rpm datoteci [%s]"
@@ -840,33 +844,26 @@ msgstr "urpmi baza zaključana"
msgid "aborting"
msgstr "Upozorenje"
-#: ../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 "Instalacija nije uspjela"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
"Instalacija neuspješna, neke datoteke nedostaju.\n"
"Možda ćete poželjeti dograditi vašu urpmi bazu"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalacija nije uspjela"
-#: ../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 "
@@ -874,68 +871,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 "Instalacija nije uspjela"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Slijedeći paketi će biti instalirani"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "Slijedeći paketi će biti instalirani"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Želite li nastaviti instalaciju?"
-#: ../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 "Instalacija nije uspjela"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "instaliram %s\n"
-#: ../urpm/main_loop.pm:237
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "instaliram %s\n"
+#: ../urpm/main_loop.pm:160
+#, c-format
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "instaliram %s\n"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, fuzzy, c-format
msgid "installing %s"
msgstr "instaliram %s\n"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "instaliram %s\n"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Pokušati instalaciju bez provjere ovisnosti (d/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Pokušati instalaciju još snažnije (--force)? (d/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:356 ../urpm/parallel.pm:299
+#: ../urpm/main_loop.pm:442 ../urpm/parallel.pm:299
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "Problem u instalaciji"
@@ -1464,56 +1461,56 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "sve je već instalirano"
-#: ../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 "zbog sukoba sa %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 "zbog nezadovoljavajućeg %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "odabirem %s izabiranjem datoteka"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "kako bi se zadržalo %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr "Slijedeći paketi će biti uklonjeni"
-#: ../urpm/select.pm:623
+#: ../urpm/select.pm:622
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr "Slijedeći paketi će biti uklonjeni"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "kako bi se zadržalo %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "zbog nezadovoljavajućeg %s"
@@ -2533,12 +2530,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Odustani"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Pritisnite Enter kada ste gotovi..."
@@ -3245,29 +3237,29 @@ msgstr " --all - ispiši sve oznake."
msgid "use -l to list files"
msgstr "ne mogu zapisati list datoteku za \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Nije pronađena ni jedna slika"
@@ -3282,6 +3274,18 @@ msgid "Graphical front end to install RPM files"
msgstr "Grafičko sučelje za instaliranje RPM datoteka"
#, fuzzy
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Instalacija neuspješna, neke datoteke nedostaju.\n"
+#~ "Možda ćete poželjeti dograditi vašu urpmi bazu"
+
+#~ msgid "Cancel"
+#~ msgstr "Odustani"
+
+#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "ne mogu zapisati config datoteku [%s]"
diff --git a/po/hu.po b/po/hu.po
index d6a8d70b..895abefe 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-2010.0\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: 2009-10-26 09:01+0100\n"
"Last-Translator: Gergely Lónyai <aleph@mandriva.org>\n"
"Language-Team: Hungarian <aleph@mandriva.org>\n"
@@ -264,7 +264,7 @@ msgstr ""
msgid "Warning"
msgstr "Figyelmeztetés"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "OK"
@@ -325,7 +325,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d csomag, %d MB)"
msgstr[1] "(%d csomag, %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 "a forráscsomagok nem elérhetők, ezért a művelet félbeszakad"
@@ -362,38 +362,41 @@ msgstr "...a behozatal sikertelen: %s"
msgid "_Done"
msgstr "_Kész"
-#: ../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 ""
-"A telepítés nem sikerült, mivel bizonyos fájlok hiányoznak:\n"
-"%s\n"
-"Szükséges frissíteni az urpmi adatbázisát."
+"A telepítés nem sikerült, néhány fájl hiányzik:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Érdemes lehet frissíteni az urpmi adatbázist."
-#: ../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 "A telepítés nem sikerült:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "A csomag(ok) már telepítve van(nak)"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "A telepítés befejeződött"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "\"%s\" eltávolítása"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "az urpmi újraindítása"
@@ -524,59 +527,59 @@ msgstr "hiba a helyi csomagok regisztrálásakor"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Korlátozott mód esetén ez a művelet nem végezhető el"
-#: ../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 "helytelen proxy-megadás a parancssorban\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: egy RPM-fájl nem olvasható: \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "váratlan kifejezés: %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "a %s előtt hiányzik a kifejezés"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "váratlan kifejezés: %s (javasolt a -a vagy -o használata)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "nincs a kifejezés lezárárva"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"alapértelmezésben az urpmi egy regexpet vár, ezt megerősítheti a \"--literal"
"\" opcióval"
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-könyvtár nem létezik"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "%s nem használható %s nélkül"
-#: ../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 "%s nem használható ezzel: %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Túl sok argumentum\n"
@@ -625,7 +628,7 @@ msgstr "nem sikerült olvasni a(z) \"%s\" beállítási fájlt"
msgid "medium `%s' is defined twice, aborting"
msgstr "\"%s\" adatforrás kétszer van megadva - megszakítás"
-#: ../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 "a beállítások mentése nem sikerült: \"%s\""
@@ -740,22 +743,22 @@ msgstr " %s%% megvan, sebesség: %s"
msgid "retrieving %s"
msgstr "\"%s\" behozatala"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "\"%s\" behozatala megtörtént"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "ismeretlen protokoll van definiálva ehhez: \"%s\""
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "nem található webes letöltő; a támogatott letöltők: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "protokollkezelés sikertelen: %s"
@@ -878,26 +881,17 @@ msgstr "a(z) %s adatbázis zárolt - várakozás..."
msgid "aborting"
msgstr "leállítás"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Ismét?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"A telepítés nem sikerült, néhány fájl hiányzik:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Érdemes lehet frissíteni az urpmi adatbázist."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -906,7 +900,7 @@ msgstr ""
"A telepítés nem sikerült, hibás RPM-ek:\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 "
@@ -917,68 +911,68 @@ msgstr ""
"(%s van, %s kellene).\n"
"Mindenképpen folytatja?"
-#: ../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 "A telepítés nem sikerült"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Menjen mindenféleképp?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "A következő csomag helytelen aláírást tartalmaz:"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "A következő csomagok helytelen aláírást tartalmaznak:"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Szeretné folytatni a telepítést?"
-#: ../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 "A telepítés nem sikerült"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "telepített RPM-csomagok eltávolítása (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "%s elosztása"
+msgid "Try to continue anyway?"
+msgstr "Menjen mindenféleképp?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "%s telepítése innen: %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "%s telepítése folyik"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "%s elosztása"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Próbáljam meg a telepítést a függőségek ellenőrzése nélkül?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Ha problémát okozhat, akkor is legyen telepítés (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "A csomagok naprakészek"
-#: ../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 "A telepítés elvégezhető"
@@ -1532,37 +1526,37 @@ msgstr "Használja a \"-a\" kapcsolót minden kijelöléséhez"
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "%s csomagot talált az urpmi db-ben, de ezek nem telepíthetőek"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "A(z) \"%s\" csomag már telepítve van"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "A(z) \"%s\" csomagok már telepítve vannak"
-#: ../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 "ezzel való ütközés miatt: \"%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 "\"%s\" igényei miatt"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "a legalkalmasabb \"%s\" keresése"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "\"%s\" megtartása érdekében"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1572,7 +1566,7 @@ msgstr ""
"frissíthetők legyenek:\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"
@@ -1582,12 +1576,12 @@ msgstr ""
"frissíthetők legyenek:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "\"%s\" telepítése érdekében"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "\"%s\" hiánya miatt"
@@ -2648,12 +2642,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Kívánja folytatni a fenti csomag telepítését?"
msgstr[1] "Kívánja folytatni a fenti %d csomag telepítését?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Amikor csatolta, nyomja le az Enter billentyűt..."
@@ -3413,21 +3402,21 @@ msgstr "a --list-nodes csak a --parallel opcióval használható"
msgid "use -l to list files"
msgstr "használja a -l opciót a fájllistához"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény "
"van a(z) \"%s\" csomaghoz"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény "
"van a(z) \"%s\" csomagokhoz"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3435,7 +3424,7 @@ msgstr ""
"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s"
"\" csomaghoz"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3443,7 +3432,7 @@ msgstr ""
"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s"
"\" csomagokhoz"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Változási lista nem található\n"
@@ -3456,6 +3445,18 @@ msgstr "Szoftvertelepítő"
msgid "Graphical front end to install RPM files"
msgstr "Grafikus felület RPM csomagok telepítéséhez"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "A telepítés nem sikerült, mivel bizonyos fájlok hiányoznak:\n"
+#~ "%s\n"
+#~ "Szükséges frissíteni az urpmi adatbázisát."
+
+#~ msgid "Cancel"
+#~ msgstr "Mégsem"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/id.po b/po/id.po
index 928810af..94e0dc61 100644
--- a/po/id.po
+++ b/po/id.po
@@ -15,7 +15,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: 2007-03-22 08:14+0700\n"
"Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
"Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -262,7 +262,7 @@ msgstr ""
msgid "Warning"
msgstr "Peringatan"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -322,7 +322,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paket, %d MB)"
msgstr[1] "(%d paket, %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 "tidak dapat mengambil paket sumber, dibatalkan"
@@ -359,38 +359,42 @@ msgstr "...pengambilan gagal: %s"
msgid "_Done"
msgstr "_Selesai"
-#: ../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 "Installasi gagal pada node %s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Instalasi gagal, beberapa file hilang:\n"
"%s\n"
"Anda mungkin perlu meng-update database urpmi Anda"
-#: ../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 "Instalasi gagal:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Semua paket telah terinstal"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalasi selesai"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "menghapus %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "jalankan ulang urpmi"
@@ -519,57 +523,57 @@ msgstr "kesalahan meregistrasi paket lokal"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operasi ini dilarang ketika berjalan dalam mode terbatas"
-#: ../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 "deklarasi proxy buruk pada pada perintah baris\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: tidak dapat membaca file rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "Pola ekspresi:\n"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Tanda tangan hilang (%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 "Pola ekspresi:\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 "Direktori chroot tidak ada"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Tidak bisa menggunakan %s tanpa %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 "Tidak bisa menggunakan %s dengan %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Terlalu banyak argumen\n"
@@ -616,7 +620,7 @@ msgstr "tidak dapat membaca file konfigurasi [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "media `%s' didefinisikan dua kali, membatalkan diri"
-#: ../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 "gagal menulis ke file konfigurasi [%s]"
@@ -731,22 +735,22 @@ msgstr " %s%% selesai, kecepatan = %s"
msgid "retrieving %s"
msgstr "menerima %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "menerima %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protokol tidak dikenal didefinisikan untuk %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "webfetch tidak ditemukan, webfetch yang didukung adalah: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "gagal menangani protokol: %s"
@@ -868,19 +872,12 @@ msgstr "database %s terkunci"
msgid "aborting"
msgstr "Peringatan"
-#: ../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 "Installasi gagal pada node %s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -888,14 +885,14 @@ msgstr ""
"%s\n"
"Anda mungkin perlu meng-update database urpmi Anda"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Installasi gagal pada node %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 "
@@ -903,68 +900,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 "Instalasi gagal"
-
-#: ../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 "Paket berikut memiliki tandatangan yang cacat"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Paket berikut memiliki tandatangan yang cacat"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Apakah Anda hendak melanjutkan instalasi ?"
-#: ../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 "Instalasi gagal"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "menghapus rpm yang terinstall (%s) dari %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "sebarkan %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 "menginstall %s dari %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "menginstall %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "sebarkan %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Mencoba installasi tanpa menguji ketergantungan? (y/T) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Mencoba installasi lebih keras (--force)? (y/T) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Paket-paket sudah update"
-#: ../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 "Installasi dimungkinkan"
@@ -1492,37 +1489,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Paket-paket %s tidak bisa diinstall"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Paket %s telah terinstall"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Paket-paket %s telah terinstal"
-#: ../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 "karena konflik dengan %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 "karena %s tidak terpenuhi"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "mencoba mempromosikan %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "untuk menjaga %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"
@@ -1531,7 +1528,7 @@ msgstr ""
"Paket berikut harus dihapus agar yang lain dapat di-upgrade:\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"
@@ -1540,12 +1537,12 @@ msgstr ""
"Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "untuk menginstall %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "karena %s hilang"
@@ -2571,12 +2568,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Lanjutkan dengan installasi satu paket?"
msgstr[1] "Lanjutkan dengan installasi paket-paket %d?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Batal"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Tekan [Enter] jika siap.."
@@ -3298,19 +3290,19 @@ msgstr "--list-nodes hanya dapat dipakai dengan --parallel"
msgid "use -l to list files"
msgstr "gagal menulis file list \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"tidak ada hdlist untuk media \"%s\", hanya hasil parsial untuk paket %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"tidak ada hdlist untuk media \"%s\", hanya hasil parsial untuk paket-paket %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3318,7 +3310,7 @@ msgstr ""
"tidak ada hdlist untuk media \"%s\", tidak dapat mengembalikan hasil untuk "
"paket %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3326,7 +3318,7 @@ msgstr ""
"tidak ada hdlist untuk media \"%s\", tidak dapat mengembalikan hasil untuk "
"paket-paket %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Changelog tidak ditemukan\n"
@@ -3339,6 +3331,18 @@ msgstr "Penginstall perangkat lunak"
msgid "Graphical front end to install RPM files"
msgstr "Tampilan grafis untuk menginstall file RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Instalasi gagal, beberapa file hilang:\n"
+#~ "%s\n"
+#~ "Anda mungkin perlu meng-update database urpmi Anda"
+
+#~ msgid "Cancel"
+#~ msgstr "Batal"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "gagal menulis ke file konfigurasi [%s]"
diff --git a/po/is.po b/po/is.po
index d7f7d502..a97649c9 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,7 +8,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: 2009-03-30 17:08+0000\n"
"Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
"Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -256,7 +256,7 @@ msgstr ""
msgid "Warning"
msgstr "Aðvörun"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Í lagi"
@@ -316,7 +316,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakki, %d MB)"
msgstr[1] "(%d pakkar, %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 "Get ekki sótt frumpakka, hætti við"
@@ -353,38 +353,41 @@ msgstr "...mistókst að sækja: %s"
msgid "_Done"
msgstr "_Lokið"
-#: ../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 ""
-"Uppsetning brást, sumar skrár vantar:\n"
-"%s\n"
-"Þú ættir sennilega að uppfæra urpmi gagnagrunninn"
+"Innsetning brást, sumar skrár vantar:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Þú gætir þurft að uppfæra urpmi gagnagrunninn."
-#: ../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 "Innsetning brást:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Allt er nú þegar komið inn"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Innsetningu lokið"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "fjarlægi %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "endurræsi urpmi"
@@ -513,59 +516,59 @@ msgstr "villa við að skrá staðbundna pakka"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Þessi aðgerð er bönnuð þegar keyrt er í vernduðum ham"
-#: ../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 "röng staðgengils-skilgreining á skipanalínu\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: get ekki lesið rpm skrá \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "óvænt segð %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "Vantar segð á undan %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "óvænt segð %s (tillaga: notið -a eða -o ?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "engin segð sem ætti að loka"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"sjálfgefið væntir urpmf reglulegrar segðar (regexp) þú ættir að nota valkost "
"\"--literal\""
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot mappa er ekki til"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Get ekki notað %s án %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 "Get ekki notað %s með %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Of mörg viðföng\n"
@@ -614,7 +617,7 @@ msgstr "get ekki lesið uppsetningarskrá [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "miðill `%s' er tilgreindur tvisvar, hætti"
-#: ../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 "get ekki skrifað í uppsetningarskrá [%s]"
@@ -730,22 +733,22 @@ msgstr " %s%% lokið, hraði = %s"
msgid "retrieving %s"
msgstr "sæki %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "sótti %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "óþekkt samskiptaregla skilgreind fyrir %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "forrit til að sækja af vef fannst ekki, studd forrit eru: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "skil ekki samskiptareglu: %s"
@@ -867,26 +870,17 @@ msgstr "%s gagnagrunnur læstur. bíð..."
msgid "aborting"
msgstr "hætti við"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Reyna aftur?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Innsetning brást, sumar skrár vantar:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Þú gætir þurft að uppfæra urpmi gagnagrunninn."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -895,7 +889,7 @@ msgstr ""
"Innsetning brást, gallaðir rpm-pakkar:\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 "
@@ -903,68 +897,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 "Innsetning brást"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Reyna samt að halda áfram?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Eftirfarandi pakki er með gallaða undirskrift"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Eftirfarandi pakkar eru með gallaðar undirskriftir"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Viltu halda áfram með uppsetningu ?"
-#: ../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 "Innsetning brást"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "fjarlægi uppsett rpm (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "miðla %s"
+msgid "Try to continue anyway?"
+msgstr "Reyna samt að halda áfram?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "set inn %s frá %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "Set inn %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "miðla %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Prófa innsetningu án þess að athuga hvaða skrár þarf?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Prófa sterkari innsetningu (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Pakkar eru uppfærðir"
-#: ../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 "Innsetning er möguleg"
@@ -1499,37 +1493,37 @@ msgstr "Til að nota þá alla, ættir þú ættir að nota \"-a\""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "fann pakka %s í urpmi gagnagrunni, en enginn er uppsettur "
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Pakki %s er nú þegar kominn inn"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Pakkar %s eru nú þegar komnir inn"
-#: ../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 "vegna árekstra við %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 "vegna óuppfylltra %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "þegar reynt var að setja upp %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "til þess að halda %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"
@@ -1538,7 +1532,7 @@ msgstr ""
"Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\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"
@@ -1547,12 +1541,12 @@ msgstr ""
"Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "til þess að setja inn %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "vegna þess að %s vantar"
@@ -2575,12 +2569,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Halda áfram með uppsetningu á einum pakka?"
msgstr[1] "Halda áfram með uppsetningu á %d pökkum?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Hætta við"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Sláðu á \"Enter\" þegar tengt..."
@@ -3303,35 +3292,35 @@ msgstr "--list-nodes er aðeins hægt að nota með --parallel"
msgid "use -l to list files"
msgstr "nota -l til a að lista skrár"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"engin XML-info skrá fyrir miðil \"%s\", aðeins takmarkaðar upplýsingar fyrir "
"pakka %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"engin XML-info skrá fyrir miðil \"%s\", aðeins takmarkaðar upplýsingar fyrir "
"pakka %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"engin XML-info skrá fyrir miðil \"%s\", fann engar upplýsingar um pakka %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"engin XML-info skrá fyrir miðil \"%s\", fann engar upplýsingar fyrir pakka %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Enginn breytilisti fannst\n"
@@ -3344,6 +3333,18 @@ msgstr "Hugbúnaðar-uppsetning"
msgid "Graphical front end to install RPM files"
msgstr "Grrafískt viðmót til aðstoðar við innsetningu RPM skráa"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Uppsetning brást, sumar skrár vantar:\n"
+#~ "%s\n"
+#~ "Þú ættir sennilega að uppfæra urpmi gagnagrunninn"
+
+#~ msgid "Cancel"
+#~ msgstr "Hætta við"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "Get ekki skrifað skrá"
diff --git a/po/it.po b/po/it.po
index fedee7e7..95da149d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2012-03-21 08:44+0100\n"
+"POT-Creation-Date: 2012-06-08 19:19+0200\n"
"PO-Revision-Date: 2012-03-22 17:58+0100\n"
"Last-Translator: Matteo Pasotti <matteo@xquiet.eu>\n"
"Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -263,7 +263,7 @@ msgstr ""
msgid "Warning"
msgstr "Attenzione"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -323,7 +323,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pacchetto, %d MB)"
msgstr[1] "(%d pacchetti, %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 "impossibile recuperare i pacchetti dalla fonte, interrompo"
@@ -360,38 +360,41 @@ msgstr "...recupero fallito: %s"
msgid "_Done"
msgstr "_Fatto"
-#: ../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 ""
-"Installazione fallita, alcuni file sono mancanti:\n"
-"%s\n"
-"Potresti voler aggiornare il tuo database di urpmi"
+"Installazione fallita, mancano alcuni file:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Sarebbe utile aggiornare il database 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 "Installazione fallita:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "È già tutto installato"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Installazione completata"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "rimozione di %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "Riavvio di urpmi"
@@ -523,57 +526,57 @@ msgstr "errore durante la registrazione dei pacchetti locali"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Quest'operazione non è consentita in modalità \"restricted\""
-#: ../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 "errata dichiarazione di proxy usando la linea di comando\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: impossibile leggere il file rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "espressione inattesa %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "manca un'espressione prima di %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "espressione inattesa %s (forse dovresti usare -a o -o)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "nessuna espressione da chiudere"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "urpmf si aspetta una regexp, se non usi l'opzione « --literal »."
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "La directory chroot non esiste"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Impossibile utilizzare %s senza %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 "Impossibile utilizzare %s con %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Troppi argomenti\n"
@@ -622,7 +625,7 @@ msgstr "impossibile leggere il file di configurazione [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "il supporto %s è stato definito due volte. Interrompo"
-#: ../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 "impossibile scrivere il file di configurazione [%s]"
@@ -739,24 +742,24 @@ msgstr " %s%% completato, velocità = %s"
msgid "retrieving %s"
msgstr "recupero di %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "%s recuperato"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocollo sconosciuto definito per %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
"non è stato trovato nessun programma per recuperare pacchetti,\n"
"quelli supportati sono: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "impossibile gestire il protocollo: %s"
@@ -879,26 +882,17 @@ msgstr "Il database %s è bloccato. Attendi..."
msgid "aborting"
msgstr "Interruzione"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Riprovare?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Installazione fallita, mancano alcuni file:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Sarebbe utile aggiornare il database urpmi."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -907,7 +901,7 @@ msgstr ""
"Installazione fallita, rpm difettosi:\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 "
@@ -918,68 +912,68 @@ msgstr ""
"(%s necessario, %s disponibile).\n"
"Desideri comunque continuare?"
-#: ../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 "Installazione non riuscita"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Proseguire comunque?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Questo pacchetto ha una firma errata"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "I seguenti pacchetti hanno delle firme errate"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Vuoi proseguire con l'installazione?"
-#: ../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 "Installazione non riuscita"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "rimozione degli rpm installati (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "distribuzione di %s"
+msgid "Try to continue anyway?"
+msgstr "Proseguire comunque?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "installazione di %s da %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "installazione di %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "distribuzione di %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Provo l'installazione senza controllare le dipendenze?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Provo l'installazione in modo ancora più forzato (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "I pacchetti sono aggiornati"
-#: ../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'installazione è possibile"
@@ -1529,37 +1523,37 @@ msgstr "Dovresti aggiungere \"-a\" per usarli tutti"
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "trovati i pacchetti %s nel db di urpmi, ma nessuno è installato"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Il pacchetto %s è già installato"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "I pacchetti %s sono già installati"
-#: ../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 "per conflitti 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 "perché non è soddisfatto %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "sto selezionando %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "per conservare %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"
@@ -1568,7 +1562,7 @@ msgstr ""
"Questo pacchetto deve essere rimosso per poterne aggiornare altri:\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"
@@ -1577,12 +1571,12 @@ msgstr ""
"Questi pacchetti devono essere rimossi per poterne aggiornare altri:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "per installare %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "perché manca %s"
@@ -2637,12 +2631,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Procedo con l'installazione di un pacchetto?"
msgstr[1] "Procedo con l'installazione di %d pacchetti?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Annulla"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Premi Invio dopo averlo montato..."
@@ -3385,21 +3374,21 @@ msgstr "--list-nodes può essere usato solo con --parallel"
msgid "use -l to list files"
msgstr "utilizza -l per elencare i file"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"manca xml-info per il supporto \"%s\", solo risultati parziali per il "
"pacchetto %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"manca xml-info per il supporto \"%s\", solo risultati parziali per i "
"pacchetti %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3407,7 +3396,7 @@ msgstr ""
"manca xml-info per il supporto \"%s\", impossibile fornire risultati per il "
"pacchetto %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3415,7 +3404,7 @@ msgstr ""
"manca xml-info per il supporto \"%s\", impossibile fornire risultati per i "
"pacchetti %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Nessun elenco delle modifiche trovato\n"
@@ -3429,6 +3418,18 @@ msgid "Graphical front end to install RPM files"
msgstr "Interrfaccia grafica per l'installazione dei pacchetti RPM"
#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Installazione fallita, alcuni file sono mancanti:\n"
+#~ "%s\n"
+#~ "Potresti voler aggiornare il tuo database di urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Annulla"
+
+#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
#~ "# Line format is : <date time of generation> <uid>\n"
#~ "# You can use uids to see the content of your uploads at this url :\n"
diff --git a/po/ja.po b/po/ja.po
index 16efe07c..d2930a96 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-ja\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: 2009-03-22 20:56+0900\n"
"Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
"Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -251,7 +251,7 @@ msgstr ""
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "OK"
@@ -310,7 +310,7 @@ msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d 個のパッケージ, %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 "ソースパッケージを取得できませんでした。中止します。"
@@ -347,38 +347,44 @@ msgstr "...取得に失敗: %s"
msgid "_Done"
msgstr "完了(_D)"
-#: ../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 ""
+"インストール失敗。不正な RPM です:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"インストールに失敗。以下のファイルがありません:\n"
"%s\n"
"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 "インストール失敗:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "パッケージは既にインストールされています"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "インストールが完了しました"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "%s を削除"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "urpmi を再スタートします"
@@ -507,58 +513,58 @@ msgstr "ローカルパッケージの登録中にエラーが発生"
msgid "This operation is forbidden while running in restricted mode"
msgstr "この操作は制限モードでは禁止されています"
-#: ../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 "コマンドラインのプロキシ宣言が間違っています\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM ファイル %s を読み込めません\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "予期しない表現: %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "%s の前に表現がありません"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "予期しない表現 %s (提案: -a または -o を使用)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "閉じる表現がありません"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"urpmf はデフォルトで正規表現を期待します。\"--literal\" を使ってください。"
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot ディレクトリが存在しません"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "%2$s なしで %1$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 "%s は %s と一緒には使えません"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "引数が多すぎます\n"
@@ -607,7 +613,7 @@ msgstr "設定ファイル [%s] を読めません"
msgid "medium `%s' is defined twice, aborting"
msgstr "メディア %s が二度定義されています。中止します。"
-#: ../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 "設定ファイル [%s] を書き込めません"
@@ -722,22 +728,22 @@ msgstr " %s%% 完了, 速度 = %s"
msgid "retrieving %s"
msgstr "%s を取得"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "%s を取得しました"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s に不明なプロトコルが定義されています"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "webfetch が見つかりません。利用可能な webfetch: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "プロトコルを処理できません: %s"
@@ -860,21 +866,12 @@ msgstr "%s データベースがロックされています。待機します...
msgid "aborting"
msgstr "中止します"
-#: ../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 ""
-"インストール失敗。不正な RPM です:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -882,7 +879,7 @@ msgstr ""
"%s\n"
"urpmi データベースを更新してください。"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -891,7 +888,7 @@ msgstr ""
"インストール失敗。不正な RPM です:\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 "
@@ -899,68 +896,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 "インストールに失敗"
-
-#: ../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 "以下のパッケージは署名が間違っています"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "以下のパッケージは署名が間違っています"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "インストールを続けますか?"
-#: ../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 "インストールに失敗"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "インストールされている RPM (%s) を削除"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "%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 "%s を %s からインストール"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "%s をインストール"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "%s を配信"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "依存を確認せずにインストールを試みますか?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "インストールを強行 (--force) してみますか?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "パッケージは最新です"
-#: ../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 "インストール可能です"
@@ -1494,37 +1491,37 @@ msgstr ""
"パッケージ %s が urpmi データベースに見つかりましたが、どれもインストールされ"
"ていません"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "パッケージ %s は既にインストールされています"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "パッケージ %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 "%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 "%s が依存を満たしていないために"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "%s をアップグレードするために"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "%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"
@@ -1533,7 +1530,7 @@ msgstr ""
"更新するには以下のパッケージを削除しなければなりません:\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"
@@ -1542,12 +1539,12 @@ msgstr ""
"更新するには以下のパッケージを削除しなければなりません:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "%s をインストールするために"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "%s がないために"
@@ -2548,12 +2545,7 @@ msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d 個のパッケージのインストールを開始しますか?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "マウントされたら Enter を押してください"
@@ -3273,33 +3265,33 @@ msgstr "--list-nodes は --parallel と一緒にしか使えません"
msgid "use -l to list files"
msgstr "ファイルを一覧表示するには -l を使います"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"メディア %s に XML 情報がないため、パッケージ %s の検索結果は不完全です"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"メディア %s に XML 情報がないため、パッケージ %s の検索結果は不完全です"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"メディア %s に XML 情報がないため、パッケージ %s の検索結果を返せません"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"メディア %s に XML 情報がないため、パッケージ %s の検索結果を返せません"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "変更ログはありません\n"
@@ -3312,6 +3304,18 @@ msgstr "ソフトウェアインストーラ"
msgid "Graphical front end to install RPM files"
msgstr "RPM インストール用グラフィカルフロントエンド"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "インストールに失敗。以下のファイルがありません:\n"
+#~ "%s\n"
+#~ "urpmi データベースを更新してください。"
+
+#~ msgid "Cancel"
+#~ msgstr "キャンセル"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "ファイルを書き込めません"
diff --git a/po/ka.po b/po/ka.po
index 032307a0..a6ec4b49 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,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: 2003-01-29 23:47+0400\n"
"Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
"Language-Team: Georgian\n"
@@ -225,7 +225,7 @@ msgstr "უკვე ყველაფერი ჩაწერილია"
msgid "Warning"
msgstr "გაფრთხილება"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "ო-ქეი"
@@ -281,7 +281,7 @@ msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "ვერ ვიყენებ პარალელურ პარამეტრს \"%s\""
@@ -318,35 +318,39 @@ msgstr "...გამოძახება ჩაიშალა: %s"
msgid "_Done"
msgstr "დასრულდა"
-#: ../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 "ინსტალაცია ჩაიშალა"
+
+#: ../gurpmi2:405
+#, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "ინსტალაცია ჩაიშალა"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, fuzzy, c-format
msgid "Installation finished"
msgstr "ინსტალაცია ჩაიშალა"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, fuzzy, c-format
msgid "removing %s"
msgstr "მომხმარებლის წაშლა : %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -475,57 +479,57 @@ msgstr ""
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "ვერ წავიკითხე მენიუს ფაილი:%s"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr ""
-#: ../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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -572,7 +576,7 @@ msgstr "ვერ ვწერ საკონფიგურაციო ფა
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
@@ -687,22 +691,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "მომხმარებლის წაშლა : %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...გამოძახება ჩაიშალა: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s-ისთვის უცნობი პროტოკოლია განსაზღვრული"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ვერ ვუმკლავდები პროტოკოლს: %s"
@@ -823,31 +827,24 @@ msgstr "urpmi მონაცემთა ბაზა ჩაკეტილი
msgid "aborting"
msgstr "გაფრთხილება"
-#: ../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 "ინსტალაცია ჩაიშალა"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr ""
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "ინსტალაცია ჩაიშალა"
-#: ../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 "
@@ -855,68 +852,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 "ინსტალაცია ჩაიშალა"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "გნებავთ დაამუშაოთ:"
-#: ../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 "ინსტალაცია ჩაიშალა"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "ვაინსტალირებ: %s\n"
-#: ../urpm/main_loop.pm:237
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "ვაინსტალირებ: %s\n"
+#: ../urpm/main_loop.pm:160
+#, c-format
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "ვაინსტალირებ: %s\n"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, fuzzy, c-format
msgid "installing %s"
msgstr "ვაინსტალირებ: %s\n"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "ვაინსტალირებ: %s\n"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "გნებავთ ვცადე ჩაწერა დამოკიდებულებების შემოწმების გარეშე? (ხ/ა) [ა] "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "გნებავთ ვცადო ჩაწერა ძალით (--force)? (ხ/ა) [ა] "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:356 ../urpm/parallel.pm:299
+#: ../urpm/main_loop.pm:442 ../urpm/parallel.pm:299
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "ინსტალაცია ჩაიშალა"
@@ -1444,60 +1441,60 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../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 ""
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "ვერ ვპოულობ წასაშლელ შენატანს!"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr ""
"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
"ჩაწეროს პაკეტები."
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr "%s შედმეგ პაკეტებშია: %s\n"
-#: ../urpm/select.pm:623
+#: ../urpm/select.pm:622
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr "%s შედმეგ პაკეტებშია: %s\n"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, fuzzy, c-format
msgid "in order to install %s"
msgstr ""
"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
"ჩაწეროს პაკეტები."
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr ""
@@ -2445,12 +2442,7 @@ msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "გამოქცევა"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
@@ -3122,29 +3114,29 @@ msgstr ""
msgid "use -l to list files"
msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "სურათები ვერ ვიპოვე"
@@ -3158,6 +3150,9 @@ msgstr "პროგრამათა მენეჯმენტი"
msgid "Graphical front end to install RPM files"
msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "გამოქცევა"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
diff --git a/po/ko.po b/po/ko.po
index f41f4b9b..d6a7e28b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,7 +9,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: 2007-09-26 20:03+0200\n"
"Last-Translator: Jaegeum Choe <baedaron@hananet.net>\n"
"Language-Team: Korean <baedaron@hananet.net>\n"
@@ -243,7 +243,7 @@ msgstr ""
msgid "Warning"
msgstr "경고"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "확인"
@@ -301,7 +301,7 @@ msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d 패키지, %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 "소스 패키지를 구할 수 없습니다, 설치를 중단합니다."
@@ -338,38 +338,42 @@ msgstr "FAT크기조정 실패: %s"
msgid "_Done"
msgstr "완료"
-#: ../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 "설치 실패."
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"설치 실패, 몇몇 파일이 없거나, 손상되었습니다. : \n"
"%s\n"
"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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "설치 실패."
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "모든 것이 이미 설치되어 있습니다."
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "설치 완료"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, fuzzy, c-format
msgid "removing %s"
msgstr "%s 제거 중"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -500,57 +504,57 @@ msgstr "패키지 등록 오류"
msgid "This operation is forbidden while running in restricted mode"
msgstr "이 작업은 제한모드에서 작동되는 동안 금지됩니다."
-#: ../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 "명령줄 내의 잘못된 선언\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM 파일 「%s」을 읽을 수 없습니다.\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "서명이 없습니다.(%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 "chroot 디렉토리가 존재하지 않습니다."
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "%s 없이 %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 "%s 와 함께 %s를 사용할 수 없습니다."
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "너무 많은 인수.\n"
@@ -597,7 +601,7 @@ msgstr "설정 파일 [%s]에 기록할 수 없습니다."
msgid "medium `%s' is defined twice, aborting"
msgstr "'%s'매체는 2번 정의되었습니다. 작업을 중단합니다."
-#: ../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 "설정 파일 [%s]에 기록할 수 없습니다."
@@ -712,24 +716,24 @@ msgstr " %s%% 완료됨, speed = %s"
msgid "retrieving %s"
msgstr "%s 검색 중"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "%s 검색되었음"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, fuzzy, c-format
msgid "unknown protocol defined for %s"
msgstr "알 수 없는 파일 타입: %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
"웹패치를 발견하지 못했습니다, 지원하는 웹패치는 :\n"
"%s 입니다.\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr ""
@@ -852,19 +856,12 @@ msgstr "%s 데이터베이스는 잠겼습니다."
msgid "aborting"
msgstr "경고"
-#: ../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 "설치 실패."
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -872,14 +869,14 @@ msgstr ""
"%s\n"
"urpmi 데이터베이스를 업데이트해야 할 수도 있습니다."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "설치 실패."
-#: ../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 "
@@ -887,68 +884,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 "설치 실패."
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "다음 팩키지들이 설치될 것입니다."
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "다음 팩키지들이 설치될 것입니다."
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "이 버튼을 누르시겠습니까?"
-#: ../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 "설치 실패."
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%s 설치 중...\n"
-#: ../urpm/main_loop.pm:237
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "%s 설치 중...\n"
+#: ../urpm/main_loop.pm:160
+#, c-format
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "%s 설치 중...\n"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, fuzzy, c-format
msgid "installing %s"
msgstr "%s 설치 중...\n"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "%s 설치 중...\n"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "의존성 검사없이 설치합니까? (y/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "설치를 강제 추진합니까? (y/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:356 ../urpm/parallel.pm:299
+#: ../urpm/main_loop.pm:442 ../urpm/parallel.pm:299
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "설치 문제"
@@ -1471,56 +1468,56 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "[%s] 팩키지를 설치할 수 없습니다."
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "모든 것이 이미 설치되어 있습니다."
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "모든 것이 이미 설치되어 있습니다."
-#: ../urpm/select.pm:573 ../urpm/select.pm:660
+#: ../urpm/select.pm:572 ../urpm/select.pm:659
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s와 충돌하기 때문"
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "%s에 만족하지 않기 때문입니다."
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "%s 활성화 시도중"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "%s를 유지하기 위해"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr "다음 팩키지들이 제거될 것입니다."
-#: ../urpm/select.pm:623
+#: ../urpm/select.pm:622
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr "다음 팩키지들이 제거될 것입니다."
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "%s를 설치하기 위해"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "%s가 없기 때문입니다."
@@ -2484,12 +2481,7 @@ msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "취소"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "다 되었으면 ENTER키를 누르세요..."
@@ -3181,21 +3173,21 @@ msgstr ""
msgid "use -l to list files"
msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"Note: \"%s\"매체에 대한 아무 hdlist도 없음, \n"
"매체에 대한 아무 결과도 반환할 수 없음."
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Note: \"%s\"매체에 대한 아무 hdlist도 없음, \n"
"매체에 대한 아무 결과도 반환할 수 없음."
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3203,7 +3195,7 @@ msgstr ""
"Note: \"%s\"매체에 대한 아무 hdlist도 없음, \n"
"매체에 대한 아무 결과도 반환할 수 없음."
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3211,7 +3203,7 @@ msgstr ""
"Note: \"%s\"매체에 대한 아무 hdlist도 없음, \n"
"매체에 대한 아무 결과도 반환할 수 없음."
-#: ../urpmq:496
+#: ../urpmq:492
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "하드 디스크를 찾을 수 없습니다."
@@ -3226,6 +3218,18 @@ msgstr "소프트웨어 설치기"
msgid "Graphical front end to install RPM files"
msgstr "그래픽 팩키지 설치 관리자"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "설치 실패, 몇몇 파일이 없거나, 손상되었습니다. : \n"
+#~ "%s\n"
+#~ "urpmi 데이터베이스를 업데이트해야 할 수도 있습니다."
+
+#~ msgid "Cancel"
+#~ msgstr "취소"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "설정 파일 [%s]에 기록할 수 없습니다."
diff --git a/po/ky.po b/po/ky.po
index c1ad219a..ac3640b7 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-ky\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: 2005-07-13 13:23+0000\n"
"Last-Translator: Timur Jamakeev <ztimur@mail..ru>\n"
"Language-Team: Kyrgyz\n"
@@ -255,7 +255,7 @@ msgstr ""
msgid "Warning"
msgstr "Эскертүү"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -318,7 +318,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "баштапкы пакеттерди алууга болбоду, күтүлбөгөн аяктоо"
@@ -355,38 +355,42 @@ msgstr "...кабыл алуу ийгиликсиз: %s"
msgid "_Done"
msgstr "_Даяр"
-#: ../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 "Орнотуу ишке ашпады"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Орнотуу ишке ашпады, кээ бир файлдар жок:\n"
"%s\n"
"Мүмкүн сизге 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Орнотуу ишке ашпады"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Бардыгы алдагачан орнотулган"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Орнотуу аяктады"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "%s алынып салынууда"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "urpmi кайра ишке киргизилүүдө"
@@ -515,57 +519,57 @@ msgstr "локалдык пакеттерди каттоо катасы"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Чектелген режим учурунда бул операцияны аткарууга болбойт"
-#: ../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 "командалык сапта туура эмес прокси көрсөтүлгөн\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm файлын окууга болбоду\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Сигнатура жок (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -612,7 +616,7 @@ msgstr "[%s] конфиг файлын жазуу мүмкүн эмес"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "[%s] конфиг файлын жазуу мүмкүн эмес"
@@ -727,22 +731,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "%s алынып салынууда"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...кабыл алуу ийгиликсиз: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s үчүн белгисиз протокол берилген"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "webfetch табылбады, колдоого ээ webfetch: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "протокол аткарылбады: %s"
@@ -865,19 +869,12 @@ msgstr "urpmi берилиштер базасы кулпуланган"
msgid "aborting"
msgstr "Эскертүү"
-#: ../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 "Орнотуу ишке ашпады"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -885,14 +882,14 @@ msgstr ""
"%s\n"
"Мүмкүн сизге urpmi берилиштер базасын жаңылоо керек"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Орнотуу ишке ашпады"
-#: ../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 "
@@ -900,68 +897,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 "Орнотуу ишке ашпады"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Төмөнкү пакеттердин сигнарурасы туура эмес"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Төмөнкү пакеттердин сигнарурасы туура эмес"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Орнотууну улантууну каалайсызбы ?"
-#: ../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 "Орнотуу ишке ашпады"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%2s булагынан %1s орнотулууда"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "%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 "%2s булагынан %1s орнотулууда"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "%s орнотулууда"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "%s бөлүштүрүлүүдө"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Көз карадылыктарды эске албай орнотуп көрөйүнбү? (y/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Мажбурлап орнотуп көрөйүнбү (--force)? (y/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Орнотууга мүмкүн"
@@ -1490,37 +1487,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Бардыгы алдагачан орнотулган"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Бардыгы алдагачан орнотулган"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Бардыгы алдагачан орнотулган"
-#: ../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 "%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 "%s канаатанбагандыгынан"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "%s активдештирүү аракети"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "%s сактоо үчүн"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1529,7 +1526,7 @@ msgstr ""
"Башкаларын жаңылоо үчүн төмөнкү пакеттерди алып салуу талап кылынат:\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"
@@ -1538,12 +1535,12 @@ msgstr ""
"Башкаларын жаңылоо үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "%s орнотуу үчүн"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "%s жоктугунан"
@@ -2566,12 +2563,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Калтыруу"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Даяр болгон соң, Enter басыңыз..."
@@ -3293,21 +3285,21 @@ msgstr "--list-nodes опциясы --parallel менен чогуу гана к
msgid "use -l to list files"
msgstr "\"%s\" үчүн тизме файлын жазууга болбоду"
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"Эске алыңыз: изилденип жаткан булак hdlist'терди колдонбогондуктан, urpmf эч "
"кандай жыйынтык кайтара албады\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Эске алыңыз: изилденип жаткан булак hdlist'терди колдонбогондуктан, urpmf эч "
"кандай жыйынтык кайтара албады\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3315,7 +3307,7 @@ msgstr ""
"Эске алыңыз: изилденип жаткан булак hdlist'терди колдонбогондуктан, urpmf эч "
"кандай жыйынтык кайтара албады\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3323,7 +3315,7 @@ msgstr ""
"Эске алыңыз: изилденип жаткан булак hdlist'терди колдонбогондуктан, urpmf эч "
"кандай жыйынтык кайтара албады\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "changelog табылбады\n"
@@ -3336,6 +3328,18 @@ msgstr "Программа орноткуч"
msgid "Graphical front end to install RPM files"
msgstr "RPM файлдарын орнотуу үчүн графикалык интерфейс"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Орнотуу ишке ашпады, кээ бир файлдар жок:\n"
+#~ "%s\n"
+#~ "Мүмкүн сизге urpmi берилиштер базасын жаңылоо керек"
+
+#~ msgid "Cancel"
+#~ msgstr "Калтыруу"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "[%s] конфигурация файлын түзүү"
diff --git a/po/lt.po b/po/lt.po
index ab4ad7b4..710e319a 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,7 +10,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: 2005-08-18 23:34+0200\n"
"Last-Translator: Arvydas Svirka <arvydas@arvis.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -257,7 +257,7 @@ msgstr ""
msgid "Warning"
msgstr "Dėmesio"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Gerai"
@@ -318,7 +318,7 @@ msgstr[0] "%d paketų"
msgstr[1] "%d paketų"
msgstr[2] "%d paketų"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "negaliu gauti pirminių paketų, nutraukiu"
@@ -355,38 +355,42 @@ msgstr "...atkūrimas nepavyko: %s"
msgid "_Done"
msgstr "Baigta"
-#: ../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 "Įdiegimas nepavyko"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Įdiegimas nepavyko, trūksta kai kurių bylų:\n"
"%s\n"
"Jūs galite norėti atnaujinti urpmi duomenų bazę"
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Įdiegimas nepavyko"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Paketas(-ai) jau įdiegti"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Įdiegimas baigtas"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "pašalinama %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "iš naujo paleidžiama urpmi"
@@ -515,57 +519,57 @@ msgstr "vietinių paketų registravimo klaida"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operacija yra draudžiama, kai dirbama apribotoje veiksenoje"
-#: ../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 "blogas tarpinio serverio deklaravimas komandinėje eilutėje\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: negaliu perskaityti rpm bylos \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nėra ženklo (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -612,7 +616,7 @@ msgstr "nagaliu įrašyti konfigūracijos bylos [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "nagaliu įrašyti konfigūracijos bylos [%s]"
@@ -727,22 +731,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "pašalinama %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...atkūrimas nepavyko: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s nurodytas nežinomas protokolas"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "nerasta webfetch, palaikomi webfetch yra: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "negaliu valdyti protokolo: %s"
@@ -864,19 +868,12 @@ msgstr "urpmi duomenų bazė užrakinta"
msgid "aborting"
msgstr "Dėmesio"
-#: ../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 "Įdiegimas nepavyko"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -884,14 +881,14 @@ msgstr ""
"%s\n"
"Jūs galite norėti atnaujinti urpmi duomenų bazę"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Įdiegimas nepavyko"
-#: ../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 "
@@ -899,68 +896,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 "Įdiegimas nepavyko"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Šie paketai turi netinkamus ženklus"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Šie paketai turi netinkamus ženklus"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ar norite tęsti įdiegimą ?"
-#: ../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 "Įdiegimas nepavyko"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "iš %2$s įdiegiamas %1$s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "paskirstomas %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 "iš %2$s įdiegiamas %1$s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "įdiegiama %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "paskirstomas %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Pabandyti įdiegimą be priklausomybių tikrinimo? (t/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Pabandyti įdiegimą priverstinai (--force)? (t/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Įdiegimas galimas"
@@ -1492,37 +1489,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Paketas(-ai) jau įdiegti"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Paketas(-ai) jau įdiegti"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Paketas(-ai) jau įdiegti"
-#: ../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 "dėl konfliktų su %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 "dėl nepatenkinto %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "bandau paaukštinti %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "%s išlaikymui"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1531,7 +1528,7 @@ msgstr ""
"Šie paketai turi būti pašalinti tam, kad kitus būtų galima atnaujinti:\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"
@@ -1540,12 +1537,12 @@ msgstr ""
"Šie paketai turi būti pašalinti tam, kad kitus būtų galima atnaujinti:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "%s įdiegimui"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "dėl trūkstamo %s"
@@ -2575,12 +2572,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Atšaukti"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Kai būsite pasiruošę, paspauskite Enter..."
@@ -3296,21 +3288,21 @@ msgstr "--list-mazgas gali būti naudojamas tik su --parallel"
msgid "use -l to list files"
msgstr "negaliu įrašyti \"%s\" sąrašo bylos"
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"Pastaba: kadangi nei viena surasta laikmena nenaudoja hdlists, urpmf negali "
"išvesti jokio rezultato\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Pastaba: kadangi nei viena surasta laikmena nenaudoja hdlists, urpmf negali "
"išvesti jokio rezultato\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3318,7 +3310,7 @@ msgstr ""
"Pastaba: kadangi nei viena surasta laikmena nenaudoja hdlists, urpmf negali "
"išvesti jokio rezultato\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3326,7 +3318,7 @@ msgstr ""
"Pastaba: kadangi nei viena surasta laikmena nenaudoja hdlists, urpmf negali "
"išvesti jokio rezultato\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Nerastas changelog\n"
@@ -3341,6 +3333,18 @@ msgstr "Programinės įrangos įdiegimas"
msgid "Graphical front end to install RPM files"
msgstr "Grafinės sąsaja paketų įdiegimui"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Įdiegimas nepavyko, trūksta kai kurių bylų:\n"
+#~ "%s\n"
+#~ "Jūs galite norėti atnaujinti urpmi duomenų bazę"
+
+#~ msgid "Cancel"
+#~ msgstr "Atšaukti"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "Įjungti ar išjungti bendrą naudojimąsi bylomis"
diff --git a/po/lv.po b/po/lv.po
index 2518d1cb..bc1b086b 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -11,7 +11,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: 2002-09-27 17:43+0200\n"
"Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
"Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -232,7 +232,7 @@ msgstr ""
msgid "Warning"
msgstr "Uzmanību"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Labi"
@@ -290,7 +290,7 @@ msgstr[0] "%d pakotnes"
msgstr[1] "%d pakotnes"
msgstr[2] "%d pakotnes"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nevar dabūt koda pakotnes, pārtraucu"
@@ -327,35 +327,39 @@ msgstr "...atgūšana neizdevās: %s"
msgid "_Done"
msgstr "Izdarīts"
-#: ../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 "Instalēšana neizdevās"
+
+#: ../gurpmi2:405
+#, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalēšana neizdevās"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "viss jau ir instalēts"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalēšana pabeigta"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, fuzzy, c-format
msgid "removing %s"
msgstr "Atvienoju %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -486,57 +490,57 @@ msgstr "kļūda reģistrējot lokālās pakotnes"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "nevar nolasīt izvēlnes failu:%s"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Neesoši ieraksti"
-#: ../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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -583,7 +587,7 @@ msgstr "nevar saglabāt konfigurācijas failu [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "nevar saglabāt konfigurācijas failu [%s]"
@@ -698,22 +702,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "Atvienoju %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...atgūšana neizdevās: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "Nezināms protokols definēts priekš %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr "nav iespējams lietot paralēlo opciju \"%s\""
@@ -834,31 +838,24 @@ msgstr "urpmi datubāze noslēgta"
msgid "aborting"
msgstr "Uzmanību"
-#: ../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 "Instalēšana neizdevās"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr ""
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalēšana neizdevā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 "
@@ -866,68 +863,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 "Instalēšana neizdevās"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Sekojošām pakotnēm ir slikti paraksti"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Sekojošām pakotnēm ir slikti paraksti"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Vēlaties turpināt instalēšanu?"
-#: ../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 "Instalēšana neizdevās"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "tiek instalēta %s\n"
-#: ../urpm/main_loop.pm:237
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "tiek instalēta %s\n"
+#: ../urpm/main_loop.pm:160
+#, c-format
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "tiek instalēta %s\n"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, fuzzy, c-format
msgid "installing %s"
msgstr "tiek instalēta %s\n"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "tiek instalēta %s\n"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Vai mēģināt instalēt bez atkarību pārbaudes? (j/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Vai mēģināt instalēt vēl uzstājīgāk (--force)? (j/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Instalēšana ir iespējama"
@@ -1458,56 +1455,56 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "viss jau ir instalēts"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "viss jau ir instalēts"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "viss jau ir instalēts"
-#: ../urpm/select.pm:573 ../urpm/select.pm:660
+#: ../urpm/select.pm:572 ../urpm/select.pm:659
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s konflikē ar %s"
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "trūkstošs kdesu"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Nav nekā, ko noņemt.\n"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "Loga rāmja tēma"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr "Tiks noņemtas sekojošas pakotnes"
-#: ../urpm/select.pm:623
+#: ../urpm/select.pm:622
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr "Tiks noņemtas sekojošas pakotnes"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "nevaru instalēt pakotni %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "trūkstošs kdesu"
@@ -2486,12 +2483,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Atcelt"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Nospiediet Enter, kad gatavs..."
@@ -3184,29 +3176,29 @@ msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
msgid "use -l to list files"
msgstr "nevaru ierakstīt \"%s\" saraksta failu"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Cietņi netika atrasti"
@@ -3221,6 +3213,9 @@ msgstr "Programmatūras instalētājs"
msgid "Graphical front end to install RPM files"
msgstr "Ghostscript priekšgals, lai vizualizētu PostScript failus"
+#~ msgid "Cancel"
+#~ msgstr "Atcelt"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "nevar saglabāt konfigurācijas failu [%s]"
diff --git a/po/mk.po b/po/mk.po
index b6be49bc..e2b19c57 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-mk\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: 2005-07-18 01:58+0200\n"
"Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
"Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -257,7 +257,7 @@ msgstr ""
msgid "Warning"
msgstr "Предупредување"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Во ред"
@@ -320,7 +320,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d пакети"
msgstr[1] "%d пакети"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "не можам да ги добија изворните пакети, прекинувам"
@@ -357,38 +357,42 @@ msgstr "...преземањето не успеа: %s"
msgid "_Done"
msgstr "_Завршено"
-#: ../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 "Инсталацијата не успеа"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Инсталацијата не успеа, недостасуваат некои датотеки:\n"
"%s\n"
"Можеби сакате да ја ажурирате вашата 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Инсталацијата не успеа"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Се е веќе инсталирано"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Инсталирањето заврши"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "отстранувам %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "рестартирам urpmi"
@@ -517,57 +521,57 @@ msgstr "грешка при регистрирање на локалните п
msgid "This operation is forbidden while running in restricted mode"
msgstr "Оваа акција не е дозволена додека работи во затворен режим"
-#: ../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 "лоша декларација на прокси во командната линија\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не можам да ја прочитам rpm датотеката \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Недостасува потпис (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -614,7 +618,7 @@ msgstr "не можам да запишам конфигурациона дат
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "не можам да запишам конфигурациона датотека [%s]"
@@ -729,22 +733,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "отстранувам %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...преземањето не успеа: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "непознат протокол дефиниран за %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "не е пронајдено преземање од веб, поддржани преземања од веб се: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "не можам да ракувам со протоколот: %s"
@@ -867,19 +871,12 @@ msgstr "базата на податоци на urpmi е заклучена"
msgid "aborting"
msgstr "Предупредување"
-#: ../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 "Инсталацијата не успеа"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -887,14 +884,14 @@ msgstr ""
"%s\n"
"Можеби сакате да ја ажурирате вашата urpmi база на податоци"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Инсталацијата не успеа"
-#: ../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 "
@@ -902,68 +899,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 "Инсталацијата не успеа"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Следниве пакети имаат лоши потписи"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Следниве пакети имаат лоши потписи"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Дали сакате да продолжите со инсталацијата ?"
-#: ../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 "Инсталацијата не успеа"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "инсталирање на %s од %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "дистрибуирам %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 "инсталирање на %s од %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "инсталирам %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "дистрибуирам %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Обидете се со инсталација без проверка на зависности? (y/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Обидете се инсталација дури уште посилно (--force)? (y/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Возможна е инсталација"
@@ -1497,37 +1494,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Се е веќе инсталирано"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Се е веќе инсталирано"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Се е веќе инсталирано"
-#: ../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 "поради конфликти со %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 "поради незадоволени %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "се обидувам да промовирам %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "за да се задржи %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1536,7 +1533,7 @@ msgstr ""
"Следниве пакети треба да се отстранат за да други се надоградат:\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"
@@ -1545,12 +1542,12 @@ msgstr ""
"Следниве пакети треба да се отстранат за да други се надоградат:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "за да се инсталира %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "поради недостаток на %s"
@@ -2603,12 +2600,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Откажи"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Притиснете Ентер кога сте подготвени..."
@@ -3331,21 +3323,21 @@ msgstr "--list-nodes може да се употребува само со --par
msgid "use -l to list files"
msgstr "не можам да запишам датотека со листа на \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"Забелешка: бидејќи ниеден пребаран медиум не користи hdlist, urpmf не можеше "
"да врати било каков резултат\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Забелешка: бидејќи ниеден пребаран медиум не користи hdlist, urpmf не можеше "
"да врати било каков резултат\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3353,7 +3345,7 @@ msgstr ""
"Забелешка: бидејќи ниеден пребаран медиум не користи hdlist, urpmf не можеше "
"да врати било каков резултат\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3361,7 +3353,7 @@ msgstr ""
"Забелешка: бидејќи ниеден пребаран медиум не користи hdlist, urpmf не можеше "
"да врати било каков резултат\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Не е пронајдена измена на евиденцијата\n"
@@ -3374,6 +3366,18 @@ msgstr "Инсталирање софтвер"
msgid "Graphical front end to install RPM files"
msgstr "Графички интерфејс за инсталирање на RPM датотеки"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Инсталацијата не успеа, недостасуваат некои датотеки:\n"
+#~ "%s\n"
+#~ "Можеби сакате да ја ажурирате вашата urpmi база на податоци"
+
+#~ msgid "Cancel"
+#~ msgstr "Откажи"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "Не може да се направи конфигурациона датотека [%s]"
diff --git a/po/mn.po b/po/mn.po
index c9a3ceb2..5bf9318e 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -8,7 +8,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: 2003-08-22 19:38+0200\n"
"Last-Translator: Khurelbaatar Lkhagvasuren <hujii247@yahoo.com>\n"
"Language-Team: Mongolian <openmn-core@lists.sourceforge.net>\n"
@@ -226,7 +226,7 @@ msgstr "г с вы?"
msgid "Warning"
msgstr "Анхааруулга"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ок"
@@ -283,7 +283,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "Тааруухан багц"
msgstr[1] "Тааруухан багц"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "%s багцийг устгаж болсонгүй"
@@ -320,38 +320,42 @@ msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
msgid "_Done"
msgstr "Биелэгдэв"
-#: ../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 "Суулгалтын асуудал"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Суулгалт бүтэлгүйтэв, учир нь зарим файл байхгүй байна:\n"
"%s\n"
"Та магадгүй 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Суулгалтын асуудал"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, fuzzy, c-format
msgid "Installation finished"
msgstr "Суулгалт боломжтой"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, fuzzy, c-format
msgid "removing %s"
msgstr "%s-г устгаж байна"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -478,57 +482,57 @@ msgstr "локал"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "тушаалын мөрөнд буруу proxy зарлалт\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm файлыг уншиж чадахгүй \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr ""
-#: ../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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -575,7 +579,7 @@ msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "[%s] тохируулгын файлыг бичиж болсонгүй"
@@ -690,22 +694,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "%s-г устгаж байна"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s-ийн хувьд үл мэдэгдэх протокол тодорхойлогдсон"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr "%s багцийг суулгаж болсонгүй"
@@ -826,19 +830,12 @@ msgstr ""
msgid "aborting"
msgstr "Анхааруулга"
-#: ../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 "Суулгалтын асуудал"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -846,14 +843,14 @@ msgstr ""
"%s\n"
"Та магадгүй urpmi баазаа шинэчлэх хэрэгтэй байх"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Суулгалтын асуудал"
-#: ../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 "
@@ -861,68 +858,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
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Суулгалтын асуудал"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Та суулгалтыг үргэлжлүүлэхийг хүсэж байна уу?"
-#: ../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
#, fuzzy, c-format
-msgid "removing installed rpms (%s)"
-msgstr "%s-ийг суулгаж байна\n"
+msgid "Installation failed"
+msgstr "Суулгалтын асуудал"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
-msgid "distributing %s"
+msgid "removing installed rpms (%s)"
msgstr "%s-ийг суулгаж байна\n"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:160
+#, c-format
+msgid "Try to continue anyway?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "%s-ийг суулгаж байна\n"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, fuzzy, c-format
msgid "installing %s"
msgstr "%s-ийг суулгаж байна\n"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "%s-ийг суулгаж байна\n"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Хамаарлыг шалгахгүйгээр суулгахыг оролдох уу? (y/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Reyna т N "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Суулгалт боломжтой"
@@ -1448,56 +1445,56 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../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 ""
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Юу ч үгүй"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "ямх"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: ../urpm/select.pm:623
+#: ../urpm/select.pm:622
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "%s багцийг суулгаж болсонгүй"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr ""
@@ -2457,12 +2454,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Хүчингүй"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Бэлэн болонгуут Enter товчоо дарна уу..."
@@ -3132,29 +3124,29 @@ msgstr "жигсаалт"
msgid "use -l to list files"
msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Зураг олдсонгүй"
@@ -3169,6 +3161,18 @@ msgstr "Бичиг-Суулгалт"
msgid "Graphical front end to install RPM files"
msgstr "PostScript файлуудыг харах график GhostScript-гадаргуу"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Суулгалт бүтэлгүйтэв, учир нь зарим файл байхгүй байна:\n"
+#~ "%s\n"
+#~ "Та магадгүй urpmi баазаа шинэчлэх хэрэгтэй байх"
+
+#~ msgid "Cancel"
+#~ msgstr "Хүчингүй"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
diff --git a/po/ms.po b/po/ms.po
index 0d0f8817..454ebaac 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,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: 2008-08-21 23:48+0800\n"
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
"Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -225,7 +225,7 @@ msgstr "semua telah diinstal"
msgid "Warning"
msgstr "Amaran"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -287,7 +287,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "_Saiz (MB):"
msgstr[1] ""
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "tidak dapat mengambil pakej asal, batal"
@@ -324,35 +324,39 @@ msgstr "...gagal terambil: %s"
msgid "_Done"
msgstr "_Selesai"
-#: ../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 "Instalasi gagal"
+
+#: ../gurpmi2:405
+#, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalasi gagal"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "semua telah diinstal"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Pemasangan selesai"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "membuang %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Tambah media urpmi"
@@ -480,57 +484,57 @@ msgstr "ralat pendaftaran pakej setempat"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: tidak dapat membaca fail rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "hujah tidak dijangka"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "12 pt sebelum"
-#: ../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 "Ungkapan corak:\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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, fuzzy, c-format
msgid "Can't use %s without %s"
msgstr "Tutup Tanpa Simpan"
-#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:159
+#: ../urpm/args.pm:503 ../urpm/args.pm:506 ../urpmq:159
#, fuzzy, c-format
msgid "Can't use %s with %s"
msgstr "hidupkan penggunaan TLS dengan LDAP"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, fuzzy, c-format
msgid "Too many arguments\n"
msgstr "%s: terlalu banyak hujah\n"
@@ -577,7 +581,7 @@ msgstr "gagal tulis fail konfigurasi [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "gagal tulis fail konfigurasi [%s]"
@@ -692,22 +696,22 @@ msgstr "Muatturun `%s', kelajuan:%s"
msgid "retrieving %s"
msgstr "Menerima"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "%s tidak diambil... "
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "tiada protokol ditakrif untuk `%s'"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "tiada webfetch dijumpai, webfetch yang disokong adalah: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "tidak dapat mengawal protokol: %s"
@@ -828,31 +832,24 @@ msgstr "Pentadbiran Pangkalan Data Mergeant"
msgid "aborting"
msgstr "@r adalah bukan @d; menghentikan.\n"
-#: ../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 "Instalasi gagal"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr ""
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalasi gagal"
-#: ../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 "
@@ -860,18 +857,7 @@ 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 "Instalasi gagal"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr ""
@@ -879,52 +865,63 @@ msgstr ""
" pakej berikut berjaya:\n"
"\n"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "Salah satu pakej berikut diperlukan:"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "Adakah anda pasti untuk meneruskan"
-#: ../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 "Instalasi gagal"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "Sahkan RPM untuk dipasang:"
-#: ../urpm/main_loop.pm:237
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "Mulakan %s:"
+#: ../urpm/main_loop.pm:160
+#, c-format
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "Dari Fail"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, fuzzy, c-format
msgid "installing %s"
msgstr "Memasang %s\n"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "Mulakan %s:"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Cuba instalasi tanpa periksa kebergantungan? (y/T) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:356 ../urpm/parallel.pm:299
+#: ../urpm/main_loop.pm:442 ../urpm/parallel.pm:299
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "Pemasangan sekecil mungkin"
@@ -1450,37 +1447,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "semua telah diinstal"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "semua telah diinstal"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "semua telah diinstal"
-#: ../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 "kerana konflik dengan %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 "kerana ketidakpuasan %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "cuba untuk menaikkan %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "untuk menyimpan %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1490,7 +1487,7 @@ msgstr ""
"%s\n"
"Teruskan?"
-#: ../urpm/select.pm:623
+#: ../urpm/select.pm:622
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1500,12 +1497,12 @@ msgstr ""
"%s\n"
"Teruskan?"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "untuk memasang %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "kerana kehilangan %s"
@@ -2471,12 +2468,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Batal"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Tekan <enter> untuk shell"
@@ -3171,29 +3163,29 @@ msgstr ""
msgid "use -l to list files"
msgstr "guna -l untuk menyenaraikan fail"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Tiada log perubahan dijumpai\n"
@@ -3207,6 +3199,9 @@ msgstr "Penginstal perisian"
msgid "Graphical front end to install RPM files"
msgstr "Antaramuka depan Ghostscript untuk melihat fail PostScript"
+#~ msgid "Cancel"
+#~ msgstr "Batal"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "Tidak dapat menulis kepada fail %s"
diff --git a/po/mt.po b/po/mt.po
index 2042e4cd..a41ed6e9 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mt\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-09-07 05:59+0200\n"
"Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
"Language-Team: Maltese <mt@li.org>\n"
@@ -254,7 +254,7 @@ msgstr ""
msgid "Warning"
msgstr "Twissija"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -316,7 +316,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ma nistax inġib il-pakketti tas-sors, se noħroġ"
@@ -353,39 +353,43 @@ msgstr "...qari falla: %s"
msgid "_Done"
msgstr "Lest"
-#: ../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 "installazzjoni falliet"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"L-installazzjoni falliet, xi fajls huma nieqsa:\n"
"\n"
"%s\n"
"Forsi trid taġġorna d-database 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "installazzjoni falliet"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "kollox diġà installat"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Installazzjoni lesta"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "qed jitneħħa %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "qed jiġi ristartjat urpmi"
@@ -514,57 +518,57 @@ msgstr "problema fir-reġistrazzjoni ta' pakketti lokali"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "dikjarazzjoni ta' \"proxy\" ħażina fil-linja ta' kmand\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ma nistax naqra l-fajl rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Firma nieqsa (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -611,7 +615,7 @@ msgstr "ma setax jinkiteb il-fajl ta' konfigurazzjoni [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "ma setax jinkiteb il-fajl ta' konfigurazzjoni [%s]"
@@ -726,22 +730,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "qed jitneħħa %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...qari falla: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protokoll mhux magħruf definit għal %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "ma nstabx webfetch; webfetch aċċettati huma: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ma nistax nuża l-protokoll: %s"
@@ -862,19 +866,12 @@ msgstr "database urpmi imsakkar"
msgid "aborting"
msgstr "Twissija"
-#: ../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 "installazzjoni falliet"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -883,14 +880,14 @@ msgstr ""
"%s\n"
"Forsi trid taġġorna d-database urpmi"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "installazzjoni falliet"
-#: ../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 "
@@ -898,68 +895,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 "installazzjoni falliet"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Dawn il-pakketti fihom firem ħżiena"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Dawn il-pakketti fihom firem ħżiena"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Trid tkompli l-installazzjoni ?"
-#: ../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 "installazzjoni falliet"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "qed jiġi nstallat %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "qed jiġi distribwit %s"
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "qed jiġi nstallat %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "qed jiġi nstallat %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "qed jiġi distribwit %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Trid tinstalla mingħajr ma niċċekkja d-dipendenzi? (i/L) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Trid tipprova b'iżjed qawwa (--force)? (i/L)"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Installazzjoni possibbli"
@@ -1489,37 +1486,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "kollox diġà installat"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "kollox diġà installat"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "kollox diġà installat"
-#: ../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 "minħabba konflitt ma' %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 "minħabba %s mhux sodisfatt"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "qed nipprova nippromwovi %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "sabiex inżomm %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1528,7 +1525,7 @@ msgstr ""
"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\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"
@@ -1537,12 +1534,12 @@ msgstr ""
"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "sabiex ninstalla %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "minħabba %s nieqes"
@@ -2557,12 +2554,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Ikkanċella"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Agħfas Enter meta tlesti..."
@@ -3271,21 +3263,21 @@ msgstr "--list-nodes tista' tintuża biss ma' --parallel"
msgid "use -l to list files"
msgstr "ma nistax nikteb il-fajl tal-lista \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"Nota: peress li ebda sors imfittex ma juża hdlists, urpmf ma setax "
"jirritorna riżultati\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Nota: peress li ebda sors imfittex ma juża hdlists, urpmf ma setax "
"jirritorna riżultati\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3293,7 +3285,7 @@ msgstr ""
"Nota: peress li ebda sors imfittex ma juża hdlists, urpmf ma setax "
"jirritorna riżultati\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3301,7 +3293,7 @@ msgstr ""
"Nota: peress li ebda sors imfittex ma juża hdlists, urpmf ma setax "
"jirritorna riżultati\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Ma nstabx changelog\n"
@@ -3315,6 +3307,19 @@ msgstr "Installatur ta' softwer"
msgid "Graphical front end to install RPM files"
msgstr "Interfaċċja grafika biex tinstalla pakketti RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "L-installazzjoni falliet, xi fajls huma nieqsa:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "Forsi trid taġġorna d-database urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Ikkanċella"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "ma setax jinkiteb il-fajl [%s]"
diff --git a/po/nb.po b/po/nb.po
index 15ff8156..4a04ef24 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nb\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-04-02 02:40+0200\n"
"Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
"Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.org>\n"
@@ -263,7 +263,7 @@ msgstr ""
msgid "Warning"
msgstr "Advarsel"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "OK"
@@ -323,7 +323,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakke – %d MB)"
msgstr[1] "(%d pakker – %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 "kunne ikke få tak i kildepakker, avbryter"
@@ -360,38 +360,41 @@ msgstr "… mottak mislyktes: %s"
msgid "_Done"
msgstr "_Ferdig"
-#: ../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 ""
"Installasjon mislyktes, noen filer mangler:\n"
-"%s\n"
-"Du må kanskje oppdatere databasen."
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Du ønsker antageligvis å oppdatere databasen din."
-#: ../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 "Installasjon mislyktes:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Pakken(e) er allerede installert"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Installasjon ferdig"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "fjerner %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "starter urpmi på nytt"
@@ -520,58 +523,58 @@ msgstr "feil ved registrering av lokale pakker."
msgid "This operation is forbidden while running in restricted mode"
msgstr "Du kan ikke kjøre denne i begrenset modus."
-#: ../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 "ugyldig deklarasjon for mellomlager på kommandolinja.\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: Klarer ikke lese fila «%s»\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "uventet uttrykk %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "manglende uttrykk før %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "uventet uttrykk %s (forslag: bruk -a or -o ?"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "ingen uttrykk å lukke"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"som standard forventer urpmf et regulært uttrykk. Du kan bruke «--literal»"
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-mappa finnes ikke"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan ikke bruke %s uten «%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 "Kan ikke bruke «%s» med «%s»."
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "For mange argumenter\n"
@@ -620,7 +623,7 @@ msgstr "klarte ikke lese oppsettfila [%s]."
msgid "medium `%s' is defined twice, aborting"
msgstr "mediet «%s» er spesifisert to ganger, avbryter"
-#: ../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 "klarer ikke å skrive oppsettfila [%s]."
@@ -737,22 +740,22 @@ msgstr " %s %% fullført, hastighet = %s"
msgid "retrieving %s"
msgstr "henter %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "hentet %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "ukjent protokoll spesifisert for %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "Ingen program for nedlasting funnet, støttede program er: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "kunne ikke håndtere protokoll: %s"
@@ -875,26 +878,17 @@ msgstr "databasen %s er låst. Venter …"
msgid "aborting"
msgstr "avbryter"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Prøve på nytt?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Installasjon mislyktes, noen filer mangler:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Du ønsker antageligvis å oppdatere databasen din."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -903,7 +897,7 @@ msgstr ""
"Installasjon mislyktes, dårlige pakker:\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 "
@@ -914,68 +908,68 @@ msgstr ""
"(%s trengs, %s tilgjengelig).\n"
"Vil du fortsette?"
-#: ../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 "Installasjon mislyktes"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Fortsette likevel?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Denne pakken har ugyldig signatur"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Disse pakkene har ugyldige signaturer"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ønsker du å fortsette installasjonen?"
-#: ../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 "Installasjon mislyktes"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "Fjerner installerte pakker (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "fordeler %s"
+msgid "Try to continue anyway?"
+msgstr "Fortsette likevel?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "Installerer %s fra %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "Installerer %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "fordeler %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Prøve å installere uten å sjekke avhengigheter?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Prøve ennå hardere å installere (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Pakkene er i siste versjon"
-#: ../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 "Installasjon er mulig"
@@ -1516,37 +1510,37 @@ msgstr "Bruk «-a» for å bruke alle"
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "fant pakken(e) %s i urpmi-databasen, men ingen er installert"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Pakka %s er allerede installert"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Pakkene %s er allerede installerte."
-#: ../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 "på grunn av konflikter med «%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 "grunnet utilfredsstilt %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "prøver å fremme %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "for å kunne beholde %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"
@@ -1555,7 +1549,7 @@ msgstr ""
"Den følgende pakka må fjernes for at andre skal kunne oppgraderes:\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"
@@ -1564,12 +1558,12 @@ msgstr ""
"Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "for å kunne installere %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "grunnet manglende %s"
@@ -2593,12 +2587,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortsette med installeringen av en pakke?"
msgstr[1] "Fortsette med installeringen av de %d pakkene?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Trykk på Enter når montert …"
@@ -3320,29 +3309,29 @@ msgstr "Kan bare bruke --list-nodes med --parallel"
msgid "use -l to list files"
msgstr "bruk -l for å vise filer"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "Ingen xml-info for medium «%s«, bare delvis resultat for pakke %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr "Ingen xml-info for medium «%s«, bare delvis resultat for pakkene %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr "Ingen xml-info for medium «%s«, kan ikke vise resultat for pakken %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr "Ingen xml-info for medium «%s«, kan ikke vise resultat for pakkene %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Fant ingen endringslogg\n"
@@ -3355,6 +3344,18 @@ msgstr "Programvareinstallatør"
msgid "Graphical front end to install RPM files"
msgstr "Et grafisk grensesnitt for installering av RPM-filer"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Installasjon mislyktes, noen filer mangler:\n"
+#~ "%s\n"
+#~ "Du må kanskje oppdatere databasen."
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/nl.po b/po/nl.po
index 3b66de31..3a14e490 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-nl\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: 2012-04-06 11:08+0100\n"
"Last-Translator: Remco Rijnders <remco@webconquest.com>\n"
"Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
@@ -275,7 +275,7 @@ msgstr ""
msgid "Warning"
msgstr "Waarschuwing"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -340,7 +340,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakket, %d MB)"
msgstr[1] "(%d pakketten, %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 "kan bronpakketten niet ontvangen, bezig met afbreken"
@@ -377,38 +377,41 @@ msgstr "...ontvangst mislukt: %s"
msgid "_Done"
msgstr "_Klaar"
-#: ../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 ""
-"Installatie is mislukt, sommige bestanden missen:\n"
-"%s\n"
-"Misschien moet u de urpmi database opwaarderen"
+"Installatie mislukt, sommige bestanden ontbreken:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "U kunt proberen de urpmi-database bij te werken."
-#: ../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 "Installatie mislukt:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "De pakketten zijn reeds geïnstalleerd"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Installatie voltooid"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "verwijderen van %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "urpmi herstarten"
@@ -540,59 +543,59 @@ msgstr "registreren van lokale pakketten is mislukt"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Deze operatie is verboden tijdens het uitvoeren in beperkte modus"
-#: ../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 "ongeldige proxy-aanduiding op opdrachtregel\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: kon rpm bestand \"%s\" niet lezen\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "onverwachte uitdrukking %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "uitdrukking vóór %s ontbreekt"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "onverwachte uitdrukking %s (suggestie: gebruik -a of -o)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "geen afsluitbare uitdrukking"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"standaard verwacht urpmf een regexp, u dient de optie \"--literal\" te "
"gebruiken"
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-map bestaat niet"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan %s niet gebruiken zonder %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 "Kan %s niet gebruiken samen met %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Te veel argumenten\n"
@@ -641,7 +644,7 @@ msgstr "kan configuratiebestand [%s] niet lezen"
msgid "medium `%s' is defined twice, aborting"
msgstr "medium \"%s\" is twee keer gedefinieerd, afbreken"
-#: ../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 "kon configuratiebestand [%s] niet wegschrijven"
@@ -756,22 +759,22 @@ msgstr " %s%% voltooid, snelheid = %s"
msgid "retrieving %s"
msgstr "ophalen van %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "%s opgehaald"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "onbekend protocol gedefinieerd voor %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "geen ``webfetch'' gevonden, ondersteund zijn: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "kon protocol niet verwerken: %s"
@@ -894,26 +897,17 @@ msgstr "%s-database gesloten. Wachten..."
msgid "aborting"
msgstr "afbreken"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Opnieuw proberen?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Installatie mislukt, sommige bestanden ontbreken:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "U kunt proberen de urpmi-database bij te werken."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -922,7 +916,7 @@ msgstr ""
"Installatie mislukt, onjuiste rpms:\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 "
@@ -933,68 +927,68 @@ msgstr ""
"downloaden (%s nodig, %s beschikbaar).\n"
"Weet u zeker dat u door wilt gaan?"
-#: ../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 "Installatie mislukt"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Toch proberen om door te gaan?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Het volgende pakket is voorzien van een onjuiste handtekening"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "De volgende pakketten bevatten een onjuiste handtekening"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Wilt u doorgaan met de installatie?"
-#: ../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 "Installatie mislukt"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "verwijderen van geïnstalleerde rpms (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "distribueren van %s"
+msgid "Try to continue anyway?"
+msgstr "Toch proberen om door te gaan?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "installeren van %s vanaf %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "installeren van %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "distribueren van %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Proberen te installeren zonder de afhankelijkheden te controleren?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Installatie trachten te forceren (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Pakketten zijn bijgewerkt"
-#: ../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 "Installatie is mogelijk"
@@ -1542,37 +1536,37 @@ msgstr "Gebruik \"-a\" om ze allemaal te gebruiken"
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "pakket(ten) %s gevonden in urpmi-db, maar geen ervan is geïnstalleerd"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Pakket %s is reeds geïnstalleerd"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "De pakketten %s zijn reeds geïnstalleerd"
-#: ../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 "vanwege conflicten met %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 "vanwege onvoldane %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "probeer %s op te waarderen"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "Om %s te behouden"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1581,7 +1575,7 @@ msgstr ""
"Het volgende pakket moet worden verwijderd om andere te kunnen opwaarderen:\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"
@@ -1591,12 +1585,12 @@ msgstr ""
"opwaarderen:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "in volgorde om %s te installeren"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "vanwege ontbrekende %s"
@@ -2618,7 +2612,9 @@ msgstr[1] "De volgende weespakketten worden verwijderd."
#: ../urpmi:600
#, c-format
msgid "WARNING: %s option is in use. Some strange problems may happen"
-msgstr "WAARSCHUWING: %s-optie is in gebruik. Er kunnen zich onverwachte problemen voordoen"
+msgstr ""
+"WAARSCHUWING: %s-optie is in gebruik. Er kunnen zich onverwachte problemen "
+"voordoen"
#: ../urpmi:612
#, c-format
@@ -2647,12 +2643,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Verdergaan met de installatie van 1 pakket?"
msgstr[1] "Verdergaan met de installatie van de %d pakketten?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Druk op Enter wanneer de koppeling tot stand is gebracht..."
@@ -3397,19 +3388,19 @@ msgstr "--list-nodes kan alleen worden gebruikt met --parallel"
msgid "use -l to list files"
msgstr "gebruik -l om bestanden op te sommen"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"geen xml-info voor medium \"%s\", slechts een deelresultaat voor pakket %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"geen xml-info voor medium\"%s\", slechts een deelresultaat voor pakketten %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3417,7 +3408,7 @@ msgstr ""
"geen xml-info voor medium \"%s\", niet in staat resultaten te geven voor "
"pakket %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3425,7 +3416,7 @@ msgstr ""
"geen xml-info voor medium \"%s\", niet in staat een resultaat te geven voor "
"pakketten %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Geen wijzigingslogboek gevonden\n"
@@ -3438,6 +3429,18 @@ msgstr "Software-installatie"
msgid "Graphical front end to install RPM files"
msgstr "Grafische schil voor het installeren van RPM bestanden"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Installatie is mislukt, sommige bestanden missen:\n"
+#~ "%s\n"
+#~ "Misschien moet u de urpmi database opwaarderen"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuleren"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "Kan niet naar bestand schrijven"
diff --git a/po/nn.po b/po/nn.po
index 05a4b1b1..1f642313 100644
--- a/po/nn.po
+++ b/po/nn.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-07 16:49+0100\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -250,7 +250,7 @@ msgstr ""
msgid "Warning"
msgstr "Åtvaring"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "OK"
@@ -310,7 +310,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakke – %d MB)"
msgstr[1] "(%d pakkar – %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 "Fann ikkje kjeldepakke. Avbryt."
@@ -347,38 +347,41 @@ msgstr "... Feil ved nedlasting: %s"
msgid "_Done"
msgstr "_Ferdig"
-#: ../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 ""
"Feil ved installering. Nokre filer manglar:\n"
-"%s\n"
-"Du bør oppdatera urpmi-databasen."
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Du bør oppdatera urpmi-databasen."
-#: ../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 "Feil ved installering:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Alt er allereie installert."
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Installeringa er fullført"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "Fjernar «%s»."
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "Startar urpmi på nytt."
@@ -507,59 +510,59 @@ msgstr "Klarte ikkje registrera lokale pakkar."
msgid "This operation is forbidden while running in restricted mode"
msgstr "Du kan ikkje køyra denne operasjonen i avgrensa modus."
-#: ../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 "Ugyldig mellomtenardeklarasjon på kommandolinja.\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: Klarer ikkje lesa rpm-fila «%s».\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "Uventa uttrykk: %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "Manglar uttrykk før «%s»."
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "Uventa uttrykk: %s (forslag: bruk «-a» eller «-o»)."
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "Ingen uttrykk å lukka."
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"Som standard ventar urpmf eit regulært uttrykk. Du bør bruka valet «--"
"literal»."
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "«chroot»-mappa finst ikkje."
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan ikkje bruka «%s» utan «%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 "Kan ikkje bruka «%s» med «%s»."
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "For mange argument.\n"
@@ -608,7 +611,7 @@ msgstr "Klarte ikkje lesa oppsettfila [%s]."
msgid "medium `%s' is defined twice, aborting"
msgstr "Mediet «%s» er definert to gonger. Avbryt."
-#: ../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 "Klarte ikkje skriva oppsettfila [%s]."
@@ -725,22 +728,22 @@ msgstr " %s %% fullført. Fart: %s."
msgid "retrieving %s"
msgstr "Hentar «%s»."
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "Henta «%s»."
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "Ukjend protokoll definert for «%s»."
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "Fann ingen «webfetch». Støtta «webfetch»-ar er: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "Kan ikkje bruka protokollen: %s."
@@ -863,26 +866,17 @@ msgstr "%s-databasen er låst. Ventar ..."
msgid "aborting"
msgstr "avbryt"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Prøv på nytt?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Feil ved installering. Nokre filer manglar:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Du bør oppdatera urpmi-databasen."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -891,7 +885,7 @@ msgstr ""
"Feil ved installering. Ugyldige RPM-pakkar:\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 "
@@ -902,68 +896,68 @@ msgstr ""
"%s, men har berre %s ledig.\n"
"Er du sikker på at du vil halda fram?"
-#: ../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 "Feil ved installering"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Vil du prøva å halda fram likevel?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Denne pakken har ugyldig signatur"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Desse pakkane har ugyldige signaturar"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Vil du halda fram med å installera?"
-#: ../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 "Feil ved installering"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "Fjernar installerte rpm-pakkar (%s)."
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "Fordeler %s."
+msgid "Try to continue anyway?"
+msgstr "Vil du prøva å halda fram likevel?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "Installerer %s frå %s."
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "Installerer %s."
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "Fordeler %s."
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Vil du installera utan å kontrollera avhengnader?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Vil du prøva endå sterkare å installera («--force»)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Pakkane er alt i nyaste versjon."
-#: ../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 "Det går an å installera."
@@ -1508,37 +1502,37 @@ msgid "found package(s) %s in urpmi db, but none are installed"
msgstr ""
"Fann pakke/pakkar %s i urpmi-databsen, men ingen av dei er installerte."
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Pakken «%s» er alt installert."
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Pakkane «%s» er alt installerte."
-#: ../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 "på grunn av konfliktar med «%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 "då «%s» ikkje er tilfredsstilt"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "Prøver å prioritera «%s»"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "for å kunna behalda «%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 ""
"Denne pakken må fjernast for at andre skal kunna oppgraderast:\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 ""
"Desse pakkane må fjernast for at andre skal kunna oppgraderast:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "for å kunna installera «%s»"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "då «%s» manglar"
@@ -2577,12 +2571,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Vil du halda fram med installeringa av pakken?"
msgstr[1] "Vil du halda fram med installeringa av dei %d pakkane?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Trykk «Enter» når han er montert ..."
@@ -3317,32 +3306,32 @@ msgstr "Kan berre bruka «--list-nodes« saman med «--parallel»."
msgid "use -l to list files"
msgstr "Bruk «-l» for å visa filer."
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "Ingen xml-info for mediet «%s». Berre delvis resultat for pakken «%s»."
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Ingen xml-info for mediet «%s». Berre delvis resultat for pakkane «%s»."
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"Ingen xml-info for mediet «%s». Kan ikkje visa resultat for pakken «%s»."
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"Ingen xml-info for mediet «%s». Kan ikkje visa resultat for pakkane «%s»."
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Fann ikkje endringslogg.\n"
@@ -3355,6 +3344,18 @@ msgstr "Programinstallering"
msgid "Graphical front end to install RPM files"
msgstr "Grafisk grensesnitt for installering av RPM-filer"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Feil ved installering. Nokre filer manglar:\n"
+#~ "%s\n"
+#~ "Du bør oppdatera urpmi-databasen."
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/pa_IN.po b/po/pa_IN.po
index 9fe6e2b3..9f6edf53 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -7,7 +7,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: 2005-03-23 21:55+0530\n"
"Last-Translator: Kanwaljeet Singh Brar <kanwaljeetbrar@yahoo.co.in>\n"
"Language-Team: Panjabi <fedora-trans-pa@redhat.com>\n"
@@ -252,7 +252,7 @@ msgstr ""
msgid "Warning"
msgstr "ਚੇਤਾਵਨੀ"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "ਠੀਕ ਹੈ"
@@ -314,7 +314,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ਸਰੋਤ ਪੈਕੇਜ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ, ਅਧੂਰਾ ਛੱਡਿਆ ਜਾਦਾ ਹੈ"
@@ -351,38 +351,42 @@ msgstr "...ਪ੍ਰਾਪਤੀ ਅਸਫਲ: %s"
msgid "_Done"
msgstr "ਸਮਾਪਤ(_D)"
-#: ../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 "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਰਹੀ ਹੈ, ਕੁਝ ਫਾਇਲਾਂ ਨਹੀਂ ਹਨ:\n"
"%s\n"
"ਤੁਸੀਂ ਆਪਣੇ 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "ਇੰਸਟਾਲੇਸ਼ ਸਮਾਪਤ"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "%s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "urpmi ਮੁੜ ਚਾਲੂ"
@@ -511,57 +515,57 @@ msgstr "ਸਥਾਨਕ ਪੈਕੇਜ ਰਜਿਸਟਰ ਕਰਨ ਦੌਰ
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "ਕਮਾਂਡ ਸਤਰ ਤੇ ਗਲਤ ਪਰਾਕਸੀ ਪ੍ਰਗਟਾ\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm ਫਾਇਲ \"%s\" ਪੜੀ ਨਹੀਂ ਜਾ ਸਕਦੀ\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "ਦਸਤਖਤ (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -608,7 +612,7 @@ msgstr "ਸੰਰਚਨਾ ਫਾਇਲ [%s] ਲਿਖਣ ਤੋਂ ਅਸਫਲ
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "ਸੰਰਚਨਾ ਫਾਇਲ [%s] ਲਿਖਣ ਤੋਂ ਅਸਫਲ"
@@ -723,22 +727,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "%s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...ਪ੍ਰਾਪਤੀ ਅਸਫਲ: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s ਲਈ ਅਣਜਾਣ ਪ੍ਰੋਟੋਕਾਲ"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "ਕੋਈ webfetch ਨਹੀਂ ਲੱਭਿਆ ਹੈ, ਸਹਿਯੋਗ webfetch ਹਨ: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ਪ੍ਰੋਟੋਕਾਲ ਹੈਂਡਲ ਕਰਨ ਲਈ ਅਸਫਲ: %s"
@@ -859,19 +863,12 @@ msgstr "urpmi ਡਾਟਾਬੇਸ ਤਾਲਾਬੰਦ ਹੈ"
msgid "aborting"
msgstr "ਚੇਤਾਵਨੀ"
-#: ../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 "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -879,14 +876,14 @@ msgstr ""
"%s\n"
"ਤੁਸੀਂ ਆਪਣੇ urpmi ਡਾਟਾਬੇਸ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰ ਸਕਦੇ ਹੋ"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
-#: ../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 "
@@ -894,68 +891,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 "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "ਕੀ ਤੁਸੀਂ ਇੰਸਟਾਲੇਸ਼ਨ ਨਾਲ ਜਾਰੀ ਰਹਿਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../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 "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "%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 "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "%s ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "%s ਵੰਡਿਆ ਜਾਦਾ ਹ"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "ਬਿਨਾਂ ਨਿਰਭਰਤਾਂ ਦੇ ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਕੋਸ਼ਿਸ ਕਰਨੀ ਹੈ? (y/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਧੱਕੇ ਨਾਲ ਵਰਤਣਾ ਹੈ (--force)? (y/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਭਵ ਹੈ"
@@ -1483,37 +1480,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-#: ../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 "%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 "ਨਾ-ਪੂਰਾ %s ਹੋਣ ਕਰਕੇ"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "%s ਨੂੰ ਵਧਾਉਣ ਦੀ ਕੋਸ਼ਿਸ ਦੌਰਾਨ"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "%s ਰੱਖਣ ਲਈ"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1522,7 +1519,7 @@ msgstr ""
"ਹੋਰ ਪੈਕੇਜਾਂ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੌਰਾਨ ਇਹ ਪੈਕੇਜ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ:\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"
@@ -1531,12 +1528,12 @@ msgstr ""
"ਹੋਰ ਪੈਕੇਜਾਂ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੌਰਾਨ ਇਹ ਪੈਕੇਜ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "%s ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "ਗੁੰਮ %s ਹੋਣ ਕਰਕੇ"
@@ -2541,12 +2538,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "ਰੱਦ ਕਰੋ"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "ਕਿਰਪਾ ਕਰਕੇ ਤਿਆਰ ਹੋਣ ਤੇ Enter ਦਬਾਓ..."
@@ -3245,21 +3237,21 @@ msgstr "--list-nodes ਨੂੰ --parallel ਨਾਲ ਹੀ ਵਰਤਿਆ ਜ
msgid "use -l to list files"
msgstr "\"%s\" ਦੀ list ਫਾਇਲ ਲਿਖਣ ਲਈ ਅਸਫਲ"
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"ਸੂਚਨਾ: ਕਿਉਕਿ hdlists ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਈ ਮਾਧਿਅਮ ਨਹੀਂ ਲੱਭਿਆ, ਇਸਕਰਕੇ urpmf ਵਲੋਂ ਕੋਈ ਨਤੀਜਾ "
"ਨਹੀਂ\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"ਸੂਚਨਾ: ਕਿਉਕਿ hdlists ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਈ ਮਾਧਿਅਮ ਨਹੀਂ ਲੱਭਿਆ, ਇਸਕਰਕੇ urpmf ਵਲੋਂ ਕੋਈ ਨਤੀਜਾ "
"ਨਹੀਂ\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3267,7 +3259,7 @@ msgstr ""
"ਸੂਚਨਾ: ਕਿਉਕਿ hdlists ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਈ ਮਾਧਿਅਮ ਨਹੀਂ ਲੱਭਿਆ, ਇਸਕਰਕੇ urpmf ਵਲੋਂ ਕੋਈ ਨਤੀਜਾ "
"ਨਹੀਂ\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3275,7 +3267,7 @@ msgstr ""
"ਸੂਚਨਾ: ਕਿਉਕਿ hdlists ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਈ ਮਾਧਿਅਮ ਨਹੀਂ ਲੱਭਿਆ, ਇਸਕਰਕੇ urpmf ਵਲੋਂ ਕੋਈ ਨਤੀਜਾ "
"ਨਹੀਂ\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "ਕੋਈ changelog ਨਹੀਂ\n"
@@ -3288,6 +3280,18 @@ msgstr ""
msgid "Graphical front end to install RPM files"
msgstr ""
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਰਹੀ ਹੈ, ਕੁਝ ਫਾਇਲਾਂ ਨਹੀਂ ਹਨ:\n"
+#~ "%s\n"
+#~ "ਤੁਸੀਂ ਆਪਣੇ urpmi ਡਾਟਾਬੇਸ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰ ਸਕਦੇ ਹੋ"
+
+#~ msgid "Cancel"
+#~ msgstr "ਰੱਦ ਕਰੋ"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "ਫਾਇਲ [%s] ਲਿਖਣ ਲਈ ਅਸਫਲ"
diff --git a/po/pl.po b/po/pl.po
index 76035578..cf6c20bc 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -19,7 +19,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-01-11 22:17+0100\n"
"Last-Translator: Marek Walczak <kubdat@poczta.fm>\n"
"Language-Team: <pl@li.org>\n"
@@ -275,7 +275,7 @@ msgstr ""
msgid "Warning"
msgstr "Ostrzeżenie"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -338,7 +338,7 @@ msgstr[0] "(%d pakiet, %d MB)"
msgstr[1] "(%d pakietów, %d MB)"
msgstr[2] "(%d pakietów, %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 "nie można pobrać pakietów źródłowych, zaniechanie"
@@ -375,38 +375,41 @@ msgstr "...pobieranie nie powiodło się: %s"
msgid "_Done"
msgstr "Gotowe"
-#: ../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 ""
-"Instalacja zakończona niepowodzeniem, brakuje kilku plików:\n"
-"%s\n"
-"Może zachodzić potrzeba aktualizacji bazy danych urpmi"
+"Instalacja nie powiodła się. Brak niektórych plików:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Być może konieczna jest aktualizacja bazy 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 "Instalacja nie powiodła się:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Wszystko zostało już zainstalowane"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalacja zakończona"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "usuwanie %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "ponownie uruchamianie urpmi"
@@ -535,57 +538,57 @@ msgstr "błąd w trakcie rejestrowania pakietów lokalnych"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operacja niedozwolona podczas pracy w trybie restrykcyjnym"
-#: ../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 "niepoprawna deklaracja serwera pośredniczącego w wierszu poleceń\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nie można odczytać pliku rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "niespodziewane wyrażenie %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "brakujące wyrażenie przed %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "niespodziewane wyrażenie %s (sugestia: użyj -a lub -o ?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "brak wyrażenia do zamknięcia"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "w domyślnym ustawieniu urpmf oczekuje regexp. Użyj opcji \"--literal\""
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Katalog chroot nie istnieje"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Nie można użyć %s bez %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 "Nie można użyć %s z %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Zbyt wiele argumentów\n"
@@ -634,7 +637,7 @@ msgstr "odczytanie pliku konfiguracyjnego było niemożliwe [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "nośnik %s jest dwukrotnie zdefiniowany, przerywanie"
-#: ../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 "nie można zapisać pliku konfiguracyjnego [%s]"
@@ -751,22 +754,22 @@ msgstr " %s%% zakończono, prędkość = %s"
msgid "retrieving %s"
msgstr "pobieranie %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "...pobrano %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "nieznany protokół zdefiniowany dla %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "nie znaleziono narzędzia do pobierania stron, obsługiwanymi są: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "nie można obsłużyć protokołu: %s"
@@ -889,26 +892,17 @@ msgstr "%s baza danych zablokowana. Oczekiwanie..."
msgid "aborting"
msgstr "przerywanie"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Ponowić próbę?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Instalacja nie powiodła się. Brak niektórych plików:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Być może konieczna jest aktualizacja bazy urpmi."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -917,7 +911,7 @@ msgstr ""
"Instalacja nie powiodła się. Nieprawidłowe pakiety rpm:\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 "
@@ -928,68 +922,68 @@ msgstr ""
"wymagane, %s dostępne).\n"
"Czy na pewno chcesz kontynuować?"
-#: ../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 "Instalacja nie powiodła się"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Czy po mimo to chcesz kontynuować?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Poniższy pakiet ma niepoprawny podpis"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Następujące pakiety zawierają niepoprawne podpisy"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Czy chcesz kontynuować instalację ?"
-#: ../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 "Instalacja nie powiodła się"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "usuwanie zainstalowanych pakietów rpm (%s) "
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "rozpowszechnianie %s"
+msgid "Try to continue anyway?"
+msgstr "Czy po mimo to chcesz kontynuować?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "instalowanie %s z %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "instalowanie %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "rozpowszechnianie %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Próbować instalować bez sprawdzania zależności?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Czy chcesz spróbować wymusić instalację (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Oprogramowanie jest zaktualizowane"
-#: ../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 "Instalacja jest możliwa"
@@ -1550,37 +1544,37 @@ msgstr ""
"odnaleziono pakiet(y) %s w bazie danych urpmi, ale żaden nie jest "
"zainstalowany"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Pakiet %s jest już zainstalowany w systemie"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Pakiet %s jest już zainstalowany w systemie"
-#: ../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 "z powodu kolizji z pakietem %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 "z powodu niesatysfakcjonującego pakietu %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "próba ulepszenia %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "w celu zachowania pakietu %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"
@@ -1589,7 +1583,7 @@ msgstr ""
"Poniższy pakiet musi zostać usunięte aby zaktualizować inne:\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"
@@ -1598,12 +1592,12 @@ msgstr ""
"Poniższe pakiety muszą być usunięte aby zaktualizować inne:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "w celu zainstalowania pakietu %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "z powodu brakującego %s"
@@ -2648,12 +2642,7 @@ msgstr[0] "Rozpocząć instalację jednego pakietu? "
msgstr[1] "Rozpocząć instalację %d pakietów?"
msgstr[2] "Rozpocząć instalację 1 pakietu? (%d MB)"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Naciśnij Enter po zamontowaniu..."
@@ -3398,21 +3387,21 @@ msgstr "--list-nodes może być użyta tylko z opcją --parallel"
msgid "use -l to list files"
msgstr "użyj opcji -l aby wyświetlić listę plików"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"brak informacji xml dla nośnika \"%s\", uzyskano częściowe wyniki dla "
"pakietu %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"brak informacji xml dla nośnika \"%s\", uzyskano częściowe wyniki dla "
"pakietów %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3420,7 +3409,7 @@ msgstr ""
"brak informacji xml dla nośnika \"%s\", uzyskanie wyników dla pakietu %s "
"było niemożliwe"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3428,7 +3417,7 @@ msgstr ""
"brak informacji xml dla nośnika \"%s\", uzyskanie wyników dla pakietów %s "
"było niemożliwe"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Nie znaleziono dziennika zmian\n"
@@ -3441,6 +3430,18 @@ msgstr "Instalator oprogramowania"
msgid "Graphical front end to install RPM files"
msgstr "Graficzna nakładka dla instalatora plików RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Instalacja zakończona niepowodzeniem, brakuje kilku plików:\n"
+#~ "%s\n"
+#~ "Może zachodzić potrzeba aktualizacji bazy danych urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Anuluj"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/pt.po b/po/pt.po
index c33f9372..2779a9f4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt\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-11-24 12:11+0000\n"
"Last-Translator: Zé <mmodem00@gmail.com>\n"
"Language-Team: Portuguese <>\n"
@@ -273,7 +273,7 @@ msgstr ""
msgid "Warning"
msgstr "Aviso"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -335,7 +335,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pacote, %d MB)"
msgstr[1] "(%d pacotes, %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 "não é possível obter os pacotes fonte, a abortar"
@@ -372,38 +372,41 @@ msgstr "...transferência falhada: %s"
msgid "_Done"
msgstr "_Terminado"
-#: ../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 ""
"Instalação falhada, faltam alguns ficheiros:\n"
-"%s\n"
-"Talvez precise actualizar a sua base de dados urpmi."
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Talvez precise actualizar a sua base de dados 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 "Instalação falhada:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "O(s) pacote(s) já está(ão) instalado(s)"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalação finalizada"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "a remover %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "a reiniciar urpmi"
@@ -532,59 +535,59 @@ msgstr "erro ao registar os pacotes locais"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operação é proibida enquanto correr em modo restrito"
-#: ../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 "declaração 'proxy' inválida na linha de comando\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: não consegue ler o ficheiro rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "expressão inesperada %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "falta uma expressão antes de %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "expressão inesperada %s (sugestão: use -a ou -o ?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "nenhuma expressão para fechar"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"por predefinição o urpmf espera uma expressão regular. Deve usar a opção \"--"
"literal\""
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "o directório chroot não existe"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Não pode usar %s sem %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 "Não pode usar %s com %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
@@ -633,7 +636,7 @@ msgstr "não é possível ler o ficheiro de configuração [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "a média `%s' está definida duas vezes, abortar"
-#: ../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 "não é possível gravar o ficheiro de configuração [%s]"
@@ -749,24 +752,24 @@ msgstr " %s%% terminado, velocidade = %s"
msgid "retrieving %s"
msgstr "a transferir %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "transferido %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocolo desconhecido definido para %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
"nenhum programa de transferências encontrado, os programas de transferências "
"suportados são: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "não é possível usar o protocolo: %s"
@@ -889,26 +892,17 @@ msgstr "base de dados %s trancada. Por favor aguarde..."
msgid "aborting"
msgstr "a abortar."
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Tentar novamente?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Instalação falhada, faltam alguns ficheiros:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Talvez precise actualizar a sua base de dados urpmi."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -917,7 +911,7 @@ msgstr ""
"Instalação falhada, rpm danificado:\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 "
@@ -928,68 +922,68 @@ msgstr ""
"(%s needed, %s available).\n"
"Tem certeza que deseja continuar?"
-#: ../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 "Instalação falhada"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Deseja continuar a tentar?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "O seguinte pacote tem uma assinatura inválida"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Os seguintes pacotes têm assinaturas inválidas"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Deseja continuar a instalação?"
-#: ../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 "Instalação falhada"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "a remover rpms instalados (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "a distribuir %s"
+msgid "Try to continue anyway?"
+msgstr "Deseja continuar a tentar?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "a instalar %s de %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "a instalar %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "a distribuir %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Tentar instalação sem verificar dependências?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Tentar forçar a instalação (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Os pacotes estão actualizados"
-#: ../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 "A instalação é possível"
@@ -1533,37 +1527,37 @@ msgstr ""
"encontrado(s) %s pacote(s) na base de dados urpmi, mas nenhum se encontra "
"instalado"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "O pacote %s já se encontra instalado"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Os pacote %s já se encontram instalados"
-#: ../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 "devido a conflitos com %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 "devido a não satisfazer %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "a tentar promover %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "para poder manter %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"
@@ -1572,7 +1566,7 @@ msgstr ""
"O seguinte pacote tem que ser removido para que outros sejam actualizados:\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"
@@ -1582,12 +1576,12 @@ msgstr ""
"actualizados:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "para poder instalar %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "devido a faltar %s"
@@ -2639,12 +2633,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Prosseguir com a instalação do pacote?"
msgstr[1] "Prosseguir com a instalação dos %d pacotes?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Prima Enter quando estiver montado..."
@@ -3387,21 +3376,21 @@ msgstr "--list-nodes pode apenas ser usada com a opção --parallel"
msgid "use -l to list files"
msgstr "use -l para listar ficheiros"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"nenhuma informação xml da média \"%s\", apenas o resultado parcial do pacote "
"%s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"nenhuma informação xml da média \"%s\", apenas o resultado parcial dos "
"pacotes %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3409,7 +3398,7 @@ msgstr ""
"nenhuma informação xml da média \"%s\", incapaz de devolver qualquer "
"resultado do pacote %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3417,7 +3406,7 @@ msgstr ""
"nenhuma informação xml da média \"%s\", incapaz de devolver qualquer "
"resultado dos pacotes %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Nenhum registo de mudanças (changelog) encontrado\n"
@@ -3430,6 +3419,18 @@ msgstr "Instalador de Programas"
msgid "Graphical front end to install RPM files"
msgstr "Interface gráfico para instalar ficheiros RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Instalação falhada, faltam alguns ficheiros:\n"
+#~ "%s\n"
+#~ "Talvez precise actualizar a sua base de dados urpmi."
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6e5503f3..8800141e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\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-03-15 18:45-0300\n"
"Last-Translator: Sergio Rafael Lemke <sergio@mandriva.com.br>\n"
"Language-Team: Brazilian Portuguese <cooker-i18n@mandrivalinux.org>\n"
@@ -272,7 +272,7 @@ msgstr ""
msgid "Warning"
msgstr "Aviso"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -333,7 +333,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pacote, %d MB)"
msgstr[1] "(%d pacotes, %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 "incapaz de obter pacotes fonte, abortando"
@@ -370,38 +370,41 @@ msgstr "...a busca falhou: %s"
msgid "_Done"
msgstr "_Pronto"
-#: ../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 ""
-"Instalação falhou, alguns arquivos estão faltando:.\n"
-"%s\n"
-"Você deve atualizar a sua base de dados urpmi"
+"A instalação falhou, alguns arquivos faltam:\n"
+"%s"
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Você deve atualizar a sua base de dados urpmi."
+
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, c-format
msgid "Installation failed:"
msgstr "A Instalação falhou:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Tudo já está instalado"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalação concluída"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "removendo %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
@@ -530,58 +533,58 @@ msgstr "erro ao registrar pacotes locais"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operação não é permitida no modo restrito"
-#: ../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 "declaração de proxy errada na linha de comando\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: não pode ler o arquivo rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "expressão inesperada %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "expressão faltando antes %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "expressão inesperada %s (sugestão: usar -a ou -o ?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "sem expressão para fechar"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"por padrão urpmf espera uma regexp. você pode usar a opção \"--literal\""
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "diretório chroot não existe"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Não é possível usar %s sem %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 "Não é possível usar %s com %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Muitos parâmetros\n"
@@ -631,7 +634,7 @@ msgstr "incapaz de ler o arquivo de configuração [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "mídia `%s' está definida duas vezes, abortando"
-#: ../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 "incapaz de gravar o arquivo de configuração [%s]"
@@ -748,22 +751,22 @@ msgstr " %s%% completados. Velocidade = %s"
msgid "retrieving %s"
msgstr "buscando %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "recebido %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocolo desconhecido definido para %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "nenhuma webfetch encontrada, webfetch suportadas são: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "incapaz de usar protocolo: %s"
@@ -885,26 +888,17 @@ msgstr "Base de dados %s está bloqueada. Esperando..."
msgid "aborting"
msgstr "cancelando"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Tentar Novamente ?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"A instalação falhou, alguns arquivos faltam:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Você deve atualizar a sua base de dados urpmi."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -913,7 +907,7 @@ msgstr ""
"A instalação falhou, rpms ruins:\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 "
@@ -924,68 +918,68 @@ msgstr ""
"programas (necessário %s, livre %s).\n"
"Deseja continuar mesmo assim ?"
-#: ../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 "A Instalação falhou"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Continuar mesmo assim?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "O seguinte programa contém assinaturas erradas"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Os seguintes programas contêm assinaturas erradas"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Você deseja continuar a instalação?"
-#: ../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 "A Instalação falhou"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "removendo rpms instalados (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "distribuindo %s"
+msgid "Try to continue anyway?"
+msgstr "Continuar mesmo assim?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "instalando %s a partir de %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 "distribuindo %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Tentar instalar sem checar as dependências?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Forçar instalação (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Pacotes estão atualizados"
-#: ../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 "Instalação é possível"
@@ -1524,37 +1518,37 @@ msgid "found package(s) %s in urpmi db, but none are installed"
msgstr ""
"encontrado(s) o(s) pacote(s) %s na base urpmi, mas nenhum está instalado"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Pacote %s já está instalado"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Pacotes %s já estão instalados"
-#: ../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 "devido a conflitos com %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 "devido a estar faltando %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "tentando promover %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "para manter %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"
@@ -1563,7 +1557,7 @@ msgstr ""
"Este pacote precisa ser removido para que os outros sejam atualizados:\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"
@@ -1572,12 +1566,12 @@ msgstr ""
"Estes programas precisam ser removidos para outros serem atualizados:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "devido estar faltando %s"
@@ -2605,12 +2599,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Proceder a instalação de um pacote?"
msgstr[1] "Proceder a instalação de %d pacotes?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Tecle Enter quando montado..."
@@ -3340,31 +3329,31 @@ msgstr "--list-nodes só pode ser usado com --parallel"
msgid "use -l to list files"
msgstr "use -l para listar arquivos"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "sem xml info para a mídia \"%s\", resultado parcial para o pacote %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr "sem xml info para a mídia \"%s\", resultado parcial para os pacotes %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"sem xml info para a mídia \"%s\", incapaz de retornar resultados para %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"sem xml info para a mídia \"%s\", incapaz de retornar resultados para %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Arquivo com as alterações não foi encontrado \n"
@@ -3377,6 +3366,18 @@ msgstr "Instalador de Programas"
msgid "Graphical front end to install RPM files"
msgstr "Interface gráfica para instalar pacotes RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Instalação falhou, alguns arquivos estão faltando:.\n"
+#~ "%s\n"
+#~ "Você deve atualizar a sua base de dados urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/ro.po b/po/ro.po
index aca93c34..2bb8e1d2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -39,7 +39,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-ro\n"
"Report-Msgid-Bugs-To: https://qa.mandriva.com\n"
-"POT-Creation-Date: 2012-03-21 08:44+0100\n"
+"POT-Creation-Date: 2012-06-08 19:19+0200\n"
"PO-Revision-Date: 2012-04-24 00:53+0100\n"
"Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
"Language-Team: Romanian <cfrussen@yahoo.co.uk>\n"
@@ -47,7 +47,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1))\n"
"X-Poedit-Language: Romanian\n"
"X-Poedit-Country: ROMANIA\n"
"X-Generator: Lokalize 1.0\n"
@@ -63,9 +64,7 @@ msgstr "Instalare RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Eroare: nu s-a găsit fișierul %s, se anulează operația"
-#: ../gurpmi:47
-#: ../gurpmi2:196
-#: ../gurpmi2:221
+#: ../gurpmi:47 ../gurpmi2:196 ../gurpmi2:221
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -77,7 +76,8 @@ msgid ""
"\n"
"%s\n"
"\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
"\n"
"What would you like to do?"
msgstr ""
@@ -85,12 +85,12 @@ msgstr ""
"\n"
"%s\n"
"\n"
-"Probabil nu v-ați dorit instalarea lui pe calculator (instalarea v-ar fi permis modificarea codului sursă, apoi compilarea sa).\n"
+"Probabil nu v-ați dorit instalarea lui pe calculator (instalarea v-ar fi "
+"permis modificarea codului sursă, apoi compilarea sa).\n"
"\n"
"Ce doriți să faceți?"
-#: ../gurpmi:75
-#: ../gurpmi:86
+#: ../gurpmi:75 ../gurpmi:86
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -130,8 +130,7 @@ msgstr "_Instalează"
msgid "_Save"
msgstr "_Salvează"
-#: ../gurpmi:101
-#: ../gurpmi2:196
+#: ../gurpmi:101 ../gurpmi2:196
#, c-format
msgid "_Cancel"
msgstr "_Anulează"
@@ -141,19 +140,20 @@ msgstr "_Anulează"
msgid "Choose location to save file"
msgstr "Alegeți locația unde se salvează fișierul"
-#: ../gurpmi.pm:39
-#: ../urpmi:66
+#: ../gurpmi.pm:39 ../urpmi:66
#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urpmi versiunea %s\n"
"Drepturi de autor (C) 1999-2010 Mandriva.\n"
-"Acesta este un program liber și poate fi redistribuit sub termenii licenței GNU GPL.\n"
+"Acesta este un program liber și poate fi redistribuit sub termenii licenței "
+"GNU GPL.\n"
"\n"
"utilizare:\n"
@@ -162,88 +162,86 @@ msgstr ""
msgid "Options:"
msgstr "Opțiuni:"
-#: ../gurpmi.pm:46
-#: ../urpme:46
-#: ../urpmf:35
-#: ../urpmi:71
-#: ../urpmi.addmedia:55
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:71 ../urpmi.addmedia:55
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - afișează acest mesaj de ajutor.\n"
-#: ../gurpmi.pm:47
-#: ../urpmi:78
+#: ../gurpmi.pm:47 ../urpmi:78
#, c-format
-msgid " --auto - non-interactive mode, assume default answers to questions.\n"
-msgstr " --auto - mod neinteractiv, se atribuie întrebărilor răspunsurile implicite.\n"
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions.\n"
+msgstr ""
+" --auto - mod neinteractiv, se atribuie întrebărilor răspunsurile "
+"implicite.\n"
-#: ../gurpmi.pm:48
-#: ../urpmi:79
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:79 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - selectează automat pachetele pentru actualizarea sistemului.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - selectează automat pachetele pentru actualizarea "
+"sistemului.\n"
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:102
-#: ../urpmq:68
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:102 ../urpmq:68
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - forțează invocarea chiar dacă unele pachete nu există.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - forțează invocarea chiar dacă unele pachete nu există.\n"
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
" --verify-rpm - verifică semnătura rpm înainte de instalare\n"
-" (--no-verify-rpm o dezactivează, implicit este activată).\n"
+" (--no-verify-rpm o dezactivează, implicit este "
+"activată).\n"
-#: ../gurpmi.pm:52
-#: ../urpmf:41
-#: ../urpmi:72
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:72 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
-msgstr " --media - utilizează numai mediile date, separate prin virgulă.\n"
+msgstr ""
+" --media - utilizează numai mediile date, separate prin virgulă.\n"
-#: ../gurpmi.pm:53
-#: ../urpmi:150
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - permite căutarea în furnizori pentru găsirea pachetelor.\n"
+msgstr ""
+" -p - permite căutarea în furnizori pentru găsirea pachetelor.\n"
-#: ../gurpmi.pm:54
-#: ../urpmi:151
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -P - nu se căuta în furnizori pentru găsirea pachetelor.\n"
+msgstr ""
+" -P - nu se căuta în furnizori pentru găsirea pachetelor.\n"
-#: ../gurpmi.pm:55
-#: ../urpmi:109
-#: ../urpmq:71
+#: ../gurpmi.pm:55 ../urpmi:109 ../urpmq:71
#, c-format
msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - utilizează alt administrator pentru instalarea pachetelor.\n"
+msgstr ""
+" --root - utilizează alt administrator pentru instalarea "
+"pachetelor.\n"
-#: ../gurpmi.pm:56
-#: ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:135
#, c-format
-msgid " --test - only verify if the installation can be achieved correctly.\n"
-msgstr " --test - verifică dacă instalarea poate fi îndeplinită corect.\n"
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - verifică dacă instalarea poate fi îndeplinită corect.\n"
-#: ../gurpmi.pm:57
-#: ../urpmi:75
+#: ../gurpmi.pm:57 ../urpmi:75
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - utilizează numai mediile indicate pentru căutarea pachetelor cerute.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - utilizează numai mediile indicate pentru căutarea "
+"pachetelor cerute.\n"
#: ../gurpmi.pm:100
#, c-format
@@ -275,8 +273,7 @@ msgstr "Instalare de pachete"
msgid "Preparing packages installation..."
msgstr "Se pregătesc pachetele pentru instalare..."
-#: ../gurpmi2:112
-#: ../urpmi:509
+#: ../gurpmi2:112 ../urpmi:509
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -302,7 +299,6 @@ msgid "Warning"
msgstr "Avertisment"
#: ../gurpmi2:155
-#: ../urpmi:642
#, c-format
msgid "Ok"
msgstr "OK"
@@ -339,21 +335,23 @@ msgid ""
"%s\n"
"Continue installation anyway?"
msgstr ""
-"Următoarele pachete trebuiesc înlăturate pentru ca celelalte să fie actualizate:\n"
+"Următoarele pachete trebuiesc înlăturate pentru ca celelalte să fie "
+"actualizate:\n"
"%s\n"
"Continuați totuși instalarea?"
-#: ../gurpmi2:276
-#: ../urpmi:609
+#: ../gurpmi2:276 ../urpmi:609
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "Pentru satisfacerea dependențelor, următorul pachet va fi instalat:"
-#: ../gurpmi2:277
-#: ../urpmi:610
+#: ../gurpmi2:277 ../urpmi:610
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Pentru satisfacerea dependențelor, următoarele pachete vor fi instalate:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Pentru satisfacerea dependențelor, următoarele pachete vor fi instalate:"
#: ../gurpmi2:279
#, c-format
@@ -363,14 +361,12 @@ msgstr[0] "(%d pachet, %d Mo)"
msgstr[1] "(%d pachete, %d Mo)"
msgstr[2] "(%d de pachete, %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 "nu se pot prelua pachetele sursă, se abandonează"
-#: ../gurpmi2:319
-#: ../urpm/install.pm:81
+#: ../gurpmi2:319 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Pregătire..."
@@ -380,8 +376,7 @@ msgstr "Pregătire..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Se instalează pachetul „%s” (%s/%s)..."
-#: ../gurpmi2:343
-#: ../urpmi:637
+#: ../gurpmi2:343 ../urpmi:637
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Inserați mediul numit „%s”"
@@ -391,12 +386,8 @@ msgstr "Inserați mediul numit „%s”"
msgid "Downloading package `%s'..."
msgstr "Se descarcă pachetul „%s”..."
-#: ../gurpmi2:369
-#: ../urpm.pm:338
-#: ../urpm/download.pm:831
-#: ../urpm/get_pkgs.pm:262
-#: ../urpm/media.pm:981
-#: ../urpm/media.pm:1493
+#: ../gurpmi2:369 ../urpm.pm:338 ../urpm/download.pm:831
+#: ../urpm/get_pkgs.pm:262 ../urpm/media.pm:981 ../urpm/media.pm:1493
#: ../urpm/media.pm:1644
#, c-format
msgid "...retrieving failed: %s"
@@ -407,42 +398,41 @@ msgstr "...preluare eșuată: %s"
msgid "_Done"
msgstr "_Gata"
-#: ../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 ""
-"Instalare eșuată, lipsesc cîteva fișiere.\n"
-"%s\n"
-"Probabil ar trebui să actualizați baza de date urpmi"
+"Instalare eșuată, lipsesc cîteva fișiere:\n"
+"%s"
-#: ../gurpmi2:408
-#: ../urpm/main_loop.pm:292
-#: ../urpm/main_loop.pm:335
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Poate ar trebui să actualizați baza de date urpmi."
+
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, c-format
msgid "Installation failed:"
msgstr "Instalare eșuată:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Totul este deja instalat"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalare terminată"
-#: ../gurpmi2:416
-#: ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "se înlătură %s"
-#: ../gurpmi2:427
-#: ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "se repornește urpmi"
@@ -481,8 +471,7 @@ msgstr " implicit este %s \n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - afișează numele complet al pachetului (NVRA)\n"
-#: ../rurpmi:11
-#: ../urpmi:269
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Doar administratorul poate instala pachete"
@@ -517,9 +506,7 @@ msgstr "Nu se pot descărca pachetele în %s"
msgid "Environment directory %s does not exist"
msgstr "Directorul %s nu există"
-#: ../urpm.pm:151
-#: ../urpmf:248
-#: ../urpmq:167
+#: ../urpm.pm:151 ../urpmf:248 ../urpmq:167
#, c-format
msgid "using specific environment on %s\n"
msgstr "utilizînd mediul specific pe %s\n"
@@ -539,8 +526,7 @@ msgstr "nume invalid de fișier rpm [%s]"
msgid "retrieving rpm file [%s] ..."
msgstr "se preia fișierul rpm [%s] ..."
-#: ../urpm.pm:335
-#: ../urpm/get_pkgs.pm:260
+#: ../urpm.pm:335 ../urpm/get_pkgs.pm:260
#, c-format
msgid "...retrieving done"
msgstr "...copierea este terminată"
@@ -575,82 +561,83 @@ msgstr "eroare la înregistrarea pachetelor locale"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Această operație este interzisă cînd rulați în modul restricționat"
-#: ../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 "declarație greșită de proxy în linia de comandă\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nu se poate citi fișierul rpm „%s”\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "expresie neprevăzută %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "lipsește expresia înaintea lui %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "expresie neprevăzută %s (sugestie: utilizați -a sau -o ?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "nici o expresie pentru închidere"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "urpmf așteaptă implicit un regexp. ar trebui să utilizați opțiunea „--literal”"
+msgstr ""
+"urpmf așteaptă implicit un regexp. ar trebui să utilizați opțiunea „--"
+"literal”"
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "directorul chroot nu există"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Nu se poate utiliza %s fără %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 "Nu se poate utiliza %s cu %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Prea multe argumente\n"
-#: ../urpm/bug_report.pm:55
-#: ../urpmi:259
+#: ../urpm/bug_report.pm:55 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Copiere eșuată"
#: ../urpm/cdrom.pm:67
#, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "Trebuie să montați singur discul optic (sau instalați perl-Hal-Cdroms pentru a se efectua automat)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"Trebuie să montați singur discul optic (sau instalați perl-Hal-Cdroms pentru "
+"a se efectua automat)"
#: ../urpm/cdrom.pm:69
#, c-format
msgid "Udisks daemon (udisks-daemon) is not running or not ready"
msgstr "serviciul Udisks (udisks-daemon) nu rulează sau nu este pregătit"
-#: ../urpm/cdrom.pm:161
-#: ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "mediul „%s” nu este disponibil"
@@ -675,8 +662,7 @@ msgstr "nu se poate citi fișierul de configurare [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "mediul „%s” este definit de două ori, se abandonează"
-#: ../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 "nu se poate scrie în fișierul de configurare [%s]"
@@ -689,7 +675,9 @@ msgstr "%s nu este disponibil, se revine la %s"
#: ../urpm/download.pm:166
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "nu se pot citi parametrii de proxy (drepturi insuficiente pentru citirea lui %s) "
+msgstr ""
+"nu se pot citi parametrii de proxy (drepturi insuficiente pentru citirea lui "
+"%s) "
#: ../urpm/download.pm:191
#, c-format
@@ -793,22 +781,22 @@ msgstr " %s%% complet, viteză = %s"
msgid "retrieving %s"
msgstr "se preia %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "%s preluat"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocol necunoscut definit pentru %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "nu s-a găsit webfech, versiunile suportate sînt: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "nu se poate folosi protocolul: %s"
@@ -835,8 +823,11 @@ msgstr "[reîmpachetare]"
#: ../urpm/install.pm:168
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "tranzacție creată pentru instalarea pe %s (înlăturate=%d, instalate=%d, actualizate=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"tranzacție creată pentru instalarea pe %s (înlăturate=%d, instalate=%d, "
+"actualizate=%d)"
#: ../urpm/install.pm:171
#, c-format
@@ -858,8 +849,7 @@ msgstr "nu se poate instala pachetul %s"
msgid "removing bad rpm (%s) from %s"
msgstr "se înlătură pachetul deteriorat (%s) din %s"
-#: ../urpm/install.pm:213
-#: ../urpm/install.pm:278
+#: ../urpm/install.pm:213 ../urpm/install.pm:278
#, c-format
msgid "removing %s failed: %s"
msgstr "înlăturarea lui %s a eșuat: %s"
@@ -904,8 +894,7 @@ msgstr "Server nedefinit, lipsește URI sau gazda"
msgid "No base defined"
msgstr "Bază nedefinită"
-#: ../urpm/ldap.pm:173
-#: ../urpm/ldap.pm:176
+#: ../urpm/ldap.pm:173 ../urpm/ldap.pm:176
#, c-format
msgid "Cannot connect to ldap uri:"
msgstr "Conectare imposibilă la URI LDAP:"
@@ -930,26 +919,17 @@ msgstr "Baza de date %s este blocată. Așteptare..."
msgid "aborting"
msgstr "abandonare"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Reîncercați?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Instalare eșuată, lipsesc cîteva fișiere:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Poate ar trebui să actualizați baza de date urpmi."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -958,80 +938,79 @@ msgstr ""
"Instalare eșuată, pachete eronate:\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 needed, %s available).\n"
+"There is not enough space on your filesystem to download all packages (%s "
+"needed, %s available).\n"
"Are you sure you want to continue?"
msgstr ""
-"Nu dispuneți de destul spațiu liber pentru a descărca toate pachetele (%s necesari, %s disponibili).\n"
+"Nu dispuneți de destul spațiu liber pentru a descărca toate pachetele (%s "
+"necesari, %s disponibili).\n"
"Sigur doriți să continuați?"
-#: ../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 "Instalare eșuată"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Continuați totuși?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Pachetul următor are semnătura greșită"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Pachetele următoare au semnături greșite"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Doriți să continuați instalarea?"
-#: ../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 "Instalare eșuată"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "se înlătură pachetele instalate (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "se distribuie %s"
+msgid "Try to continue anyway?"
+msgstr "Continuați totuși?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "se instalează %s din %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "se instalează %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "se distribuie %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Se încearcă instalarea fără verificarea dependențelor?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Se încearcă instalarea forțată (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Pachetele sînt actualizate"
-#: ../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 "Instalarea este posibilă"
@@ -1083,8 +1062,12 @@ msgstr "se utilizează mediile asociate pentru modul paralel: %s"
#: ../urpm/media.pm:610
#, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "--synthesis nu poate fi folosit cu --media, --excludemedia, --sortmedia, --update, --use-distrib sau --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--synthesis nu poate fi folosit cu --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib sau --parallel"
#: ../urpm/media.pm:719
#, c-format
@@ -1144,7 +1127,8 @@ msgstr "nu se poate analiza media.cfg"
#: ../urpm/media.pm:982
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "nu se poate accesa mediul de instalare (nu s-a găsit fișierul media.cfg)"
+msgstr ""
+"nu se poate accesa mediul de instalare (nu s-a găsit fișierul media.cfg)"
#: ../urpm/media.pm:1003
#, c-format
@@ -1211,15 +1195,12 @@ msgstr "se examinează fișierul synthesis [%s]"
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problemă la citirea fișierului synthesis al mediului „%s”"
-#: ../urpm/media.pm:1370
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1370 ../urpm/media.pm:1465
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "se copiază [%s] pentru mediul „%s”..."
-#: ../urpm/media.pm:1372
-#: ../urpm/media.pm:1442
-#: ../urpm/media.pm:1695
+#: ../urpm/media.pm:1372 ../urpm/media.pm:1442 ../urpm/media.pm:1695
#, c-format
msgid "...copying failed"
msgstr "...copiere eșuată"
@@ -1229,8 +1210,7 @@ msgstr "...copiere eșuată"
msgid "copying description file of \"%s\"..."
msgstr "se copiază fișierul cu descrieri pentru „%s”..."
-#: ../urpm/media.pm:1440
-#: ../urpm/media.pm:1469
+#: ../urpm/media.pm:1440 ../urpm/media.pm:1469
#, c-format
msgid "...copying done"
msgstr "...copiere încheiată"
@@ -1245,8 +1225,7 @@ msgstr "copierea fișierului [%s] a eșuat (fișier suspect de mic)"
msgid "computing md5sum of retrieved source synthesis"
msgstr "se calculează md5sum pentru fișierul synthesis"
-#: ../urpm/media.pm:1521
-#: ../urpm/media.pm:1961
+#: ../urpm/media.pm:1521 ../urpm/media.pm:1961
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "descărcarea lui [%s] a eșuat (eroare de md5sum)"
@@ -1316,8 +1295,7 @@ msgstr "mediul „%s” este actualizat"
msgid "retrieval of [%s] failed"
msgstr "preluarea lui [%s] a eșuat"
-#: ../urpm/mirrors.pm:19
-#: ../urpm/mirrors.pm:40
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "se reîncearcă cu serverul alternativ %s"
@@ -1337,25 +1315,18 @@ msgstr "localizarea geografică %s %.2f % găsită.2f din fusul orar %s"
msgid "getting mirror list from %s"
msgstr "se preia lista de servere alternative de la %s"
-#: ../urpm/msg.pm:76
-#: ../urpmi:495
-#: ../urpmi:513
-#: ../urpmi:629
+#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:629
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77
-#: ../urpme:38
-#: ../urpmi.addmedia:133
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi.addmedia:133
#, c-format
msgid "Yy"
msgstr "Dd"
-#: ../urpm/msg.pm:107
-#: ../urpme:163
-#: ../urpmi.addmedia:136
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:136
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
@@ -1420,8 +1391,7 @@ msgstr "Mo"
msgid "GB"
msgstr "Go"
-#: ../urpm/msg.pm:208
-#: ../urpm/msg.pm:217
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
#, c-format
msgid "TB"
msgstr "To"
@@ -1467,23 +1437,28 @@ msgstr[2] "Poate doriți să le înlăturați."
msgid ""
"The following package:\n"
"%s\n"
-"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans\""
+"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans"
+"\""
msgid_plural ""
"The following packages:\n"
"%s\n"
-"are now orphaned, if you wish to remove them, you can use \"urpme --auto-orphans\""
+"are now orphaned, if you wish to remove them, you can use \"urpme --auto-"
+"orphans\""
msgstr[0] ""
"Următorul pachet:\n"
"%s\n"
-"este acum orfan, puteți utiliza „urpme --auto-orphans” dacă doriți să-l înlăturați"
+"este acum orfan, puteți utiliza „urpme --auto-orphans” dacă doriți să-l "
+"înlăturați"
msgstr[1] ""
"Următoarele pachete:\n"
"%s\n"
-"sînt acum orfane, puteți utiliza „urpme --auto-orphans” dacă doriți să le înlăturați"
+"sînt acum orfane, puteți utiliza „urpme --auto-orphans” dacă doriți să le "
+"înlăturați"
msgstr[2] ""
"Următoarele pachete:\n"
"%s\n"
-"sînt acum orfane, puteți utiliza „urpme --auto-orphans” dacă doriți să le înlăturați"
+"sînt acum orfane, puteți utiliza „urpme --auto-orphans” dacă doriți să le "
+"înlăturați"
#: ../urpm/parallel.pm:15
#, c-format
@@ -1537,16 +1512,19 @@ msgstr "cp a eșuat la gazda %s (%d)"
#: ../urpm/parallel_ssh.pm:86
#, c-format
-msgid "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit code: %d)"
-msgstr "%s a eșuat la gazda %s (poate nu are versiunea corectă de urpmi?) (cod de eroare: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"%s a eșuat la gazda %s (poate nu are versiunea corectă de urpmi?) (cod de "
+"eroare: %d)"
#: ../urpm/removable.pm:33
#, c-format
msgid "unable to access medium \"%s\"."
msgstr "nu se poate accesa mediul „%s”"
-#: ../urpm/removable.pm:73
-#: ../urpm/removable.pm:91
+#: ../urpm/removable.pm:73 ../urpm/removable.pm:91
#, c-format
msgid "mounting %s"
msgstr "se montează %s"
@@ -1563,16 +1541,17 @@ msgstr "urpmi a repornit, lista pachetelor prioritare nu s-a modificat"
#: ../urpm/select.pm:33
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi a repornit, lista pachetelor prioritare s-a modificat: %s contra %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi a repornit, lista pachetelor prioritare s-a modificat: %s contra %s"
#: ../urpm/select.pm:186
#, c-format
msgid "No package named %s"
msgstr "Nici un pachet numit %s"
-#: ../urpm/select.pm:188
-#: ../urpme:117
+#: ../urpm/select.pm:188 ../urpme:117
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Următoarele pachete conțin %s: %s"
@@ -1587,39 +1566,37 @@ msgstr "Ar trebui să folosiți „-a” pentru a-i utiliza pe toți"
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "s-au găsit pachetele %s în urpmi db, dar nu sînt instalate"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Pachetul %s este deja instalat"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Pachetele %s sînt deja instalate"
-#: ../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 "datorită conflictelor cu %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 "datorită dependenței nesatisfăcute %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "se încearcă promovarea lui %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "pentru a păstra %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"
@@ -1628,21 +1605,22 @@ msgstr ""
"Pachetul următor trebuie înlăturat pentru ca celelalte să fie actualizate:\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"
"%s"
msgstr ""
-"Pachetele următoare trebuiesc înlăturate pentru ca celelalte să fie actualizate:\n"
+"Pachetele următoare trebuiesc înlăturate pentru ca celelalte să fie "
+"actualizate:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "pentru a instala %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "datorită lipsei lui %s"
@@ -1702,13 +1680,15 @@ msgstr "Nu se poate muta fișierul %s la %s"
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urpme versiunea %s\n"
"Drepturi de autor (C) 1999-2010 Mandriva.\n"
-"Acesta este un program liber și poate fi redistribuit sub termenii licenței GNU GPL.\n"
+"Acesta este un program liber și poate fi redistribuit sub termenii licenței "
+"GNU GPL.\n"
"\n"
"utilizare:\n"
@@ -1725,17 +1705,15 @@ msgstr " --auto-orphans - înlătură pachetele orfane\n"
#: ../urpme:49
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - verifică dacă înlăturarea poate fi îndeplinită corect.\n"
+msgstr ""
+" --test - verifică dacă înlăturarea poate fi îndeplinită corect.\n"
-#: ../urpme:51
-#: ../urpmi:108
-#: ../urpmq:70
+#: ../urpme:51 ../urpmi:108 ../urpmq:70
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuit între mașinile de alias.\n"
-#: ../urpme:52
-#: ../urpmi:142
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - reîmpachetează fișierele înaintea ștergerii\n"
@@ -1743,30 +1721,29 @@ msgstr " --repackage - reîmpachetează fișierele înaintea ștergerii\n"
#: ../urpme:53
#, c-format
msgid " --root - use another root for rpm removal.\n"
-msgstr " --root - utilizează alt administrator pentru înlăturarea pachetelor.\n"
+msgstr ""
+" --root - utilizează alt administrator pentru înlăturarea "
+"pachetelor.\n"
-#: ../urpme:54
-#: ../urpmf:40
-#: ../urpmi:110
-#: ../urpmi.addmedia:73
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:48
-#: ../urpmq:72
+#: ../urpme:54 ../urpmf:40 ../urpmi:110 ../urpmi.addmedia:73
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:72
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - utilizează alt administrator pentru urpmi db și instalarea de pachete.\n"
+msgstr ""
+" --urpmi-root - utilizează alt administrator pentru urpmi db și "
+"instalarea de pachete.\n"
-#: ../urpme:55
-#: ../urpmi:100
+#: ../urpme:55 ../urpmi:100
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - se actualizează doar rpm db, nu și sistemul de fișiere.\n"
+msgstr ""
+" --justdb - se actualizează doar rpm db, nu și sistemul de fișiere.\n"
#: ../urpme:56
#, c-format
msgid " --noscripts - do not execute package scriptlet(s).\n"
-msgstr " --noscripts - nu se execută scripturile suplimentare ale pachetului.\n"
+msgstr ""
+" --noscripts - nu se execută scripturile suplimentare ale pachetului.\n"
#: ../urpme:57
#, c-format
@@ -1774,12 +1751,11 @@ msgid ""
" --use-distrib - configure urpme on the fly from a distrib tree, useful\n"
" to (un)install a chroot with --root option.\n"
msgstr ""
-" --use-distrib - configurează din mers urpme dintr-un arbore de distribuție, utilă\n"
+" --use-distrib - configurează din mers urpme dintr-un arbore de "
+"distribuție, utilă\n"
" pentru (dez)instalarea chroot cu opțiunea --root .\n"
-#: ../urpme:59
-#: ../urpmi:153
-#: ../urpmq:91
+#: ../urpme:59 ../urpmi:153 ../urpmq:91
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose , -v - mod detaliat.\n"
@@ -1787,7 +1763,8 @@ msgstr " --verbose , -v - mod detaliat.\n"
#: ../urpme:60
#, c-format
msgid " -a - select all packages matching expression.\n"
-msgstr " -a - selectează toate pachetele ce se potrivesc cu expresia.\n"
+msgstr ""
+" -a - selectează toate pachetele ce se potrivesc cu expresia.\n"
#: ../urpme:75
#, c-format
@@ -1825,10 +1802,13 @@ msgstr "Nu sînt pachete orfane de înlăturat"
#: ../urpme:151
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
msgstr[0] "Pentru satisfacerea dependențelor, pachetul următor va fi înlăturat"
-msgstr[1] "Pentru satisfacerea dependențelor, următoarele pachete %d vor fi înlăturate"
-msgstr[2] "Pentru satisfacerea dependențelor, următoarele pachete %d vor fi înlăturate"
+msgstr[1] ""
+"Pentru satisfacerea dependențelor, următoarele pachete %d vor fi înlăturate"
+msgstr[2] ""
+"Pentru satisfacerea dependențelor, următoarele pachete %d vor fi înlăturate"
#: ../urpme:156
#, c-format
@@ -1866,13 +1846,15 @@ msgstr "Înlăturarea este posibilă"
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage: urpmf [options] pattern-expression\n"
msgstr ""
"urpmf versiunea %s\n"
"Drepturi de autor (C) 2002-2010 Mandriva.\n"
-"Acesta este un program liber și poate fi redistribuit în termenii licenței GNU GPL.\n"
+"Acesta este un program liber și poate fi redistribuit în termenii licenței "
+"GNU GPL.\n"
"\n"
"utilizare: urpmf [opțiuni] model-expresie\n"
@@ -1881,52 +1863,52 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - afișează versiunea acestui utilitar.\n"
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:82
+#: ../urpmf:37 ../urpmi:132 ../urpmq:82
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env - utilizează un mediu specificat (de obicei un raport de erori).\n"
+msgstr ""
+" --env - utilizează un mediu specificat (de obicei un raport de "
+"erori).\n"
-#: ../urpmf:38
-#: ../urpmi:73
-#: ../urpmq:49
+#: ../urpmf:38 ../urpmi:73 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia - nu utilizează mediile date, separate prin virgulă.\n"
+msgstr ""
+" --excludemedia - nu utilizează mediile date, separate prin virgulă.\n"
#: ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l - nu se potrivesc modelele, se utilizează argumentul ca șir literal.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l - nu se potrivesc modelele, se utilizează argumentul ca șir "
+"literal.\n"
-#: ../urpmf:42
-#: ../urpmi:76
-#: ../urpmq:50
+#: ../urpmf:42 ../urpmi:76 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - sortează mediile conform subșirurilor separate prin virgulă.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia - sortează mediile conform subșirurilor separate prin "
+"virgulă.\n"
#: ../urpmf:43
#, c-format
msgid " --use-distrib - use the given path to access media\n"
msgstr " --use-distrib - se utilizează calea indicată către mediu\n"
-#: ../urpmf:44
-#: ../urpmi:77
-#: ../urpmq:51
+#: ../urpmf:44 ../urpmi:77 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - utilizează fișierul synthesis dat în loc de urpmi db.\n"
+msgstr ""
+" --synthesis - utilizează fișierul synthesis dat în loc de urpmi db.\n"
#: ../urpmf:45
#, c-format
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - nu afișează liniile identice de două ori.\n"
-#: ../urpmf:46
-#: ../urpmi:74
-#: ../urpmq:46
+#: ../urpmf:46 ../urpmi:74 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - utilizează numai mediile de actualizare.\n"
@@ -1944,7 +1926,9 @@ msgstr " -i - ignoră sensibilitatea la majuscule în modele.\n"
#: ../urpmf:49
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - respectă sensibilitatea la majuscule în modele (implicit).\n"
+msgstr ""
+" -I - respectă sensibilitatea la majuscule în modele "
+"(implicit).\n"
#: ../urpmf:50
#, c-format
@@ -1959,7 +1943,9 @@ msgstr "Expresii regulate:\n"
#: ../urpmf:52
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr " text - orice text este analizat ca regexp, cu excepția utilizării lui -l.\n"
+msgstr ""
+" text - orice text este analizat ca regexp, cu excepția utilizării "
+"lui -l.\n"
#: ../urpmf:53
#, c-format
@@ -2121,11 +2107,11 @@ msgstr " --vendor - fabricant\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - mediul în care a fost găsit pachetul\n"
-#: ../urpmf:85
-#: ../urpmq:101
+#: ../urpmf:85 ../urpmq:101
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - afișează versiunea, ediția și arhitectura cu nume.\n"
+msgstr ""
+" -f - afișează versiunea, ediția și arhitectura cu nume.\n"
#: ../urpmf:153
#, c-format
@@ -2135,7 +2121,8 @@ msgstr "expresie nedeterminată (%s)"
#: ../urpmf:198
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Format incorect: puteți utiliza numai o singură etichetă cu valori multiple"
+msgstr ""
+"Format incorect: puteți utiliza numai o singură etichetă cu valori multiple"
#: ../urpmf:291
#, c-format
@@ -2172,24 +2159,26 @@ msgstr " --force-key - forțează actualizarea cheii gpg.\n"
msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - înlătură pachetele orfane fără confirmare\n"
-#: ../urpmi:84
-#: ../urpmq:56
+#: ../urpmi:84 ../urpmq:56
#, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
msgstr " --no-suggests - nu se selectează automat pachetele „sugerate”.\n"
#: ../urpmi:85
#, c-format
-msgid " --no-uninstall - never ask to uninstall a package, abort the installation.\n"
-msgstr " --no-uninstall - nu întreba pentru dezinstalarea unui pachet, abandonează instalarea.\n"
+msgid ""
+" --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+" --no-uninstall - nu întreba pentru dezinstalarea unui pachet, abandonează "
+"instalarea.\n"
#: ../urpmi:86
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - nu se instalează pachetele (se descarcă doar)\n"
-#: ../urpmi:87
-#: ../urpmq:58
+#: ../urpmi:87 ../urpmq:58
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -2212,7 +2201,8 @@ msgstr ""
#: ../urpmi:93
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
-msgstr " --split-length - lungimea tranzacțiilor mici, valoarea implicită este %d.\n"
+msgstr ""
+" --split-length - lungimea tranzacțiilor mici, valoarea implicită este %d.\n"
#: ../urpmi:95
#, c-format
@@ -2232,7 +2222,8 @@ msgstr " --install-src - instalează numai pachetele sursă (fără binare).\n
#: ../urpmi:98
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
-msgstr " --clean - șterge pachetele din pretampon înainte de orice altceva.\n"
+msgstr ""
+" --clean - șterge pachetele din pretampon înainte de orice altceva.\n"
#: ../urpmi:99
#, c-format
@@ -2241,7 +2232,8 @@ msgstr " --noclean - nu se șterg pachetele din pretampon.\n"
#: ../urpmi:101
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr " --replacepkgs - forțează reinstalarea pachetelor deja instalate.\n"
#: ../urpmi:103
@@ -2250,7 +2242,8 @@ msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-" --allow-nodeps - permite interogarea utilizatorului la instalarea pachetelor fără\n"
+" --allow-nodeps - permite interogarea utilizatorului la instalarea "
+"pachetelor fără\n"
" verificarea dependențelor\n"
#: ../urpmi:105
@@ -2260,7 +2253,8 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
" --allow-force - permite interogarea utilizatorului pentru instalarea\n"
-" pachetelor fără verificarea dependențelor și a integrității.\n"
+" pachetelor fără verificarea dependențelor și a "
+"integrității.\n"
#: ../urpmi:107
#, c-format
@@ -2273,20 +2267,23 @@ msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-" --use-distrib - configurează din mers urpmi dintr-un arbore de distribuție, utilă\n"
+" --use-distrib - configurează din mers urpmi dintr-un arbore de "
+"distribuție, utilă\n"
" pentru instalarea unui chroot cu opțiunea --root .\n"
-#: ../urpmi:113
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:37
+#: ../urpmi:113 ../urpmi.addmedia:60 ../urpmi.update:37
#, c-format
msgid " --metalink - generate and use a local metalink.\n"
msgstr " --metalink - generează și utilizează o metalegătură locală.\n"
#: ../urpmi:114
#, c-format
-msgid " --download-all - download all needed packages before trying to install them\n"
-msgstr " --download-all - descarcă toate pachetele necesare înainte de a încerca instalarea lor\n"
+msgid ""
+" --download-all - download all needed packages before trying to install "
+"them\n"
+msgstr ""
+" --download-all - descarcă toate pachetele necesare înainte de a încerca "
+"instalarea lor\n"
#: ../urpmi:115
#, c-format
@@ -2294,7 +2291,8 @@ msgid ""
" --downloader - program to use to retrieve distant files. \n"
" known programs: %s\n"
msgstr ""
-" --downloader - programul utilizat pentru descărcarea fișierelor distante. \n"
+" --downloader - programul utilizat pentru descărcarea fișierelor "
+"distante. \n"
" programe cunoscute: %s\n"
#: ../urpmi:118
@@ -2322,9 +2320,7 @@ msgstr " --prozilla-options - opțiuni adiționale de plasat lui prozilla\n"
msgid " --aria2-options - additional options to pass to aria2\n"
msgstr " --aria2-options - opțiuni adiționale de plasat lui aria2\n"
-#: ../urpmi:123
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:61 ../urpmi.update:38
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limitează viteza de descărcare.\n"
@@ -2338,28 +2334,24 @@ msgstr ""
" --resume - reia transferul fișierelor descărcate parțial.\n"
" (--no-resume o dezactivează, implicit este dezactivată).\n"
-#: ../urpmi:126
-#: ../urpmi.addmedia:62
-#: ../urpmi.update:39
-#: ../urpmq:78
+#: ../urpmi:126 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
" to be 1080 by default (format is <proxyhost[:port]>).\n"
msgstr ""
-" --proxy - utilizează proxyul HTTP specificat, numărul portului este considerat a fi\n"
+" --proxy - utilizează proxyul HTTP specificat, numărul portului este "
+"considerat a fi\n"
" implicit 1080 (formatul este <gazdăproxy[:port]>).\n"
-#: ../urpmi:128
-#: ../urpmi.addmedia:64
-#: ../urpmi.update:41
-#: ../urpmq:80
+#: ../urpmi:128 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:80
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
-" --proxy-user - specificați utilizatorul și parola pentru autentificarea pe proxy\n"
+" --proxy-user - specificați utilizatorul și parola pentru autentificarea "
+"pe proxy\n"
" (formatul este <utilizator:parolă>).\n"
#: ../urpmi:130
@@ -2384,17 +2376,20 @@ msgstr " --excludedocs - exclude fișierele de documentație.\n"
#: ../urpmi:138
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - nu se verifică spațiul pe disc înaintea instalării.\n"
+msgstr ""
+" --ignoresize - nu se verifică spațiul pe disc înaintea instalării.\n"
#: ../urpmi:139
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch - permite instalarea pachetelor pentru o altă arhitectură.\n"
+msgstr ""
+" --ignorearch - permite instalarea pachetelor pentru o altă arhitectură.\n"
#: ../urpmi:140
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
-msgstr " --noscripts - nu se execută scripturile suplimentare ale pachetului\n"
+msgstr ""
+" --noscripts - nu se execută scripturile suplimentare ale pachetului\n"
#: ../urpmi:141
#, c-format
@@ -2417,7 +2412,8 @@ msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-" --more-choices - cînd sînt găsite mai multe pachete, se propun mai multe opțiuni\n"
+" --more-choices - cînd sînt găsite mai multe pachete, se propun mai multe "
+"opțiuni\n"
" decît în mod implicit.\n"
#: ../urpmi:147
@@ -2428,13 +2424,14 @@ msgstr " --nolock - nu se blochează rpm db.\n"
#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - actualizează numai pachetele pentru aceeași arhitectură.\n"
+msgstr ""
+" --strict-arch - actualizează numai pachetele pentru aceeași arhitectură.\n"
-#: ../urpmi:149
-#: ../urpmq:99
+#: ../urpmi:149 ../urpmq:99
#, c-format
msgid " -a - select all matches on command line.\n"
-msgstr " -a - selectează toate potrivirile din linia de comandă.\n"
+msgstr ""
+" -a - selectează toate potrivirile din linia de comandă.\n"
#: ../urpmi:152
#, c-format
@@ -2449,12 +2446,14 @@ msgstr " --debug - mod detaliat.\n"
#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " numele sau fișierele rpm date în linia de comandă vor fi instalate.\n"
+msgstr ""
+" numele sau fișierele rpm date în linia de comandă vor fi instalate.\n"
#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Eroare: nu se poate utiliza --auto-select împreună cu lista de pachete.\n"
+msgstr ""
+"Eroare: nu se poate utiliza --auto-select împreună cu lista de pachete.\n"
#: ../urpmi:190
#, c-format
@@ -2462,7 +2461,8 @@ msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-"Eroare: Pentru raportarea unei erori, specificați argumentele uzuale din consolă\n"
+"Eroare: Pentru raportarea unei erori, specificați argumentele uzuale din "
+"consolă\n"
"împreună cu --bug.\n"
#: ../urpmi:220
@@ -2482,13 +2482,20 @@ msgstr "revenire implicită la --buildrequires"
#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "utilizați --buildrequires sau --install-src, revenire implicită la --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"utilizați --buildrequires sau --install-src, revenire implicită la --"
+"buildrequires"
#: ../urpmi:253
#, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Directorul [%s] există deja, utilizați un alt director pentru raportarea erorilor sau ștergeți-l"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Directorul [%s] există deja, utilizați un alt director pentru raportarea "
+"erorilor sau ștergeți-l"
#: ../urpmi:254
#, c-format
@@ -2530,8 +2537,12 @@ msgstr "%s (de instalat)"
#: ../urpmi:443
#, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
-msgstr "Pentru satisfacerea dependențelor lui „%s”, unul din pachetele următoare este necesar: "
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
+msgstr ""
+"Pentru satisfacerea dependențelor lui „%s”, unul din pachetele următoare "
+"este necesar: "
#: ../urpmi:446
#, c-format
@@ -2560,8 +2571,7 @@ msgstr ""
"mai vechi decît cele instalate:\n"
"%s"
-#: ../urpmi:496
-#: ../urpmi:514
+#: ../urpmi:496 ../urpmi:514
#, c-format
msgid ""
"\n"
@@ -2570,10 +2580,7 @@ msgstr ""
"\n"
"Continuați totuși instalarea?"
-#: ../urpmi:497
-#: ../urpmi:515
-#: ../urpmi:630
-#: ../urpmi.addmedia:136
+#: ../urpmi:497 ../urpmi:515 ../urpmi:630 ../urpmi.addmedia:136
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
@@ -2622,10 +2629,12 @@ msgstr "(doar test, fără înlăturare de pachete)"
#: ../urpmi:566
#, c-format
msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
"%s\n"
msgstr ""
-"Trebuie să rulați urpmi cu --buildrequires pentru instalarea următoarelor dependențe:\n"
+"Trebuie să rulați urpmi cu --buildrequires pentru instalarea următoarelor "
+"dependențe:\n"
"%s\n"
#: ../urpmi:576
@@ -2669,12 +2678,7 @@ msgstr[0] "Continuați cu instalarea pachetului?"
msgstr[1] "Continuați cu instalarea celor %d pachete?"
msgstr[2] "Continuați cu instalarea celor %d de pachete?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Anulează"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Apăsați „Enter” după montare..."
@@ -2713,7 +2717,8 @@ msgstr ""
" cdrom://<cale>\n"
"\n"
"utilizare: urpmi.addmedia [opțiuni] --distrib --mirrorlist <url>\n"
-"utilizare: urpmi.addmedia [opțiuni] --mirrorlist <url> <nume> <cale relativă>\n"
+"utilizare: urpmi.addmedia [opțiuni] --mirrorlist <url> <nume> <cale "
+"relativă>\n"
"\n"
"exemple:\n"
"\n"
@@ -2724,32 +2729,30 @@ msgstr ""
"\n"
"și [opțiunile] sînt din \n"
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:33
-#: ../urpmq:75
+#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:75
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
-msgstr " --wget - utilizează wget pentru preluarea fișierelor distante.\n"
+msgstr ""
+" --wget - utilizează wget pentru preluarea fișierelor distante.\n"
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:34
-#: ../urpmq:76
+#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:76
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
-msgstr " --curl - utilizează curl pentru preluarea fișierelor distante.\n"
+msgstr ""
+" --curl - utilizează curl pentru preluarea fișierelor distante.\n"
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:35
-#: ../urpmq:77
+#: ../urpmi.addmedia:58 ../urpmi.update:35 ../urpmq:77
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - utilizează prozilla pentru preluarea fișierelor distante.\n"
+msgstr ""
+" --prozilla - utilizează prozilla pentru preluarea fișierelor "
+"distante.\n"
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:59 ../urpmi.update:36
#, c-format
msgid " --aria2 - use aria2 to retrieve distant files.\n"
-msgstr " --aria2 - utilizează aria2 pentru preluarea fișierelor distante.\n"
+msgstr ""
+" --aria2 - utilizează aria2 pentru preluarea fișierelor distante.\n"
#: ../urpmi.addmedia:66
#, c-format
@@ -2758,16 +2761,19 @@ msgid ""
" or discard non-update media (when used with --distrib)\n"
msgstr ""
" --update - creează un mediu de actualizare, \n"
-" sau anulează un mediu non-actualizare (cînd este utilizat cu --distrib)\n"
+" sau anulează un mediu non-actualizare (cînd este utilizat "
+"cu --distrib)\n"
#: ../urpmi.addmedia:68
#, c-format
msgid ""
" --xml-info - use the specific policy for downloading xml info files\n"
-" one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
msgstr ""
" --xml-info - alegeți metoda pentru descărcarea fișierelor xml\n"
-" una din: niciodată, la cerere, numai la actualizări, întotdeauna. cf urpmi.cfg(5)\n"
+" una din: niciodată, la cerere, numai la actualizări, "
+"întotdeauna. cf urpmi.cfg(5)\n"
#: ../urpmi.addmedia:70
#, c-format
@@ -2796,7 +2802,8 @@ msgstr ""
#: ../urpmi.addmedia:76
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - cu --distrib, se cere confirmarea pentru fiecare mediu\n"
+msgstr ""
+" --interactive - cu --distrib, se cere confirmarea pentru fiecare mediu\n"
#: ../urpmi.addmedia:77
#, c-format
@@ -2806,10 +2813,10 @@ msgstr " --all-media - cu --distrib, se adaugă toate mediile listate\n"
#: ../urpmi.addmedia:78
#, c-format
msgid " --virtual - create virtual media wich are always up-to-date.\n"
-msgstr " --virtual - creează un mediu virtual ce este actualizat permanent.\n"
+msgstr ""
+" --virtual - creează un mediu virtual ce este actualizat permanent.\n"
-#: ../urpmi.addmedia:79
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:79 ../urpmi.update:44
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - dezactivează verificarea fișierelor cu MD5SUM.\n"
@@ -2822,18 +2829,15 @@ msgstr " --nopubkey - nu se importă cheia publică a mediului adăugat\n"
#: ../urpmi.addmedia:81
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - adaugă mediul în configurare, dar nu-l actualizează.\n"
+msgstr ""
+" --raw - adaugă mediul în configurare, dar nu-l actualizează.\n"
-#: ../urpmi.addmedia:82
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - mod silențios.\n"
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - mod detaliat.\n"
@@ -2851,7 +2855,8 @@ msgstr "nu sînt necesare argumente pentru --distrib --mirrorlist <url>"
#: ../urpmi.addmedia:112
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "<url> greșit (pentru directoarele locale, calea trebuie să fie absolută)"
+msgstr ""
+"<url> greșit (pentru directoarele locale, calea trebuie să fie absolută)"
#: ../urpmi.addmedia:116
#, c-format
@@ -2882,8 +2887,7 @@ msgstr ""
"\n"
"Doriți să adăugați mediul „%s”?"
-#: ../urpmi.addmedia:155
-#: ../urpmi.addmedia:179
+#: ../urpmi.addmedia:155 ../urpmi.addmedia:179
#, c-format
msgid "unable to add medium"
msgstr "nu se poate adăuga mediul"
@@ -2903,30 +2907,37 @@ msgstr "Nu se poate utiliza %s cu mediul distant"
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urpmi.recover versiunea %s\n"
"Drepturi de autor (C) 2006-2010 Mandriva.\n"
-"Acesta este un program liber și poate fi redistribuit sub termenii licenței GNU GPL.\n"
+"Acesta este un program liber și poate fi redistribuit sub termenii licenței "
+"GNU GPL.\n"
"\n"
"utilizare:\n"
#: ../urpmi.recover:34
#, c-format
msgid " --checkpoint - set repackaging start now\n"
-msgstr " --checkpoint - stabilirea punctului începerii acum a reîmpachetării \n"
+msgstr ""
+" --checkpoint - stabilirea punctului începerii acum a reîmpachetării \n"
#: ../urpmi.recover:35
#, c-format
msgid " --noclean - don't clean repackage directory on checkpoint\n"
-msgstr " --noclean - nu se curăță directorul de reîmpachetare la marcaj\n"
+msgstr ""
+" --noclean - nu se curăță directorul de reîmpachetare la marcaj\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
-msgstr " --list - afișați tranzacțiile corespunzătoare parametrului dată/durată\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
+msgstr ""
+" --list - afișați tranzacțiile corespunzătoare parametrului dată/"
+"durată\n"
#: ../urpmi.recover:38
#, c-format
@@ -3015,8 +3026,7 @@ msgstr "Nu sînt tranzacții începînd cu %s\n"
msgid "You must be superuser to do this"
msgstr "Trebuie să fiți admistrator pentru această operație"
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
#, c-format
msgid "Writing rpm macros file [%s]...\n"
msgstr "Scriere fișier script rpm [%s]...\n"
@@ -3063,7 +3073,8 @@ msgstr "Doar administratorul poate înlătura mediile"
#: ../urpmi.removemedia:71
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nimic de înlăturat (folosiți urpmi.addmedia pentru a adăuga un mediu)\n"
+msgstr ""
+"nimic de înlăturat (folosiți urpmi.addmedia pentru a adăuga un mediu)\n"
#: ../urpmi.removemedia:77
#, c-format
@@ -3096,7 +3107,9 @@ msgstr " --force-key - forțează actualizarea cheii gpg.\n"
#: ../urpmi.update:46
#, c-format
msgid " --ignore - don't update, mark the media as ignored.\n"
-msgstr " --ignore - nu se actualizează, se marchează mediul ca fiind ignorat.\n"
+msgstr ""
+" --ignore - nu se actualizează, se marchează mediul ca fiind "
+"ignorat.\n"
#: ../urpmi.update:47
#, c-format
@@ -3106,7 +3119,9 @@ msgstr " --no-ignore - fără actualizare, se marchează mediul ca activat.\
#: ../urpmi.update:49
#, c-format
msgid " --probe-rpms - do not use synthesis, use rpm files directly\n"
-msgstr " --probe-rpms - nu se utilizează synthesis, se utilizeză direct fișierele rpm\n"
+msgstr ""
+" --probe-rpms - nu se utilizează synthesis, se utilizeză direct fișierele "
+"rpm\n"
#: ../urpmi.update:50
#, c-format
@@ -3131,7 +3146,8 @@ msgstr "Doar administratorul poate actualiza mediile"
#: ../urpmi.update:86
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nimic de actualizat (folosiți urpmi.addmedia pentru a adăuga un mediu)\n"
+msgstr ""
+"nimic de actualizat (folosiți urpmi.addmedia pentru a adăuga un mediu)\n"
#: ../urpmi.update:87
#, c-format
@@ -3162,20 +3178,26 @@ msgstr "se activează %s"
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2010 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urpmq versiunea %s\n"
"Drepturi de autor © 2002-2010 Mandriva.\n"
-"Acesta este un program liber și poate fi redistribuit sub termenii licenței GNU GPL.\n"
+"Acesta este un program liber și poate fi redistribuit sub termenii licenței "
+"GNU GPL.\n"
"\n"
"utilizare:\n"
#: ../urpmq:48
#, c-format
-msgid " --searchmedia - use only the given media to search requested (or updated) packages.\n"
-msgstr " --searchmedia - utilizează numai mediul indicat pentru căutarea pachetelor cerute (sau actualizate).\n"
+msgid ""
+" --searchmedia - use only the given media to search requested (or updated) "
+"packages.\n"
+msgstr ""
+" --searchmedia - utilizează numai mediul indicat pentru căutarea "
+"pachetelor cerute (sau actualizate).\n"
#: ../urpmq:53
#, c-format
@@ -3189,12 +3211,14 @@ msgid ""
" - list installed packages not available on any media.\n"
msgstr ""
" --not-available\n"
-" - listează pachetele instalate ce nu se găsesc pe nici un mediu.\n"
+" - listează pachetele instalate ce nu se găsesc pe nici un "
+"mediu.\n"
#: ../urpmq:57
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
-msgstr " --fuzzy - impune căutarea aproximativă (identic cu -y).\n"
+msgstr ""
+" --fuzzy - impune căutarea aproximativă (identic cu -y).\n"
#: ../urpmq:60
#, c-format
@@ -3214,7 +3238,9 @@ msgstr " --list-url - listează mediile disponibile și adresele lor URL.\n"
#: ../urpmq:63
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - listează nodurile disponibile cînd se utilizează --parallel.\n"
+msgstr ""
+" --list-nodes - listează nodurile disponibile cînd se utilizează --"
+"parallel.\n"
#: ../urpmq:64
#, c-format
@@ -3223,23 +3249,30 @@ msgstr " --list-aliases - listează aliasurile paralele disponibile.\n"
#: ../urpmq:65
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - afișează configurarea in formatul argumentului urpmi.addmedia.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - afișează configurarea in formatul argumentului urpmi."
+"addmedia.\n"
#: ../urpmq:66
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - pachetul următor este un pachet sursă (identic cu -s).\n"
+msgstr ""
+" --src - pachetul următor este un pachet sursă (identic cu -s).\n"
#: ../urpmq:67
#, c-format
msgid " --sources - print source URLs of selected packages\n"
-msgstr " --sources - afișează adresele URL sursă ale pachetului selectat.\n"
+msgstr ""
+" --sources - afișează adresele URL sursă ale pachetului selectat.\n"
#: ../urpmq:69
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - permite căutarea pachetelor pentru arhitecturile necorespunzătoare.\n"
+msgstr ""
+" --ignorearch - permite căutarea pachetelor pentru arhitecturile "
+"necorespunzătoare.\n"
#: ../urpmq:73
#, c-format
@@ -3247,7 +3280,8 @@ msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-" -use-distrib - configurează din mers urpmi dintr-un arbore de distribuție.\n"
+" -use-distrib - configurează din mers urpmi dintr-un arbore de "
+"distribuție.\n"
" Aceasta permite interogarea unei distribuții.\n"
#: ../urpmq:83
@@ -3302,7 +3336,8 @@ msgstr ""
#: ../urpmq:94
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
-msgstr " --whatrequires - căutare inversă în lista de dependențe a pachetului.\n"
+msgstr ""
+" --whatrequires - căutare inversă în lista de dependențe a pachetului.\n"
#: ../urpmq:95
#, c-format
@@ -3320,12 +3355,15 @@ msgid ""
" - search in provides to find package.\n"
msgstr ""
" --whatprovides, -p\n"
-" - caută în furnizorii de pachete pentru găsirea pachetului.\n"
+" - caută în furnizorii de pachete pentru găsirea "
+"pachetului.\n"
#: ../urpmq:100
#, c-format
msgid " -c - complete output with package to be removed.\n"
-msgstr " -c - afișare în linia de comandă a pachetelor ce vor fi înlăturate.\n"
+msgstr ""
+" -c - afișare în linia de comandă a pachetelor ce vor fi "
+"înlăturate.\n"
#: ../urpmq:102
#, c-format
@@ -3355,17 +3393,23 @@ msgstr " -r - afișează versiunea și ediția și cu nume.\n"
#: ../urpmq:107
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - pachetul următor este un pachet sursă (identic cu -src).\n"
+msgstr ""
+" -s - pachetul următor este un pachet sursă (identic cu -src).\n"
#: ../urpmq:108
#, c-format
-msgid " -u - remove package if a more recent version is already installed.\n"
-msgstr " -u - înlătură pachetul dacă o versiune mai recentă este deja instalată.\n"
+msgid ""
+" -u - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+" -u - înlătură pachetul dacă o versiune mai recentă este deja "
+"instalată.\n"
#: ../urpmq:109
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
-msgstr " -y - impune căutarea aproximativă (identic cu --fuzzy).\n"
+msgstr ""
+" -y - impune căutarea aproximativă (identic cu --fuzzy).\n"
#: ../urpmq:110
#, c-format
@@ -3392,27 +3436,37 @@ msgstr "--list-nodes poate fi folosit numai cu --parallel"
msgid "use -l to list files"
msgstr "utilizați -l pentru afișarea fișierelor"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "nu sînt informații XML pentru mediul „%s”, numai rezultate parțiale pentru pachetul %s"
+msgstr ""
+"nu sînt informații XML pentru mediul „%s”, numai rezultate parțiale pentru "
+"pachetul %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "nu sînt informații XML pentru mediul „%s”, numai rezultate parțiale pentru pachetele %s"
+msgstr ""
+"nu sînt informații XML pentru mediul „%s”, numai rezultate parțiale pentru "
+"pachetele %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "nu sînt informații XML pentru mediul „%s”, nu se poate întoarce nici un rezultat pentru pachetul %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"nu sînt informații XML pentru mediul „%s”, nu se poate întoarce nici un "
+"rezultat pentru pachetul %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "nu sînt informații XML pentru mediul „%s”, nu se poate întoarce nici un rezultat pentru pachetele %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"nu sînt informații XML pentru mediul „%s”, nu se poate întoarce nici un "
+"rezultat pentru pachetele %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Nu s-a gasit jurnalul de modificări\n"
@@ -3425,6 +3479,18 @@ msgstr "Instalator de programe"
msgid "Graphical front end to install RPM files"
msgstr "Interfața grafică pentru instalarea fișierelor RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Instalare eșuată, lipsesc cîteva fișiere.\n"
+#~ "%s\n"
+#~ "Probabil ar trebui să actualizați baza de date urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Anulează"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/ru.po b/po/ru.po
index ce93ec9b..f3c39858 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\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: 2009-10-22 00:12+0500\n"
"Last-Translator: akdengi <kazancas@mandriva.ru>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
@@ -269,7 +269,7 @@ msgstr ""
msgid "Warning"
msgstr "Внимание"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "ОК"
@@ -329,7 +329,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d пакет, %d МБ)"
msgstr[1] "(%d пакетов, %d МБ)"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "не удаётся получить пакеты с исходными кодами, аварийное завершение"
@@ -366,38 +366,41 @@ msgstr "...извлечение не удалось: %s"
msgid "_Done"
msgstr "_Готово"
-#: ../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 ""
"Установка не удалась, отсутствуют некоторые файлы:\n"
-"%s\n"
-"Возможно, необходимо обновить базу данных urpmi"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Возможно, необходимо обновить базу данных 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 "Установка не удалась:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Всё уже установлено"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Установка завершена"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "удаляется %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "urpmi перезапускается"
@@ -526,60 +529,60 @@ msgstr "ошибка регистрации локальных пакетов"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Эта операция запрещена при работе в ограниченном режиме"
-#: ../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 "неверное объявление proxy в командной строке\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не удаётся прочитать rpm-файл «%s»\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "неожиданное выражение %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "перед %s отсутствует выражение"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
"неожиданное выражение %s (рекомендация: используйте параметр -a или -o)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "отсутствует выражения для закрытия"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"по умолчанию urpmf ожидает регулярное выражение. Используйте параметр «--"
"literal»"
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Каталог chroot не существует"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "%s нельзя использовать без %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 "%s нельзя использовать без %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Слишком много аргументов\n"
@@ -628,7 +631,7 @@ msgstr "не удаётся прочитать конфигурационный
msgid "medium `%s' is defined twice, aborting"
msgstr "источник «%s» определён дважды; останов"
-#: ../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 "не удаётся записать конфигурационный файл [%s]"
@@ -745,22 +748,22 @@ msgstr " %s%% завершено, скорость = %s"
msgid "retrieving %s"
msgstr "загружается %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "загружено %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "для %s определён неизвестный протокол"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "не найден webfetch; поддерживаемые webfetch: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "не удаётся обработать протокол: %s"
@@ -882,26 +885,17 @@ msgstr "база данных %s заблокирована, подождите.
msgid "aborting"
msgstr "прерывается"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Повторить попытку?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Установка не удалась, отсутствуют некоторые файлы:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Возможно, необходимо обновить базу данных urpmi"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -910,7 +904,7 @@ msgstr ""
"Не удалось установить; неверные rpm-файлы:\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 "
@@ -921,68 +915,68 @@ msgstr ""
"имеется).\n"
"Вы уверены, что хотите продолжить?"
-#: ../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 "Установка не удалась"
-
-#: ../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 "Следующий пакет имеет неверную подпись"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Следующие пакеты имеют неверные подписи"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Продолжить установку?"
-#: ../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 "Установка не удалась"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "удаляются установленные rpm-файлы (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "распределяется %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 "устанавливается %s из %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "устанавливается %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "распределяется %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Попробовать установить без проверки зависимостей?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Попробовать принудительную установку (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Пакеты находятся в актуальном состоянии"
-#: ../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 "Установка возможна."
@@ -1526,37 +1520,37 @@ msgstr "Чтобы выбрать все, используйте парамет
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "в базе данных найдены пакеты %s, но ни один из ни не установлен"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Пакет %s уже установлен"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Пакеты %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 "из-за конфликтов с %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 "из-за неудовлетворённости %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "попытка активизировать %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "чтобы сохранить %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"
@@ -1565,7 +1559,7 @@ msgstr ""
"Следующий пакет будет удалён для обновления остальных:\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"
@@ -1574,12 +1568,12 @@ msgstr ""
"Следующие пакеты будут удалены для обновления остальных:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "чтобы установить %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "из-за отсутствия %s"
@@ -2621,12 +2615,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Установить один пакет?"
msgstr[1] "Установить %d пакетов?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Отмена"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "После монтирования нажмите клавишу «Enter»..."
@@ -3372,21 +3361,21 @@ msgstr "--list-nodes может использоваться только с --p
msgid "use -l to list files"
msgstr "используйте -l для вывода списка файлов"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"для источника «%s» отсутствует xml-info; только частичный результат для "
"пакета %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"для источника «%s» отсутствует xml-info; только частичный результат для "
"пакетов %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3394,7 +3383,7 @@ msgstr ""
"для источника «%s» отсутствует xml-info; невозможно возвратить результат для "
"пакета %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3402,7 +3391,7 @@ msgstr ""
"для источника «%s» отсутствует xml-info; невозможно возвратить результат для "
"пакетов %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Не найден журнал изменений\n"
@@ -3415,6 +3404,18 @@ msgstr "Инсталлятор программ"
msgid "Graphical front end to install RPM files"
msgstr "Графический интерфейс для установки файлов RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Установка не удалась, отсутствуют некоторые файлы:\n"
+#~ "%s\n"
+#~ "Возможно, необходимо обновить базу данных urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Отмена"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/sc.po b/po/sc.po
index b5a0ca68..8474fd49 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sc\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: 2005-09-07 15:57+0100\n"
"Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
"Language-Team: Sardu\n"
@@ -257,7 +257,7 @@ msgstr ""
msgid "Warning"
msgstr "Atentu"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Andat"
@@ -320,7 +320,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d pakitus"
msgstr[1] "%d pakitus"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no potzu lompi a is pakitus mitza, bessu"
@@ -357,38 +357,42 @@ msgstr "...no agataus: %s"
msgid "_Done"
msgstr "_Fatu"
-#: ../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 "Aposentadura faddia"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Aposentadura faddia, amcncat cancu file:\n"
"%s\n"
"Forsis bolis ajorronai su database de 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Aposentadura faddia"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Pakitu(s) jai aposentau(s)"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Aposentadura acabada"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "srèxinu %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "torru a aberri urpmi"
@@ -517,57 +521,57 @@ msgstr "faddina assentendi is pakitus localis"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Custa cosa no fait a da fai candu ses in modalidadi strinta"
-#: ../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 "decrarada de proxy mala in arraya de cumandu\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: no fait a ligi su file rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Amancat sa firma (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -614,7 +618,7 @@ msgstr "no potzu scriri su file de assètiu [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "no potzu scriri su file de assètiu [%s]"
@@ -729,22 +733,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "srèxinu %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...no agataus: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocollu disconnotu indidau po %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "no apu agatau webfetch, cuddus suportaus funt: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "no potzu mainjai su protocollu: %s"
@@ -867,19 +871,12 @@ msgstr "su database de urpmi est serrau"
msgid "aborting"
msgstr "Atentu"
-#: ../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 "Aposentadura faddia"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -887,14 +884,14 @@ msgstr ""
"%s\n"
"Forsis bolis ajorronai su database de urpmi"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Aposentadura faddia"
-#: ../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 "
@@ -902,68 +899,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 "Aposentadura faddia"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Is pakitus ki sighint tenint firmas malas"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Is pakitus ki sighint tenint firmas malas"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Bolis sighiri a aposentai?"
-#: ../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 "Aposentadura faddia"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "aposentu %s de %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "seu distribuendi %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 "aposentu %s de %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "aposentu %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "seu distribuendi %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Provu a aposentai sentza de controllai is dependèntzias? (y/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Provu a aposentai de manera finas prus forti (--force)? (y/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Fait a aposentai"
@@ -1491,37 +1488,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Pakitu(s) jai aposentau(s)"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Pakitu(s) jai aposentau(s)"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Pakitu(s) jai aposentau(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 "ca gherrat cun %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 "ca no est satisfatu %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "provu a sçoberai %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "po podi apoderai %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1530,7 +1527,7 @@ msgstr ""
"Is pakitus ki sighint bolint srexinaus po ndi podi ajorronai atrus:\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"
@@ -1539,12 +1536,12 @@ msgstr ""
"Is pakitus ki sighint bolint srexinaus po ndi podi ajorronai atrus:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "po podi aposentai %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "ca amancat %s"
@@ -2573,12 +2570,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "No fait a aposentai is pakitus (%s)!"
msgstr[1] "No fait a aposentai is pakitus (%s)!"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Annudda"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Craca Enter candu ses prontu..."
@@ -3288,21 +3280,21 @@ msgstr "--list-nodes fait a d'impreai feti cun --parallel"
msgid "use -l to list files"
msgstr "no potzu scriri sa list de \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"Noda: sendi ki is mèdius castiaus no tenint hdlist, urpmf no at pòtziu "
"torrai arresurtau\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Noda: sendi ki is mèdius castiaus no tenint hdlist, urpmf no at pòtziu "
"torrai arresurtau\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3310,7 +3302,7 @@ msgstr ""
"Noda: sendi ki is mèdius castiaus no tenint hdlist, urpmf no at pòtziu "
"torrai arresurtau\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3318,7 +3310,7 @@ msgstr ""
"Noda: sendi ki is mèdius castiaus no tenint hdlist, urpmf no at pòtziu "
"torrai arresurtau\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "No apu agatau s'arrelata de is mudas\n"
@@ -3332,6 +3324,18 @@ msgstr "Aposentadori de Programas"
msgid "Graphical front end to install RPM files"
msgstr "Bisori gràfigu po aposentai file RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Aposentadura faddia, amcncat cancu file:\n"
+#~ "%s\n"
+#~ "Forsis bolis ajorronai su database de urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Annudda"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "No fait a creai su file de assètiu [%s]"
diff --git a/po/sk.po b/po/sk.po
index b41bbc22..21c9155a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,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: 2005-09-07 16:34+0100\n"
"Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
"Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -256,7 +256,7 @@ msgstr ""
msgid "Warning"
msgstr "Varovanie"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -321,7 +321,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nie je možné získať zdrojové balíky, prerušenie"
@@ -358,38 +358,42 @@ msgstr "...získavanie zlyhalo: %s"
msgid "_Done"
msgstr "_Hotovo"
-#: ../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 "Inštalácia zlyhala"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Inštalácia nebola úspešná, niektoré súbory chýbajú:\n"
"%s\n"
"Možno budete chcieť aktualizovať Vašu urpmi databázu"
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Inštalácia zlyhala"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Všetko je už nainštalované"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Inštalácia ukončená"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "odstraňovanie %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "znovuspustenie urpmi"
@@ -519,57 +523,57 @@ msgstr "chyba pri registrácii lokálnych balíkov"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Táto operácia nie je povolená ak program beží v reštriktívnom režime"
-#: ../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 "nesprávna deklarácia proxy v príkazovom riadku\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nie je možné prečítať súbor \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Chýbajúci podpis (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -616,7 +620,7 @@ msgstr "nie je možné zapísať konfiguračný súbor [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "nie je možné zapísať konfiguračný súbor [%s]"
@@ -731,23 +735,23 @@ msgstr ""
msgid "retrieving %s"
msgstr "odstraňovanie %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...získavanie zlyhalo: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "neznámy protokol definovaný pre %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
"nebol nájdený žiaden balík poskytujúci webfetch, podporované sú tieto: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "neznámy protokol: %s"
@@ -870,19 +874,12 @@ msgstr "urpmi databáza je uzamknutá"
msgid "aborting"
msgstr "Varovanie"
-#: ../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 "Inštalácia zlyhala"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -890,14 +887,14 @@ msgstr ""
"%s\n"
"Možno budete chcieť aktualizovať Vašu urpmi databázu"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Inštalácia zlyhala"
-#: ../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 +902,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 "Inštalácia zlyhala"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Nasledujúce balíky obsahujú zle signatúry"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Nasledujúce balíky obsahujú zle signatúry"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Chcete pokračovať v inštalácii ?"
-#: ../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 "Inštalácia zlyhala"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "inštalácia %s z %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "distribuovanie %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 "inštalácia %s z %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "inštalácia %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "distribuovanie %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Skúsiť inštaláciu bez kontroly závislostí? (á/N) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Skúsiť \"tvrdšiu\" inštaláciu (--force)? (á/N) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Inštalácia je možná"
@@ -1502,37 +1499,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Všetko je už nainštalované"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Všetko je už nainštalované"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Všetko je už nainštalované"
-#: ../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 "kvôli konfliktom s %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 "kvôli neuspokojenému %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "pokus o povýšenie %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "pre zachovanie poradia %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1541,7 +1538,7 @@ msgstr ""
"Nasledovné balíky by mali byť odstránené aby bolo možné aktualizovať iné:\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"
@@ -1550,12 +1547,12 @@ msgstr ""
"Nasledovné balíky by mali byť odstránené aby bolo možné aktualizovať iné:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "pre inštaláciu balíka %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "kvôli chýbajucemu %s"
@@ -2592,12 +2589,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Stlačte Enter ak je možné pokračovať..."
@@ -3304,21 +3296,21 @@ msgstr "--list-nodes nemôže byť použité len s --parallel"
msgid "use -l to list files"
msgstr "nie je možné zapísať súbor s zoznamom pre \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"Poznámka: Pretože nebol nájdený žiaden zdroj používajúci hdlists, urpmf "
"nemohol vrátiť žiaden výsledok\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Poznámka: Pretože nebol nájdený žiaden zdroj používajúci hdlists, urpmf "
"nemohol vrátiť žiaden výsledok\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3326,7 +3318,7 @@ msgstr ""
"Poznámka: Pretože nebol nájdený žiaden zdroj používajúci hdlists, urpmf "
"nemohol vrátiť žiaden výsledok\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3334,7 +3326,7 @@ msgstr ""
"Poznámka: Pretože nebol nájdený žiaden zdroj používajúci hdlists, urpmf "
"nemohol vrátiť žiaden výsledok\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Nebol nájdený zoznam zmien\n"
@@ -3347,6 +3339,18 @@ msgstr "Inštalátor softvéru"
msgid "Graphical front end to install RPM files"
msgstr "Grafický nástroj pre inštalovanie RPM balíkov"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Inštalácia nebola úspešná, niektoré súbory chýbajú:\n"
+#~ "%s\n"
+#~ "Možno budete chcieť aktualizovať Vašu urpmi databázu"
+
+#~ msgid "Cancel"
+#~ msgstr "Zrušiť"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "nie je možné zapísať konfiguračný súbor [%s]"
diff --git a/po/sl.po b/po/sl.po
index 8d883c0b..2db2a895 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -12,7 +12,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2012-03-21 08:44+0100\n"
+"POT-Creation-Date: 2012-06-08 19:19+0200\n"
"PO-Revision-Date: 2012-03-22 16:02+0100\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Slovenian <lugos-slo@lugos.si>, Translation list <mageia-"
@@ -260,7 +260,7 @@ msgstr ""
msgid "Warning"
msgstr "Opozorilo"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "V redu"
@@ -322,7 +322,7 @@ msgstr[1] "(%d paketa, %d MiB)"
msgstr[2] "(%d paketi, %d MiB)"
msgstr[3] "(%d paketov, %d MiB)"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "paketov z izvorno kodo ni mogoče dobiti, predčasna prekinitev"
@@ -359,38 +359,41 @@ msgstr "... prenos je spodletel: %s"
msgid "_Done"
msgstr "_Opravljeno"
-#: ../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 ""
-"Namestitev ni uspela, ker manjkajo nekatere datoteke:\n"
-"%s\n"
-"Mogoče bi morali osvežiti podatkovno bazo urpmi"
+"Namestitev ni uspela, manjkajo nekatere datoteke:\n"
+"%s"
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Poskusite posodobiti podatkovno zbirko urpmi."
+
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, c-format
msgid "Installation failed:"
msgstr "Namestitev ni uspela:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Paket(-i) so že nameščeni"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Namestitev je končana"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "odstranjevanje %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "ponovno zaganjanje urpmi"
@@ -521,58 +524,58 @@ msgstr "napaka pri registraciji krajevnih paketov"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Ta postopek ni dovoljen v omejenem načinu"
-#: ../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 "napačna deklaracija posredniškega strežnika v ukazni vrstici\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: datoteke rpm »%s« ni mogoče brati\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "nepričakovan izraz %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "manjkajoč izraz pred %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "nepričakovan izraz %s (predlog: uporabite -a ali -o ?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "ni izraza za zaprtje"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"Privzeto urpmf pričakuje regularni izraz. Uporabite argument »--literal«"
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "mapa za chroot ne obstaja"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Ni mogoče uporabiti %s brez %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 "Ni mogoče uporabiti %s z/s %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Preveč argumentov\n"
@@ -621,7 +624,7 @@ msgstr "branje datoteke nastavitvene datoteke [%s] ni možno"
msgid "medium `%s' is defined twice, aborting"
msgstr "vir »%s« je naveden dvakrat, prekinjam"
-#: ../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 "zapisovanje nastavitvene datoteke [%s] ni možno"
@@ -738,22 +741,22 @@ msgstr " %s%% preneseno, hitrost = %s"
msgid "retrieving %s"
msgstr "prenos %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "prenešeno %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "za %s je določen neznan protokol "
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "ni programa za spletni prenos, podprti so: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "obravnava protokola »%s« ni možna"
@@ -876,26 +879,17 @@ msgstr "Podatkovna zbirka %s je zaklenjena, čakanje ..."
msgid "aborting"
msgstr "prekinjam"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Poskusim znova?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Namestitev ni uspela, manjkajo nekatere datoteke:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Poskusite posodobiti podatkovno zbirko urpmi."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -904,7 +898,7 @@ msgstr ""
"Namestitev ni uspela, napaka v paketu rpm:\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 "
@@ -915,68 +909,68 @@ msgstr ""
"razpoložljivo %s).\n"
"Ali res želite nadaljevati?"
-#: ../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 "Namestitev ni uspela"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Ali želite vseeno nadaljevati?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Naslednji paket ima napačen podpis"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Naslednji paketi imajo napačen podpis"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ali želite nadaljevati namestitev?"
-#: ../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 "Namestitev ni uspela"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "odstranjevanje nameščenih rpm-jev (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "porazdeljevanje %s"
+msgid "Try to continue anyway?"
+msgstr "Ali želite vseeno nadaljevati?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "nameščanje %s iz %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "nameščanje %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "porazdeljevanje %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Poskusim z namestitvijo brez preverjanj odvisnosti?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Poskusim s prisilno namestitvijo (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Paketi so posodobljeni"
-#: ../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 "Namestitev je mogoča"
@@ -1544,37 +1538,37 @@ msgid "found package(s) %s in urpmi db, but none are installed"
msgstr ""
"v zbirki podatkov za urpmi so bili najdeni paketi %s, a ni noben nameščen"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Paket %s je že nameščen"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Paketi %s so že nameščeni"
-#: ../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 "zaradi konfliktov z/s %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 "zaradi neizpolnjene odvisnosti %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "poskus podpiranja %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "za ohranitev %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"
@@ -1583,7 +1577,7 @@ msgstr ""
"Naslednji paket mora biti odstranjen, da bodo drugi lahko nadgrajeni:\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"
@@ -1592,12 +1586,12 @@ msgstr ""
"Naslednji paketi morajo biti odstranjeni, da bodo drugi lahko nadgrajeni:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "za namestitev %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "zaradi manjkajočega %s"
@@ -2635,12 +2629,7 @@ msgstr[1] "Nadaljujem z namestitvijo %d paketov?"
msgstr[2] "Nadaljujem z namestitvijo %d paketov?"
msgstr[3] "Nadaljujem z namestitvijo %d paketov?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Prekliči"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Pritisnite Enter, ko bo priklopljeno ..."
@@ -3399,17 +3388,17 @@ msgstr "--list-nodes je lahko uporabljeno samo s --parallel"
msgid "use -l to list files"
msgstr "uporabite -l za izpis seznama datotek"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "za vir »%s« ni podatkov v obliki XML, samo delni rezultat za paket %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr "za vir »%s« ni podatkov v obliki XML, samo delni rezultat za pakete %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3417,7 +3406,7 @@ msgstr ""
"za vir »%s« ni podatkov v obliki XML, ni mogoče vrniti nobenega rezultata za "
"paket %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3425,7 +3414,7 @@ msgstr ""
"za vir »%s« ni podatkov v obliki XML, ni mogoče vrniti nobenega rezultata za "
"pakete %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Dnevnik sprememb ni bil najden\n"
@@ -3437,3 +3426,15 @@ msgstr "Program za nameščanje"
#: ../gurpmi.desktop.in.h:2
msgid "Graphical front end to install RPM files"
msgstr "Grafični vmesnik za nameščanje datotek RPM"
+
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Namestitev ni uspela, ker manjkajo nekatere datoteke:\n"
+#~ "%s\n"
+#~ "Mogoče bi morali osvežiti podatkovno bazo urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Prekliči"
diff --git a/po/sq.po b/po/sq.po
index 2af50f00..6eaac9e4 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,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: 2002-12-04 23:55+0200\n"
"Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
"Language-Team: Albanian <LL@li.org>\n"
@@ -236,7 +236,7 @@ msgstr ""
msgid "Warning"
msgstr "Kujdes"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -298,7 +298,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "e pa mundur marrja e burimit të pakos, ndërpritje"
@@ -335,38 +335,42 @@ msgstr "...rikuperimi dështoi: %s"
msgid "_Done"
msgstr "Përfundoi"
-#: ../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 "Instalimi dështio"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Instalimi dështoi, disa skedare mungojnë:\n"
"%s\n"
"A dëshironi t'azhurnoni bazën e të dhënave 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalimi dështio"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalimi përfundoi"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "zhdukja e %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -497,57 +501,57 @@ msgstr "gabim gjatë regjistrimit të pakove lokale"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "proxy që është deklaruar në linjën komanduese nuk është i saktë\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nuk mund ta lexojë skedaren rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Mungon nënshkrimi (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -594,7 +598,7 @@ msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "i pa mundur shkrimi i skedares konfiguruese [%s]"
@@ -709,22 +713,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "zhdukja e %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...rikuperimi dështoi: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protokol i pa njoftur për përcaktimit e %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "i pa mundur përdorimi i protokolit: %s"
@@ -847,19 +851,12 @@ msgstr "baza e të dhënave urpmi është e mbyllur"
msgid "aborting"
msgstr "Kujdes"
-#: ../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 "Instalimi dështio"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -867,14 +864,14 @@ msgstr ""
"%s\n"
"A dëshironi t'azhurnoni bazën e të dhënave urpmi"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalimi dështio"
-#: ../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 "
@@ -882,68 +879,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 "Instalimi dështio"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Pakot a radhitura kanë nënshkrime të pa pranueshëm"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Pakot a radhitura kanë nënshkrime të pa pranueshëm"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "A dëshironi të vazhdoni me instalimin e tyre ?"
-#: ../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 "Instalimi dështio"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "instalimi i %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "shpërndarje e %s"
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "instalimi i %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "instalimi i %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "shpërndarje e %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Tento një instalim pa verifikimin e mvarësive? (p/J) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Tento një instalim më të forcuar (--force)? (p/J) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Instalimi është i mundur"
@@ -1474,37 +1471,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../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 "ka arritur gjatë konflikteve me %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 "ka arritur gjatë mosmarrëveshjes %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "tentim në gradimin e %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "në urdhër për ta mbajturë %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1513,7 +1510,7 @@ msgstr ""
"Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\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"
@@ -1522,12 +1519,12 @@ msgstr ""
"Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "në urdhër për instalim %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "ka arritur nga mungesa %s"
@@ -2536,12 +2533,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Anulo"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Shtypni mbi Enter kur jeni i gatshëm..."
@@ -3252,29 +3244,29 @@ msgstr "--liste-nodes mund të përdoret vetëm me --parallel"
msgid "use -l to list files"
msgstr "shkruarja në skedaren list është e pa mundur për \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Asnjë imazh i gjetur"
@@ -3288,6 +3280,18 @@ msgstr "Instalues për Softver"
msgid "Graphical front end to install RPM files"
msgstr "Interfac grafike dhe për instalimin e skedareve RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Instalimi dështoi, disa skedare mungojnë:\n"
+#~ "%s\n"
+#~ "A dëshironi t'azhurnoni bazën e të dhënave urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Anulo"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
diff --git a/po/sr.po b/po/sr.po
index aa070c9c..797747ed 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sr\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-02-01 19:27+0100\n"
"Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
"Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -243,7 +243,7 @@ msgstr ""
msgid "Warning"
msgstr "Упозорење"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "У реду"
@@ -303,7 +303,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "извор пакета није доступан, излазим..."
@@ -340,38 +340,42 @@ msgstr "...повраћај неуспео: %s"
msgid "_Done"
msgstr "Урађено"
-#: ../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 "Инсталација није успела"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Инсталација неуспела, недостају неки фајлови.\n"
"%s\n"
"Можда желите да ажурирате вашу 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Инсталација није успела"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "све је већ инсталирано"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Инсталација готова"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "уклањам %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "рестартујем urpmi"
@@ -499,57 +503,57 @@ msgstr "грешка при регистровању локалних пакет
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "лоша proxy-декларација у командној линији\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не могу да прочитам rpm датотеку \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Недостаје потпис (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -596,7 +600,7 @@ msgstr "не могу да извршим упис у конфигурацион
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "не могу да извршим упис у конфигурациону датотеку [%s]"
@@ -711,22 +715,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "уклањам %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...повраћај неуспео: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "непознати протокол дефинисан за %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "webfetch није пронађен, подржани webfetch-ови су: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "не могу да подржим протокол: %s"
@@ -849,19 +853,12 @@ msgstr "urpmi база података закључана"
msgid "aborting"
msgstr "Упозорење"
-#: ../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 "Инсталација није успела"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -869,14 +866,14 @@ msgstr ""
"%s\n"
"Можда желите да ажурирате вашу urpmi базу података."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Инсталација није успела"
-#: ../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 "
@@ -884,68 +881,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 "Инсталација није успела"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Следећи пакети имају неисправне потписе"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Следећи пакети имају неисправне потписе"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Да ли желите да наставите конфигурацију ?"
-#: ../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 "Инсталација није успела"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "Инсталирам %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "дистрибуирам %s"
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "Инсталирам %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "Инсталирам %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "дистрибуирам %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Инсталиација без провере зависности (да/Не)? "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Присилна инсталација (--force)? (да/Не) ?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Инсталација је могућа"
@@ -1477,37 +1474,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "све је већ инсталирано"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "све је већ инсталирано"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "све је већ инсталирано"
-#: ../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 "због конфликта са %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 "због не задовољеног %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "покушавам да прикажем %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "да бих задржао %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1516,7 +1513,7 @@ msgstr ""
"Следећи пакети се морају уклонити да би други могли да буду ажурирани:\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"
@@ -1525,12 +1522,12 @@ msgstr ""
"Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "да би инсталирао %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "због не постојања %s"
@@ -2541,12 +2538,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Одустани"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Притисните enter када будете спремни..."
@@ -3248,29 +3240,29 @@ msgstr " --list-nodes се може користити само са опциј
msgid "use -l to list files"
msgstr "не могу да упишем датотеку листе за \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "НИје пронађен image"
@@ -3283,6 +3275,18 @@ msgstr "Инсталер софтвера"
msgid "Graphical front end to install RPM files"
msgstr "Графички интерфејс за инсталацију RPM пакета"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Инсталација неуспела, недостају неки фајлови.\n"
+#~ "%s\n"
+#~ "Можда желите да ажурирате вашу urpmi базу података."
+
+#~ msgid "Cancel"
+#~ msgstr "Одустани"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "не могу да извршим упис у конфигурациону датотеку [%s]"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index a50787e2..80e48682 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sr\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-02-01 19:27+0100\n"
"Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
"Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -244,7 +244,7 @@ msgstr ""
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "U redu"
@@ -304,7 +304,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "izvor paketa nije dostupan, izlazim..."
@@ -341,38 +341,42 @@ msgstr "...povraćaj neuspeo: %s"
msgid "_Done"
msgstr "Urađeno"
-#: ../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 "Instalacija nije uspela"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Instalacija neuspela, nedostaju neki fajlovi.\n"
"%s\n"
"Možda želite da ažurirate vašu urpmi bazu podataka."
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalacija nije uspela"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "sve je već instalirano"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Instalacija gotova"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "uklanjam %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "restartujem urpmi"
@@ -500,57 +504,57 @@ msgstr "greška pri registrovanju lokalnih paketa"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "loša proxy-deklaracija u komandnoj liniji\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne mogu da pročitam rpm datoteku \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nedostaje potpis (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -597,7 +601,7 @@ msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
@@ -712,22 +716,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "uklanjam %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...povraćaj neuspeo: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "nepoznati protokol definisan za %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "webfetch nije pronađen, podržani webfetch-ovi su: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ne mogu da podržim protokol: %s"
@@ -850,19 +854,12 @@ msgstr "urpmi baza podataka zaključana"
msgid "aborting"
msgstr "Upozorenje"
-#: ../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 "Instalacija nije uspela"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -870,14 +867,14 @@ msgstr ""
"%s\n"
"Možda želite da ažurirate vašu urpmi bazu podataka."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalacija nije uspela"
-#: ../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 "
@@ -885,68 +882,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 "Instalacija nije uspela"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Sledeći paketi imaju neispravne potpise"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Sledeći paketi imaju neispravne potpise"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Da li želite da nastavite konfiguraciju ?"
-#: ../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 "Instalacija nije uspela"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "Instaliram %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "distribuiram %s"
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "Instaliram %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "Instaliram %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "distribuiram %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Instalacija je moguća"
@@ -1478,37 +1475,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "sve je već instalirano"
-#: ../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 "zbog konflikta sa %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 "zbog ne zadovoljenog %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "pokušavam da prikažem %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "da bih zadržao %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1517,7 +1514,7 @@ msgstr ""
"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\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"
@@ -1526,12 +1523,12 @@ msgstr ""
"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "da bi instalirao %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "zbog ne postojanja %s"
@@ -2549,12 +2546,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Odustani"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Pritisnite enter kada budete spremni..."
@@ -3259,29 +3251,29 @@ msgstr " --list-nodes se može koristiti samo sa opcijom --parallel"
msgid "use -l to list files"
msgstr "ne mogu da upišem datoteku liste za \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "NIje pronađen image"
@@ -3295,6 +3287,18 @@ msgstr "Instaler softvera"
msgid "Graphical front end to install RPM files"
msgstr "Grafički interfejs za instalaciju RPM paketa"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Instalacija neuspela, nedostaju neki fajlovi.\n"
+#~ "%s\n"
+#~ "Možda želite da ažurirate vašu urpmi bazu podataka."
+
+#~ msgid "Cancel"
+#~ msgstr "Odustani"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
diff --git a/po/sv.po b/po/sv.po
index 480afd3a..dde18f01 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sv\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: 2009-10-21 18:34+0300\n"
"Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -264,7 +264,7 @@ msgstr ""
msgid "Warning"
msgstr "Varning"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "OK"
@@ -326,7 +326,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paket, %d MB)"
msgstr[1] "(%d paket, %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 "kunde inte läsa källan, avbryter"
@@ -363,38 +363,41 @@ msgstr "...hämtning misslyckades: %s"
msgid "_Done"
msgstr "_Klar"
-#: ../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 ""
"Installationen misslyckades, vissa filer saknas:\n"
-"%s\n"
-"Du bör försöka uppdatera urpmi-databasen."
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Du bör försöka uppdatera urpmi-databasen."
-#: ../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 "Installationen misslyckades:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Allt är redan installerat"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Installation slutförd"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "tar bort %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "startar om urpmi"
@@ -523,59 +526,59 @@ msgstr "fel vid registrering av lokala paket"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Denna operation är inte tillåten i begränsat läge"
-#: ../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 "felaktig proxydeklaration på kommandorad\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: kan inte läsa rpm-fil \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "oväntat uttryck %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "uttryck saknas före %s"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "oväntat uttryck %s (förslag: använd -a eller -o)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "inget uttryck att stänga"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"som standard väntar urpmf på en regexp. du borde använda alternativet \"--"
"literal\""
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot katalog existerar inte"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan inte använda %s utan %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 "Kan inte använda %s med %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "För många argument\n"
@@ -624,7 +627,7 @@ msgstr "kan inte läsa inställningsfil [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "medium '%s' är definierat två gånger, avbryter"
-#: ../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 "kan inte skriva inställningsfil [%s]"
@@ -741,22 +744,22 @@ msgstr " %s%% klar, hastighet = %s"
msgid "retrieving %s"
msgstr "hämtar %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "hämtade %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "okänt protokoll definierat för %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "ingen 'webfetch' hittad, supportad webfetch är: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "kan inte hantera protokoll: %s"
@@ -879,26 +882,17 @@ msgstr "%s databas låst. Väntar..."
msgid "aborting"
msgstr "avbryter"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Försök på nytt?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Installationen misslyckades, vissa filer saknas:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Du bör försöka uppdatera urpmi-databasen."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -907,7 +901,7 @@ msgstr ""
"Installationen misslyckades, felaktiga rpm:\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 "
@@ -918,68 +912,68 @@ msgstr ""
"alla paket (%s behövs, %s tillgängligt).\n"
"Är du säker du vill fortsätta?"
-#: ../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 "Installationen misslyckades"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Försök fortsätta ändå?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Följande paket har felaktig signatur"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Följande paket har felaktiga signaturer"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Vill du fortsätta installationen?"
-#: ../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 "Installationen misslyckades"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "tar bort installerade rpms (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "distribuerar %s"
+msgid "Try to continue anyway?"
+msgstr "Försök fortsätta ändå?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "installerar %s från %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "installerar %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "distribuerar %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Prova att installera utan att kontrollera behov av andra filer?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Försök ännu hårdare att installera (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Paket är uppdaterade"
-#: ../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 "Installation är möjlig"
@@ -1517,37 +1511,37 @@ msgstr "Du borde använda \"-a\" för att använda alla av dem"
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Hittade paket(en) %s i urpmi db, men inget är installerat"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Paket %s är redan installerat"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Paketen %s är redan installerade"
-#: ../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 "på grund av konflikter med %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 "på grund av otillräckliga %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "försöker befordra %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "för att behålla %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"
@@ -1556,7 +1550,7 @@ msgstr ""
"Följande paket måste tas bort för att andra ska bli uppdaterade:\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"
@@ -1565,12 +1559,12 @@ msgstr ""
"Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "för att installera %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "för att %s saknas"
@@ -2592,12 +2586,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortsätt installationen ett paket?"
msgstr[1] "Fortsätt installationen av %d paket?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Tryck Enter när klart..."
@@ -3328,33 +3317,33 @@ msgstr "--list-nodes kan endast användas med --parallel"
msgid "use -l to list files"
msgstr "använd -l för att lista filer"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"ingen xml-info för media \"%s\", endast ofullständigt resultat för paketet %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"ingen xml-info för media \"%s\", endast ofullständigt resultat för paketen %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"ingen xml-info för media \"%s\", kan inte returnera resultat för paketet %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"ingen xml-info för media \"%s\", kan inte returnera resultat för paketen %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Ingen ändringslogg hittades\n"
@@ -3367,6 +3356,18 @@ msgstr "Programinstallerare"
msgid "Graphical front end to install RPM files"
msgstr "Grafiskt gränssnitt för RPM-installation"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Installationen misslyckades, vissa filer saknas:\n"
+#~ "%s\n"
+#~ "Du bör försöka uppdatera urpmi-databasen."
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/tg.po b/po/tg.po
index 8f489236..291d103b 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-tg\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: 2005-09-17 16:34+0500\n"
"Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
"Language-Team: Tajik\n"
@@ -269,7 +269,7 @@ msgstr ""
msgid "Warning"
msgstr "Огоҳӣ"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -331,7 +331,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "қуттиҳои сарчашмавӣ гирифтан номумкин, кандашавӣ"
@@ -368,38 +368,42 @@ msgstr "...барқароркунӣ нагузашт: %s"
msgid "_Done"
msgstr "_Шуд"
-#: ../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 "Коргузорӣ нагузашт"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"коргузорӣ ба амал наомад, якчанд файлҳо мавҷуд нестанд:\n"
"%s\n"
"Мумкин шумо додаҳои 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Коргузорӣ нагузашт"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Ҳамааш аллакай кор гузошта шудааст"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Коргузориш шуд"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "хориҷи қуттии %s "
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "urpmi бозоғоз шуда истодааст"
@@ -528,57 +532,57 @@ msgstr "хатогии ба қайдгирии қуттиҳои маҳаллӣ"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "дар сатри фармонӣ proxy нодуруст нишон дода шудааст\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: хондани файли rpm \"%s\" намешавад\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Имзо мавҷуд нест (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -625,7 +629,7 @@ msgstr "навиштани файли танзимдарории [%s] номум
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "навиштани файли танзимдарории [%s] номумкин"
@@ -740,22 +744,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "хориҷи қуттии %s "
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...барқароркунӣ нагузашт: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "барои %s протоколи номуаяйн муқаррар шудааст"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "webfetch пайдо нагардид, webfetch пуштибонӣ мегардад: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "даста кардани қарордод номумкин: %s"
@@ -876,19 +880,12 @@ msgstr "urpmi манбаи маълумот дастнорас аст"
msgid "aborting"
msgstr "Огоҳӣ"
-#: ../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 "Коргузорӣ нагузашт"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -896,14 +893,14 @@ msgstr ""
"%s\n"
"Мумкин шумо додаҳои urpmi-ро нав мекунед"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Коргузорӣ нагузашт"
-#: ../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 "
@@ -911,68 +908,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 "Коргузорӣ нагузашт"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Қуттиҳои зерин имзоҳои бад доранд"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Қуттиҳои зерин имзоҳои бад доранд"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Шумо хоҳиши давом додани коргузориро доред ?"
-#: ../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 "Коргузорӣ нагузашт"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "коргузории %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "тақсимкунии %s"
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "коргузории %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "коргузории %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "тақсимкунии %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Коргузориро боз устувортар (--force) кӯшиш кунем? (Ҳ/Н) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Коргузорӣ мумкин аст"
@@ -1503,37 +1500,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Ҳамааш аллакай кор гузошта шудааст"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Ҳамааш аллакай кор гузошта шудааст"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Ҳамааш аллакай кор гузошта шудааст"
-#: ../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 "аз ҳисоби ба вуҷуд омадани муаммо бо %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 "аз сабаби қонеъ набудан %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "кӯшиши фаъол намудан %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "барои нигоҳдории %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1543,7 +1540,7 @@ msgstr ""
"%s\n"
"Шумо розӣ ҳастед?"
-#: ../urpm/select.pm:623
+#: ../urpm/select.pm:622
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1553,12 +1550,12 @@ msgstr ""
"%s\n"
"Шумо розӣ ҳастед?"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "барои коргузоштани %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "аз сабаби мавҷуд набудан %s"
@@ -2605,12 +2602,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Бекор кардан"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Вақте, ки тайёр Enter-ро пахш кунед..."
@@ -3334,21 +3326,21 @@ msgstr "--list-nodes танҳо истифода бурда мешавад бо
msgid "use -l to list files"
msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"Эзоҳ: то даме, ки расонаи ҷустуҷӯшуда hdlists-ро истифода набарад, urpmf "
"ягон натиҷаро баргардонида наметавонад\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Эзоҳ: то даме, ки расонаи ҷустуҷӯшуда hdlists-ро истифода набарад, urpmf "
"ягон натиҷаро баргардонида наметавонад\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3356,7 +3348,7 @@ msgstr ""
"Эзоҳ: то даме, ки расонаи ҷустуҷӯшуда hdlists-ро истифода набарад, urpmf "
"ягон натиҷаро баргардонида наметавонад\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3364,7 +3356,7 @@ msgstr ""
"Эзоҳ: то даме, ки расонаи ҷустуҷӯшуда hdlists-ро истифода набарад, urpmf "
"ягон натиҷаро баргардонида наметавонад\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Ягон номнависи тағиротҳо пайдо нагардид\n"
@@ -3378,6 +3370,18 @@ msgstr "Коргузори таъминоти барномавӣ"
msgid "Graphical front end to install RPM files"
msgstr "Пешохири графикӣ барои коргузории файлҳои RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "коргузорӣ ба амал наомад, якчанд файлҳо мавҷуд нестанд:\n"
+#~ "%s\n"
+#~ "Мумкин шумо додаҳои urpmi-ро нав мекунед"
+
+#~ msgid "Cancel"
+#~ msgstr "Бекор кардан"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "файли танзимдарории [%s] нависед"
diff --git a/po/th.po b/po/th.po
index fbb2509b..bcb8175d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,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: 2002-11-25 13:52-0500\n"
"Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
"Language-Team: Thai <th@li.org>\n"
@@ -228,7 +228,7 @@ msgstr "ไม่สามารถ install บางเพกเกจได้
msgid "Warning"
msgstr "คำเตือน"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "ตกลง"
@@ -284,7 +284,7 @@ msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(แพ็คเก็จ %d ชุด, %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 "ไม่สามารถเรียก source package,กำลังยกเลิก"
@@ -323,37 +323,41 @@ msgstr "การอ่านข้อมูลล้มเหลว: %s"
msgid "_Done"
msgstr "ทำเรียบร้อยแล้ว"
-#: ../gurpmi2:402
+#: ../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 "การติดตั้งไม่สำเร็จ"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"การติดตั้งล้มเหลวมีบางไฟล์ที่ขาดหายไป\n"
"ขอแนะนำให้ทำการอัพเดตฐานข้อมูล 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "การติดตั้งไม่สำเร็จ"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "install เสร็จเรียบร้อย"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, fuzzy, c-format
msgid "removing %s"
msgstr "กำลังติดตั้ง %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "กำลังติดตั้ง $rpm\n"
@@ -480,57 +484,57 @@ msgstr "ลงทะเบียน local package มีข้อผิดพล
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "การแจ้งพร็อกซี่ที่ไม่ดี\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq:ไม่สามารถอ่าน rpm file \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "ข้อมูลบางตัวยังไม่ได้ใส่ลงไป"
-#: ../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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -577,7 +581,7 @@ msgstr "ไม่สามารถเขียน config file [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "ไม่สามารถเขียน config file [%s]"
@@ -692,22 +696,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "กำลังติดตั้ง %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "การอ่านข้อมูลล้มเหลว: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "ไม่รู้จักโปรโตคอลที่ระบุไว้%s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ไม่สามารถใช้งานโปรโตคอล: %s"
@@ -828,33 +832,26 @@ msgstr "ฐานข้อมูล urpmi ถูกล็อก"
msgid "aborting"
msgstr "คำเตือน"
-#: ../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 "การติดตั้งไม่สำเร็จ"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
"การติดตั้งล้มเหลวมีบางไฟล์ที่ขาดหายไป\n"
"ขอแนะนำให้ทำการอัพเดตฐานข้อมูล urpmi"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "การติดตั้งไม่สำเร็จ"
-#: ../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 "
@@ -862,68 +859,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 "การติดตั้งไม่สำเร็จ"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "คุณยังต้องการจะติดตั้งอีกต่อไปหรือไม่ ?"
-#: ../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 "การติดตั้งไม่สำเร็จ"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "กำลังติดตั้ง %s\n"
-#: ../urpm/main_loop.pm:237
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "กำลังติดตั้ง %s\n"
+#: ../urpm/main_loop.pm:160
+#, c-format
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "กำลังติดตั้ง %s\n"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, fuzzy, c-format
msgid "installing %s"
msgstr "กำลังติดตั้ง %s\n"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "กำลังติดตั้ง %s\n"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "ต้องการทดลองติดตั้งโดยที่ไม่ต้องตรอจสอบความเข้ากันได้? (y/N)"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "ต้องการทดลองบังคับติดตั้ง (--force)? (y/N)"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "การติดตั้งสามารถทำได้"
@@ -1446,56 +1443,56 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-#: ../urpm/select.pm:573 ../urpm/select.pm:660
+#: ../urpm/select.pm:572 ../urpm/select.pm:659
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s ขัดแย้งกับ %s"
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "ไม่มี kdesu "
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "ไม่มีอะไรที่ต้องลบทิ้ง\n"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "Window border theme"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
-#: ../urpm/select.pm:623
+#: ../urpm/select.pm:622
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "ไม่มี kdesu "
@@ -2459,12 +2456,7 @@ msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "ยกเลิก"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "กรุณากด enter เมื่อพร้อม"
@@ -3135,29 +3127,29 @@ msgstr "--list-nodes can only be used with --parallel"
msgid "use -l to list files"
msgstr "ไม่สามารถเขียน list file ของ\"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "ไม่พบรุปภาพ"
@@ -3172,6 +3164,18 @@ msgid "Graphical front end to install RPM files"
msgstr "ส่วนติดต่อผู้ใช้แบบ graphic ของโปรแกรมเพิ่มแพคเก็จ"
#, fuzzy
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "การติดตั้งล้มเหลวมีบางไฟล์ที่ขาดหายไป\n"
+#~ "ขอแนะนำให้ทำการอัพเดตฐานข้อมูล urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "ยกเลิก"
+
+#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "ไม่สามารถเขียน config file [%s]"
diff --git a/po/tl.po b/po/tl.po
index 33062296..96d26707 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-tl\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: 2005-03-08 20:24+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Filipino <salinpinoy@comitus.net>\n"
@@ -262,7 +262,7 @@ msgstr ""
msgid "Warning"
msgstr "Babala"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ayos"
@@ -326,7 +326,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "hindi makuha ang mga source package, hindi tumutuloy"
@@ -363,38 +363,42 @@ msgstr "...pagkukuha muli nabigo: %s"
msgid "_Done"
msgstr "Tapos"
-#: ../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 "Pag-i-install ay nabigo"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Pag-i-install ay nabigo, ilang mga file ay nawawala:\n"
"%s\n"
"Baka gusto mong i-update ang iyong urpmi database"
-#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:409 ../urpm/main_loop.pm:261 ../urpm/main_loop.pm:421
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Pag-i-install ay nabigo"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Lahat ay naka-install na"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Natapos na ang pag-install"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "inaalis ang %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "sinisimulan muli ang urpmi"
@@ -525,57 +529,57 @@ msgstr "error sa pagrerehistro ng mga local package"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "masamang pagdeklara ng proxy sa command line\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: hindi mabasa ang rpm file na \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nawawalang signature (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -622,7 +626,7 @@ msgstr "hindi maisulat ang config file [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "hindi maisulat ang config file [%s]"
@@ -737,22 +741,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "inaalis ang %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...pagkukuha muli nabigo: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "hindi kilalang protocol naka-define para sa %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "walang nahanap na webfetch, mga suportadong webfetch ay: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "hindi ma-handle ang protocol: %s"
@@ -875,19 +879,12 @@ msgstr "urpmi database ay naka-lock"
msgid "aborting"
msgstr "Babala"
-#: ../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 "Pag-i-install ay nabigo"
-
-#: ../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"
"Baka gusto mong i-update ang iyong urpmi database"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Pag-i-install ay nabigo"
-#: ../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 "Pag-i-install ay nabigo"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Ang mga sumusunod na package ay may masamang signature"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Ang mga sumusunod na package ay may masamang signature"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Gusto mong ituloy ang pag-i-install ?"
-#: ../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 "Pag-i-install ay nabigo"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "ini-install ang %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "dini-distribute ang %s"
+msgid "Try to continue anyway?"
+msgstr ""
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "ini-install ang %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "ini-install ang %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "dini-distribute ang %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Subukan ang pag-i-install na hindi sinusuri ang mga dependency? (o/H) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Subukan ang pag-i-install nang mas malakas (--force)? (o/H) "
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Pag-i-install ay maaari"
@@ -1500,37 +1497,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Lahat ay naka-install na"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Lahat ay naka-install na"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Lahat ay naka-install na"
-#: ../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 "dahil sa pagkakasalungat sa %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 "dahil sa hindi na-satisfy na %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "sinusubukang i-promote ang %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "para maitago ang %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1539,7 +1536,7 @@ msgstr ""
"Ang mga sumusunod na package ay dapat alisin para ma-upgrade ang iba:\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"
@@ -1548,12 +1545,12 @@ msgstr ""
"Ang mga sumusunod na package ay dapat alisin para ma-upgrade ang iba:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "para ma-install ang %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "dahil sa nawawalang %s"
@@ -2604,12 +2601,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "I-cancel"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Pindutin ang Enter kung handa na..."
@@ -3341,21 +3333,21 @@ msgstr "--list-nodes ay magagamit lang kasama ang --parallel"
msgid "use -l to list files"
msgstr "hindi maisulat ang list file ng \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"Tandaan: dahil wala sa mga hinanapang media ay gumagamit ng mga hdlist, ang "
"urpmf ay hindi makapagbalik ng kahit anong resulta\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Tandaan: dahil wala sa mga hinanapang media ay gumagamit ng mga hdlist, ang "
"urpmf ay hindi makapagbalik ng kahit anong resulta\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3363,7 +3355,7 @@ msgstr ""
"Tandaan: dahil wala sa mga hinanapang media ay gumagamit ng mga hdlist, ang "
"urpmf ay hindi makapagbalik ng kahit anong resulta\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3371,7 +3363,7 @@ msgstr ""
"Tandaan: dahil wala sa mga hinanapang media ay gumagamit ng mga hdlist, ang "
"urpmf ay hindi makapagbalik ng kahit anong resulta\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Walang nahanap na changelog\n"
@@ -3386,6 +3378,18 @@ msgid "Graphical front end to install RPM files"
msgstr ""
"Graphical na front-end para mag-install ng mga RPM file (software package)"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Pag-i-install ay nabigo, ilang mga file ay nawawala:\n"
+#~ "%s\n"
+#~ "Baka gusto mong i-update ang iyong urpmi database"
+
+#~ msgid "Cancel"
+#~ msgstr "I-cancel"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "hindi maisulat ang config file [%s]"
diff --git a/po/tr.po b/po/tr.po
index b4fd4ac0..24912960 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2012-03-21 08:44+0100\n"
+"POT-Creation-Date: 2012-06-08 19:19+0200\n"
"PO-Revision-Date: 2012-01-16 16:28+0000\n"
"Last-Translator: Oliver Burger <oliver.bgr@googlemail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -253,7 +253,7 @@ msgstr ""
msgid "Warning"
msgstr "Uyarı"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Tamam"
@@ -316,7 +316,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paket, %d MB)"
msgstr[1] "(%d paket, %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 "kaynak paketleri alınamadı, çıkılıyor"
@@ -353,38 +353,41 @@ msgstr "...getirme başarısız: [%s]"
msgid "_Done"
msgstr "_Bitti"
-#: ../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 ""
-"Kurulum başarısızlıkla sonuçlandı. Bazı dosyalar kayıp:\n"
-"%s\n"
-"Urpmi veritabanınızı güncellemek isteyebilirsiniz"
+"Kurulum başarısız oldu. Bazı dosyalar kayıp:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Urpmi veritabanı güncellemeniz gerekebilir."
-#: ../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 "Kurulum başarısız oldu"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Herşey zaten kurulu"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Kurulum tamamlandı"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "%s kaldırılıyor"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "urpmi yeniden başlatılıyor."
@@ -513,59 +516,59 @@ msgstr "yerel paketlerin sicil kaydı yapılırken hata"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Sınırlı kipte çalışılırken bu işlem yasaklanmıştır."
-#: ../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 "komut satırından kötü vekil sunucu bildirimi\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm dosyası okunamıyor\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "beklenmeyen ifade %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "%s 'den önce kayıp ifade"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "beklenmeyen ifade %s (öneri: -a or -o kullanın ?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "kapatmak için ifade yok"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"varsayılan olarak upmf bir regexp bekler. \"--literal\" seçeneğini "
"kullanmalısınız."
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot dizini geçerli değil"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "%s, %s olmadan kullanılamaz"
-#: ../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 "%s, %s ile kullanılamaz"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Çok fazla parametre\n"
@@ -614,7 +617,7 @@ msgstr "yapılandırma dosyasına [%s] yazılamıyor"
msgid "medium `%s' is defined twice, aborting"
msgstr "`%s' ortamı ikinci defa tanımlandı, iptal ediliyor"
-#: ../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 "yapılandırma dosyasına [%s] yazılamıyor"
@@ -729,22 +732,22 @@ msgstr " %s%% tamamlandı, hız = %s"
msgid "retrieving %s"
msgstr "%s getiriliyor"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "getirildi: [%s]"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s için bilinmeyen protokol tanımlanmış"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "geçerli webfetch bulunamadı, desteklenen webfetch: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "%s protokolü ile ilgilenemiyor"
@@ -866,26 +869,17 @@ msgstr "%s veri tabanı kilitlendi. Bekleniyor..."
msgid "aborting"
msgstr "iptal ediliyor"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Yeniden dene?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Kurulum başarısız oldu. Bazı dosyalar kayıp:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Urpmi veritabanı güncellemeniz gerekebilir."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -894,7 +888,7 @@ msgstr ""
"Kurulum başarısız oldu. Hatalı rpm'ler:\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 ""
"gerekli, %s boş alan var:)\n"
"Devam etmek istediğinize emin misiniz?"
-#: ../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 "Kurulum başarısız oldu."
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr "Yine de devam edilsin mi?"
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, c-format
msgid "The following package has bad signature"
msgstr "Sonraki paketler hatalı imza içeriyor"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Sonraki paketler hatalı imza içeriyor"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Kuruluma devam etmek istiyor musunuz ?"
-#: ../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 "Kurulum başarısız oldu."
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "kurulu rpm'ler (%s) kaldırılıyor."
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "%s dağıtılıyor"
+msgid "Try to continue anyway?"
+msgstr "Yine de devam edilsin mi?"
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:209
#, c-format
msgid "installing %s from %s"
msgstr "%s, %s konumundan kuruluyor"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "%s kuruluyor"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "%s dağıtılıyor"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Paket bağımlılıklarını denetlemeksizin kurulum denensin mi?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Belki daha zorlayıcı bir seçenek gerekebilir (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Paketler güncel"
-#: ../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 "Kurulum mümkün"
@@ -1502,37 +1496,37 @@ msgstr "Tümünü kullanabilmek için \"-a\" kullanmalısınız"
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Urpmi veritabanında %s paket(ler)i bulundu, fakat hiçbiri kurulmamış"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "%s paketi kurulu"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "%s paketleri kurulu"
-#: ../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 "%s paketi ile çelişkisinden"
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s paketinden dolayı yetersiz"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "%s yükseltilmeye çalışılıyor."
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "%s 'in tutulması sırasında"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1542,7 +1536,7 @@ msgstr ""
"gerekiyor:\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"
@@ -1552,12 +1546,12 @@ msgstr ""
"gerekiyor:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "%s 'in kurulumu sırasında"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "%s paketinin kayıplığından"
@@ -2583,12 +2577,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Bir adet paket yüklensin mi?(%d)"
msgstr[1] "Bir adet paket yüklensin mi?(%d)"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "İptal"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Hazır olduğunuzda Enter'a basın..."
@@ -3329,21 +3318,21 @@ msgstr "--list-nodes sadece --parallel ile kullanılabilir"
msgid "use -l to list files"
msgstr "dosyaları listelemek için -l kullanın"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"\"%s\" ortamı için xml bilgisi bulunamadı. %s paketi için herhangi bir kısmi "
"sonuç döndürülemedi."
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"\"%s\" ortamı için xml bilgisi bulunamadı. %s paketleri için herhangi bir "
"kısmi sonuç döndürülemedi."
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3351,7 +3340,7 @@ msgstr ""
"\"%s\" ortamı için xml bilgisi bulunamadı. %s paketi için herhangi bir sonuç "
"döndürülemedi."
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3359,7 +3348,7 @@ msgstr ""
"\"%s\" ortamı için xml bilgisi bulunamadı. %s paketleri için herhangi bir "
"sonuç döndürülemedi."
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Değişiklik günlüğü bulunamadı!\n"
@@ -3372,6 +3361,18 @@ msgstr "Yazılım Yükleyici"
msgid "Graphical front end to install RPM files"
msgstr "RPM dosyaların kurulumu için bir grafik önyüz"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Kurulum başarısızlıkla sonuçlandı. Bazı dosyalar kayıp:\n"
+#~ "%s\n"
+#~ "Urpmi veritabanınızı güncellemek isteyebilirsiniz"
+
+#~ msgid "Cancel"
+#~ msgstr "İptal"
+
#~ msgid "curl is missing, cannot upload DUDF file.\n"
#~ msgstr "curl bulunamadı. DUDF dosyası gönderilemeyecek.\n"
diff --git a/po/uk.po b/po/uk.po
index 6f5c83f4..b769c324 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,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: 2012-03-01 21:09+0200\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -262,7 +262,7 @@ msgstr ""
msgid "Warning"
msgstr "Попередження"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Гаразд"
@@ -323,7 +323,7 @@ msgstr[0] "(%d пакунок, %d Мб)"
msgstr[1] "(%d пакунки, %d Мб)"
msgstr[2] "(%d пакунків, %d Мб)"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr "неможливо одержати початкові пакунки, завершується"
@@ -360,38 +360,41 @@ msgstr "...відновлення невдале: %s"
msgid "_Done"
msgstr "Виконано"
-#: ../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 ""
-"Встановлення невдале, деякі файли відсутні:\n"
-"%s\n"
-"Можливо, Вам потрібно поновити вашу базу даних urpmi"
+"Встановлення зазнало невдачі, немає файлів:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "Можливо, потрібно поновити базу даних 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 "Невдала спроба встановлення:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Все вже встановлено"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Встановлення завершено"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "вилучається %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "перезапуск urpmi"
@@ -521,59 +524,59 @@ msgstr "помилка реєстрації пакунків"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Цю дію заборонено до виконання в обмеженому режимі"
-#: ../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 "неправильне оголошення проксі в командному рядку\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: неможливо прочитати rpm-файл \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "неочікуваний вираз %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "перед %s немає виразу"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "неочікуваний вираз %s (можливо, слід було вказати -a або -o ?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "відсутній вираз, який слід закрити"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"типово urpmf очікує на формальний вираз. Вам слід скористатися параметром «--"
"literal»"
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "каталогу chroot не існує"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "Не можна використовувати %s без %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 "Не можна використовувати %s разом з %s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "Забагато аргументів\n"
@@ -624,7 +627,7 @@ msgstr "неможливо прочитати файл налаштувань [%
msgid "medium `%s' is defined twice, aborting"
msgstr "носій «%s» вказано двічі, аварійне завершення"
-#: ../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 "неможливо записати конфігураційний файл [%s]"
@@ -741,22 +744,22 @@ msgstr " Звантажено %s%%, швидкість = %s"
msgid "retrieving %s"
msgstr "отримання %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "отримано %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "для %s вказано невідомий протокол"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "не знайдено webfetch, підтримуються такі webfetch: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "неможливо обробити протокол: %s"
@@ -879,26 +882,17 @@ msgstr "Базу даних %s заблоковано. Очікування на
msgid "aborting"
msgstr "переривання"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "Спробувати ще раз?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"Встановлення зазнало невдачі, немає файлів:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "Можливо, потрібно поновити базу даних urpmi"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -907,7 +901,7 @@ msgstr ""
"Встановлення зазнало невдачі, помилкові rpm:\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 "
@@ -918,68 +912,68 @@ msgstr ""
"недостатньо місця (потрібно %s, доступно %s).\n"
"Виконати звантаження попри це?"
-#: ../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 "Встановлення неуспішне"
-
-#: ../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 "Наступний пакунок має неправильний підпис"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Наступні пакунки мають неправильні підписи"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ви хочете продовжувати встановлення?"
-#: ../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 "Встановлення неуспішне"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "вилучення встановлених rpm (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "встановлюється %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 "встановлюється %s з %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "встановлюється %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "встановлюється %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "Спробувати встановлення без перевірки залежностей?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "Спробувати примусове встановлення (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Пакунки є пакунками останніх версій"
-#: ../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 "Встановлення можливе"
@@ -1540,37 +1534,37 @@ msgstr "Потрібно використовувати \"-a\", щоб вказ
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "знайдено пакунки %s у базі даних urpmi, але жоден з них не встановлено"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "Пакунок %s вже встановлено"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "Пакунки %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 "через конфлікти з %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 "через незадоволеність %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "намагаюсь активізувати %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "для того, щоб зберегти %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"
@@ -1579,7 +1573,7 @@ msgstr ""
"Наступний пакунок слід вилучити для того, щоб поновити інші:\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"
@@ -1588,12 +1582,12 @@ msgstr ""
"Наступні пакунки будуть вилучені для того, щоб поновити інші:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "для того, щоб встановити %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "через відсутність %s"
@@ -2643,12 +2637,7 @@ msgstr[0] "Продовжити встановлення %d пакунка?"
msgstr[1] "Продовжити встановлення %d пакунків?"
msgstr[2] "Продовжити встановлення %d пакунків?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Скасувати"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "Натисніть Enter, коли змонтуєте..."
@@ -3393,21 +3382,21 @@ msgstr "--list-nodes може використовуватися тільки з
msgid "use -l to list files"
msgstr "щоб отримати список файлів, скористайтеся параметром -l"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"немає файла відомостей xml для носія «%s», лише частковий результат для "
"пакунка %s"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"немає файла відомостей xml для носія «%s», лише частковий результат для "
"пакунків %s"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3415,7 +3404,7 @@ msgstr ""
"немає файла відомостей xml для носія «%s», не отримано жодного результату "
"для пакунка %s"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3423,7 +3412,7 @@ msgstr ""
"немає файла відомостей xml для носія «%s», не отримано жодного результату "
"для пакунків %s"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Не знайдено журналу змін\n"
@@ -3437,6 +3426,18 @@ msgid "Graphical front end to install RPM files"
msgstr "Графічний інтерфейс для встановлення файлів RPM"
#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Встановлення невдале, деякі файли відсутні:\n"
+#~ "%s\n"
+#~ "Можливо, Вам потрібно поновити вашу базу даних urpmi"
+
+#~ msgid "Cancel"
+#~ msgstr "Скасувати"
+
+#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
#~ "# Line format is : <date time of generation> <uid>\n"
#~ "# You can use uids to see the content of your uploads at this url :\n"
diff --git a/po/urpmi.pot b/po/urpmi.pot
index 4282ca7f..056315dc 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-03-21 08:44+0100\n"
+"POT-Creation-Date: 2012-06-08 19:19+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -214,7 +214,7 @@ msgstr ""
msgid "Warning"
msgstr ""
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr ""
@@ -271,7 +271,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
@@ -308,35 +308,39 @@ msgstr ""
msgid "_Done"
msgstr ""
-#: ../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 ""
+
+#: ../gurpmi2:405
+#, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
-#: ../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 ""
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr ""
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr ""
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr ""
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -463,57 +467,57 @@ msgstr ""
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr ""
-#: ../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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -560,7 +564,7 @@ msgstr ""
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 ""
@@ -675,22 +679,22 @@ msgstr ""
msgid "retrieving %s"
msgstr ""
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr ""
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr ""
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr ""
@@ -811,31 +815,24 @@ msgstr ""
msgid "aborting"
msgstr ""
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr ""
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr ""
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr ""
-#: ../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 "
@@ -843,68 +840,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 ""
-
-#: ../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 ""
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr ""
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../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 ""
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr ""
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %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 ""
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr ""
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr ""
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr ""
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr ""
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 ""
@@ -1430,56 +1427,56 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr ""
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr ""
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr ""
-#: ../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 ""
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr ""
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr ""
-#: ../urpm/select.pm:623
+#: ../urpm/select.pm:622
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr ""
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr ""
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr ""
@@ -2419,12 +2416,7 @@ msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr ""
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr ""
@@ -3079,29 +3071,29 @@ msgstr ""
msgid "use -l to list files"
msgstr ""
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr ""
diff --git a/po/uz.po b/po/uz.po
index 485ae1f0..90c1f540 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uz\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: 2007-09-13 16:43+0200\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -245,7 +245,7 @@ msgstr ""
msgid "Warning"
msgstr "Diqqat"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -304,7 +304,7 @@ msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d-ta paket, %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 ""
@@ -341,38 +341,42 @@ msgstr "...olish muvaffaqiyatsiz tugadi: %s"
msgid "_Done"
msgstr "_Tayyor"
-#: ../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 "O'rnatish muvaffaqiyatsiz tugadi:"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"O'rnatish muvaffaqiyatsiz tugadi, ba'zi bir fayllar yetishmaydi:\n"
"%s\n"
"Balki urpmi ma'lumot bazasini yangilashingiz kerak."
-#: ../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 "O'rnatish muvaffaqiyatsiz tugadi:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Hamma narsa allaqachon o'rnatilgan"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "O'rnatish tugadi"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "%s o'chirilmoqda"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "urpmi qaytadan ishga tushmoqda"
@@ -503,57 +507,57 @@ msgstr ""
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM-faylini (%s) o'qib bo'lmadi\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Imzo yetishmaydi (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 "chroot direktoriyasi mavjud emas"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "%s amalidan %s amalisiz foydalanib bo'lmaydi"
-#: ../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 "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -600,7 +604,7 @@ msgstr "%s moslama faylini o'qib bo'lmadi"
msgid "medium `%s' is defined twice, aborting"
msgstr "\"%s\" to'plami ikki marta aniqlangan, amal bekor qilinadi"
-#: ../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 "moslama faylini (%s) yozib bo'lmadi"
@@ -715,22 +719,22 @@ msgstr " %s%% bajarildi, tezlik = %s"
msgid "retrieving %s"
msgstr "%s olinmoqda"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "%s olindi"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s uchun noma'lum protokol aniqlangan"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "noma'lum protokol: %s"
@@ -851,19 +855,12 @@ msgstr "%s ma'lumot bazasi qulflangan. Kutilmoqda..."
msgid "aborting"
msgstr "to'xtatilmoqda"
-#: ../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 "O'rnatish muvaffaqiyatsiz tugadi:"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -871,14 +868,14 @@ msgstr ""
"%s\n"
"Balki urpmi ma'lumot bazasini yangilashingiz kerak."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
-#: ../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 "
@@ -886,68 +883,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 "O'rnatish muvaffaqiyatsiz tugadi"
-
-#: ../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 "Quyidagi paketning imzosi xato"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Quyidagi paketlarning imzolari noto'g'ri"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "O'rnatishni davom etishni istaysizmi?"
-#: ../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 "O'rnatish muvaffaqiyatsiz tugadi"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "to'plam olib tashlanmoqda: \"%s\""
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %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 "o'rnatilmoqda: %s, qaerdan: %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "%s o'rnatilmoqda"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr ""
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "%s'ni o'rnatish uchun"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Paketlarni yangilash muhtoji yo'q"
-#: ../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 "O'rnatish mumkin"
@@ -1479,37 +1476,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "%s paketlarini o'rnatib bo'lmaydi"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "%s paketi allaqachon o'rnatilgan"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "%s paketlari allaqachon o'rnatilgan"
-#: ../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 ""
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "%s'ni qoldirish uchun"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1518,7 +1515,7 @@ msgstr ""
"Boshqa paketlarni yangilash uchun quyidagi paketni olib tashlash kerak:\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"
@@ -1527,12 +1524,12 @@ msgstr ""
"Boshqa paketlarni yangilash uchun quyidagi paketlarni olib tashlash kerak:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "%s'ni o'rnatish uchun"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "%s yetishmaganiga ko'ra"
@@ -2504,12 +2501,7 @@ msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d-ta paketni o'rnatish bilan davom etishni istaysizmi?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Bekor qilish"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Tayyor bo'lganda ENTER tugmasini bosing..."
@@ -3206,29 +3198,29 @@ msgstr "--list-nodes'dan faqat --parallel bilan birga foydalanib bo'ladi"
msgid "use -l to list files"
msgstr ""
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Changelog fayli topilmadi\n"
@@ -3241,6 +3233,18 @@ msgstr "Dastur oʻrnatuvchisi"
msgid "Graphical front end to install RPM files"
msgstr "RPM fayllarini oʻrnatish uchun grafik interfeys"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "O'rnatish muvaffaqiyatsiz tugadi, ba'zi bir fayllar yetishmaydi:\n"
+#~ "%s\n"
+#~ "Balki urpmi ma'lumot bazasini yangilashingiz kerak."
+
+#~ msgid "Cancel"
+#~ msgstr "Bekor qilish"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "Faylini saqlab bo'lmadi"
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 3d3e76f1..2a9906d9 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uz\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: 2007-09-13 16:43+0200\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -243,7 +243,7 @@ msgstr ""
msgid "Warning"
msgstr "Диққат"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "Ок"
@@ -302,7 +302,7 @@ msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d-та пакет, %d Мб)"
-#: ../gurpmi2:287 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:304
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
@@ -339,38 +339,42 @@ msgstr "...олиш муваффақиятсиз тугади: %s"
msgid "_Done"
msgstr "_Тайёр"
-#: ../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 "Ўрнатиш муваффақиятсиз тугади:"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Ўрнатиш муваффақиятсиз тугади, баъзи бир файллар етишмайди:\n"
"%s\n"
"Балки 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 "Ўрнатиш муваффақиятсиз тугади:"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Ҳамма нарса аллақачон ўрнатилган"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Ўрнатиш тугади"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "%s ўчирилмоқда"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "urpmi қайтадан ишга тушмоқда"
@@ -501,57 +505,57 @@ msgstr ""
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM-файлини (%s) ўқиб бўлмади\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Имзо етишмайди (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 "chroot директорияси мавжуд эмас"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "%s амалидан %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 "%s амалидан %s амали билан бирга фойдаланиб бўлмайди"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -598,7 +602,7 @@ msgstr "%s мослама файлини ўқиб бўлмади"
msgid "medium `%s' is defined twice, aborting"
msgstr "\"%s\" тўплами икки марта аниқланган, амал бекор қилинади"
-#: ../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 "мослама файлини (%s) ёзиб бўлмади"
@@ -713,22 +717,22 @@ msgstr " %s%% бажарилди, тезлик = %s"
msgid "retrieving %s"
msgstr "%s олинмоқда"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "%s олинди"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s учун номаълум протокол аниқланган"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "номаълум протокол: %s"
@@ -849,19 +853,12 @@ msgstr "%s маълумот базаси қулфланган. Кутилмоқ
msgid "aborting"
msgstr "тўхтатилмоқда"
-#: ../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 "Ўрнатиш муваффақиятсиз тугади:"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -869,14 +866,14 @@ msgstr ""
"%s\n"
"Балки urpmi маълумот базасини янгилашингиз керак."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Ўрнатиш муваффақиятсиз тугади:"
-#: ../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 "
@@ -884,68 +881,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 "Ўрнатиш муваффақиятсиз тугади"
-
-#: ../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 "Қуйидаги пакетнинг имзоси хато"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Қуйидаги пакетларнинг имзолари нотўғри"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ўрнатишни давом этишни истайсизми?"
-#: ../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 "Ўрнатиш муваффақиятсиз тугади"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "тўплам олиб ташланмоқда: \"%s\""
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %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 "ўрнатилмоқда: %s, қаердан: %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "%s ўрнатилмоқда"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr ""
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Боғлиқликларни текширмасдан ўрнатиб кўрайми? (ҳ/Й) "
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "%s'ни ўрнатиш учун"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "Пакетларни янгилаш муҳтожи йўқ"
-#: ../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 "Ўрнатиш мумкин"
@@ -1473,37 +1470,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "%s пакетларини ўрнатиб бўлмайди"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "%s пакети аллақачон ўрнатилган"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "%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 ""
-#: ../urpm/select.pm:574 ../urpm/select.pm:654
+#: ../urpm/select.pm:573 ../urpm/select.pm:653
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "%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"
@@ -1512,7 +1509,7 @@ msgstr ""
"Бошқа пакетларни янгилаш учун қуйидаги пакетни олиб ташлаш керак:\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"
@@ -1521,12 +1518,12 @@ msgstr ""
"Бошқа пакетларни янгилаш учун қуйидаги пакетларни олиб ташлаш керак:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "%s'ни ўрнатиш учун"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "%s етишмаганига кўра"
@@ -2494,12 +2491,7 @@ msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d-та пакетни ўрнатиш билан давом этишни истайсизми?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Бекор қилиш"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Тайёр бўлганда ENTER тугмасини босинг..."
@@ -3191,29 +3183,29 @@ msgstr "--list-nodes'дан фақат --parallel билан бирга фойд
msgid "use -l to list files"
msgstr ""
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Changelog файли топилмади\n"
@@ -3226,6 +3218,18 @@ msgstr "Дастур ўрнатувчиси"
msgid "Graphical front end to install RPM files"
msgstr "RPM файлларини ўрнатиш учун график интерфейс"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Ўрнатиш муваффақиятсиз тугади, баъзи бир файллар етишмайди:\n"
+#~ "%s\n"
+#~ "Балки urpmi маълумот базасини янгилашингиз керак."
+
+#~ msgid "Cancel"
+#~ msgstr "Бекор қилиш"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "Файлини сақлаб бўлмади"
diff --git a/po/vi.po b/po/vi.po
index b64ea317..f91584e5 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-vi\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: 2005-06-08 15:13+0700\n"
"Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -251,7 +251,7 @@ msgstr ""
msgid "Warning"
msgstr "Cảnh báo"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "OK"
@@ -310,7 +310,7 @@ msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d các gói, %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 "không thể lấy các gói nguồn, hủy bỏ"
@@ -347,38 +347,42 @@ msgstr "...không thu thập được: %s"
msgid "_Done"
msgstr "H_oàn thành"
-#: ../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 "Cài đặt không được"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
msgstr ""
"Cài đặt lỗi, thiếu một số tập tin:\n"
"%s\n"
"Có thể bạn nên cập nhật cơ sở dữ liệu của 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
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Cài đặt không được"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "Mọi thứ đã được cài đặt rồi"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "Kết thúc cài đặt"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "gỡ bỏ %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "khởi chạy lại urpmi"
@@ -507,57 +511,57 @@ msgstr "lỗi đăng ký các gói tin cục bộ"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../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 "khai báo proxy sai trong dòng lệnh\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: không thể đọc tập tin rpm \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Thiếu chữ ký (%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
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../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 ""
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr ""
@@ -604,7 +608,7 @@ msgstr "Không thể ghi tập tin cấu hình [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../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 "Không thể ghi tập tin cấu hình [%s]"
@@ -719,22 +723,22 @@ msgstr ""
msgid "retrieving %s"
msgstr "gỡ bỏ %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...không thu thập được: %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "chỉ định giao thức không xác định cho %s"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "không thấy webfetch nào, webfetch được hỗ trợ là: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "không thể quản lý giao thức: %s"
@@ -857,19 +861,12 @@ msgstr "cơ sở dữ liệu urpmi bị khóa"
msgid "aborting"
msgstr "Cảnh báo"
-#: ../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 "Cài đặt không được"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, fuzzy, c-format
msgid "You may need to update your urpmi database."
msgstr ""
@@ -877,14 +874,14 @@ msgstr ""
"%s\n"
"Có thể bạn nên cập nhật cơ sở dữ liệu của urpmi."
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Cài đặt không được"
-#: ../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 "
@@ -892,68 +889,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 "Cài đặt không được"
-
-#: ../urpm/main_loop.pm:174
-#, c-format
-msgid "Try to continue anyway?"
-msgstr ""
-
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Các gói tin sau đây có các chữ ký tồi"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "Các gói tin sau đây có các chữ ký tồi"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Bạn muốn tiếp tục cài đặt không ?"
-#: ../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 "Cài đặt không được"
+
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "cài đặt %s từ %s"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "phân phối %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 "cài đặt %s từ %s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "đang cài đặt %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "phân phối %s"
+
+#: ../urpm/main_loop.pm:264
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "Thử cài đặt mà không cần kiểm tra các phụ thuộc? (Có/Không)"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "Thử cố gắng cài đặt (--force)? (Có/[Không])"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../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 "Có khả năng cài đặt"
@@ -1483,37 +1480,37 @@ msgstr ""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Mọi thứ đã được cài đặt rồi"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Mọi thứ đã được cài đặt rồi"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Mọi thứ đã được cài đặt rồi"
-#: ../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 "vì xung đột với %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 "vì không thỏa mãn %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "thử xúc tiến %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "để giữ %s"
-#: ../urpm/select.pm:622
+#: ../urpm/select.pm:621
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1522,7 +1519,7 @@ msgstr ""
"Các gói sau đây phải được gỡ bỏ để nâng cấp các gói khác:\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"
@@ -1531,12 +1528,12 @@ msgstr ""
"Các gói sau đây phải được gỡ bỏ để nâng cấp các gói khác:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "để cài đặt %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "do thiếu %s"
@@ -2541,12 +2538,7 @@ msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "Bỏ qua"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Nhấn Enter khi sẵn sàng ..."
@@ -3253,21 +3245,21 @@ msgstr "--list-nodes chỉ được dùng với --parallel"
msgid "use -l to list files"
msgstr "không thể ghi tập danh sách của \"%s\""
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"Lưu ý: vì không có phương tiện được tìm kiếm dùng hdlists, urpmf không thể "
"trả lại kết quả\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"Lưu ý: vì không có phương tiện được tìm kiếm dùng hdlists, urpmf không thể "
"trả lại kết quả\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3275,7 +3267,7 @@ msgstr ""
"Lưu ý: vì không có phương tiện được tìm kiếm dùng hdlists, urpmf không thể "
"trả lại kết quả\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3283,7 +3275,7 @@ msgstr ""
"Lưu ý: vì không có phương tiện được tìm kiếm dùng hdlists, urpmf không thể "
"trả lại kết quả\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "Không thấy changelog\n"
@@ -3296,6 +3288,18 @@ msgstr "Trình cài đặt phần mềm"
msgid "Graphical front end to install RPM files"
msgstr "Một Frontend đồ họa để cài đặt các tập tin RPM"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "Cài đặt lỗi, thiếu một số tập tin:\n"
+#~ "%s\n"
+#~ "Có thể bạn nên cập nhật cơ sở dữ liệu của urpmi."
+
+#~ msgid "Cancel"
+#~ msgstr "Bỏ qua"
+
#, fuzzy
#~ msgid "Cannot write DUDF file.\n"
#~ msgstr "không thể ghi tập tin [%s]"
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]"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6303792b..23911297 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,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: 2008-03-30 14:22+0800\n"
"Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
"Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -253,7 +253,7 @@ msgstr ""
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "确定"
@@ -312,7 +312,7 @@ msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d 个软件包,%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 "无法读取源软件包,中止"
@@ -349,38 +349,41 @@ msgstr "...获取失败: %s"
msgid "_Done"
msgstr "完成(_D)"
-#: ../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 ""
-"安装失败,缺少下列文件:\n"
-"%s\n"
-"您可能需要更新您的 urpmi 数据库"
+"安装失败,缺少某些文件:\n"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "您可能需要更新您的 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 "安装失败: "
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "软件包已经安装"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "安装完成"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "正在删除 %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "重新启动 urpmi"
@@ -509,57 +512,57 @@ msgstr "注册本地软件包出错"
msgid "This operation is forbidden while running in restricted mode"
msgstr "运行于限制模式运行时,禁止执行此操作"
-#: ../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 "命令行声明的代理服务器无效\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "意外表达式 %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "%s 前缺少表达式"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "意外表达式 %s(建议:使用 -a 或 -o?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "没有要关闭的表达式"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "默认情况下,urpmf 使用正则表达式。您应该使用选项“--literal”"
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot 目录不存在"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "没有 %2$s 无法使用 %1$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 "无法和 %2$s 一起使用 %1$s"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "参数太多\n"
@@ -606,7 +609,7 @@ msgstr "无法读取配置文件[%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "介质“%s”定义了两次,正在退出"
-#: ../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 "无法写入配置文件[%s]"
@@ -721,22 +724,22 @@ msgstr " %s%% 已完成,速度为 %s"
msgid "retrieving %s"
msgstr "正在获取 %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr "已获取 %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s 中定义了未知的协议"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "未找到 webfetch,支持的 webfetch 是: %s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "无法处理协议: %s"
@@ -857,26 +860,17 @@ msgstr "%s 数据库已锁定。等候中..."
msgid "aborting"
msgstr "中止"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "重试一次吗?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"安装失败,缺少某些文件:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "您可能需要更新您的 urpmi 数据库。"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -885,7 +879,7 @@ msgstr ""
"安装失败,rpm 有问题:\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 "
@@ -895,68 +889,68 @@ msgstr ""
"您的文件系统中没有足够空间可用来下载全部软件包(需要 %s,但只有 %s)。\n"
"您确定想要继续吗?"
-#: ../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 "安装失败"
-
-#: ../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 "下列软件包的签名有错误"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "下列软件包的签名有错误"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "您想继续安装吗?"
-#: ../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 "安装失败"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "删除已安装的 rpm(%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "正在分发 %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 "正在从 %2$s 安装 %1$s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "正在安装 %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "正在分发 %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "尝试忽略相关性检查而安装吗?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "尝试强制安装吗(使用 --force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "软件包已为最新"
-#: ../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 "可以安装"
@@ -1484,37 +1478,37 @@ msgstr "您应该使用“-a”来全部使用"
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "在 urpmi 数据库中找到软件包 %s,但全部都未安装"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "软件包 %s 已经安装"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "软件包 %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 "原因是与 %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 "原因是不满足 %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "正在试图推广 %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "为了保留 %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"
@@ -1523,7 +1517,7 @@ msgstr ""
"要升级其它软件包,需要先删除下列软件包:\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"
@@ -1532,12 +1526,12 @@ msgstr ""
"要升级其它软件包,需要先删除下列软件包:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "为了安装 %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "原因是丢失 %s"
@@ -2515,12 +2509,7 @@ msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "继续安装 %d 个软件包吗?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "取消"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "挂载后按 Enter..."
@@ -3225,29 +3214,29 @@ msgstr "--list-nodes 仅能和 --parallel 一起使用"
msgid "use -l to list files"
msgstr "使用 -l 可列出文件"
-#: ../urpmq:424
+#: ../urpmq:420
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "由于介质“%s”没有 xml 信息,软件包 %s 只返回部分结果"
-#: ../urpmq:425
+#: ../urpmq:421
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr "由于介质“%s”没有 xml 信息,软件包 %s 只返回部分结果"
-#: ../urpmq:428
+#: ../urpmq:424
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr "由于介质“%s”没有 xml 信息,软件包 %s 无法返回任何结果"
-#: ../urpmq:429
+#: ../urpmq:425
#, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr "由于介质“%s”没有 xml 信息,软件包 %s 无法返回任何结果"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "没有找到更新日志\n"
@@ -3260,6 +3249,18 @@ msgstr "软件安装程序"
msgid "Graphical front end to install RPM files"
msgstr "图形化安装 RPM 软件包"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "安装失败,缺少下列文件:\n"
+#~ "%s\n"
+#~ "您可能需要更新您的 urpmi 数据库"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 995aa71b..da5b40a6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: zh_TW\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: 2008-11-01 10:40+0800\n"
"Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -262,7 +262,7 @@ msgstr ""
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:155 ../urpmi:642
+#: ../gurpmi2:155
#, c-format
msgid "Ok"
msgstr "確定"
@@ -321,7 +321,7 @@ msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d 個套件,共 %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 "無法取得原始碼套件,放棄"
@@ -358,38 +358,41 @@ msgstr "...擷取失敗:%s"
msgid "_Done"
msgstr "完成 (_D)"
-#: ../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 ""
"安裝失敗,某些檔案遺失:\n"
-"%s\n"
-"您或許要更新您的 urpmi 資料庫"
+"%s"
+
+#: ../gurpmi2:405
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr "您或許要更新您的 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 "安裝失敗;"
-#: ../gurpmi2:413
+#: ../gurpmi2:414
#, c-format
msgid "The package(s) are already installed"
msgstr "每個套件都已經安裝了"
-#: ../gurpmi2:415
+#: ../gurpmi2:416
#, c-format
msgid "Installation finished"
msgstr "安裝完畢"
-#: ../gurpmi2:416 ../urpme:169
+#: ../gurpmi2:417 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "正在移除 %s"
-#: ../gurpmi2:427 ../urpmi:705
+#: ../gurpmi2:428 ../urpmi:695
#, c-format
msgid "restarting urpmi"
msgstr "正在重新啟動 urpmi"
@@ -518,57 +521,57 @@ msgstr "註冊本地端套件錯誤"
msgid "This operation is forbidden while running in restricted mode"
msgstr "使用限制模式執行時禁止該操作程序"
-#: ../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 "命令列傳入的代理伺服器宣告錯誤\n"
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq:無法讀取 rpm 檔案 \"%s\"\n"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "未預期的表示式 %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "在 %s 前找不到表示式"
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "非預期的表示式 %s(建議:使用 -a 或 -o?)"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:394
#, fuzzy, c-format
msgid "no expression to close"
msgstr "樣版表示式:\n"
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "預設 urpmf 需要正規表示式。您應該使用 \"--literal\" 選項"
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:477
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot 目錄不存在"
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:500
#, c-format
msgid "Can't use %s without %s"
msgstr "使用 %s 時不能沒有 %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 "%s 不能跟 %s 一起用"
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:514
#, c-format
msgid "Too many arguments\n"
msgstr "參數太多\n"
@@ -615,7 +618,7 @@ msgstr "無法讀取設定檔 [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "媒體 '%s' 被定義了兩次,正在取消"
-#: ../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 "無法寫入設定檔 [%s]"
@@ -730,22 +733,22 @@ msgstr " %s%% 完成,速度 = %s"
msgid "retrieving %s"
msgstr "正在取得 %s"
-#: ../urpm/download.pm:890
+#: ../urpm/download.pm:894
#, c-format
msgid "retrieved %s"
msgstr ".已取得 %s"
-#: ../urpm/download.pm:954
+#: ../urpm/download.pm:958
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s 中定義了未知的通訊協定"
-#: ../urpm/download.pm:968
+#: ../urpm/download.pm:972
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "沒有找到 webfetch,支援的 webfetch 有:%s\n"
-#: ../urpm/download.pm:983
+#: ../urpm/download.pm:987
#, c-format
msgid "unable to handle protocol: %s"
msgstr "無法處理通訊協定:%s"
@@ -866,26 +869,17 @@ msgstr "%s 資料庫已被鎖定。等待中..."
msgid "aborting"
msgstr "放棄"
-#: ../urpm/main_loop.pm:79
+#: ../urpm/main_loop.pm:45
#, c-format
msgid "Retry?"
msgstr "重試?"
-#: ../urpm/main_loop.pm:89
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s"
-msgstr ""
-"安裝失敗,某些檔案遺失:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:92
+#: ../urpm/main_loop.pm:72
#, c-format
msgid "You may need to update your urpmi database."
msgstr "您或許要更新您的 urpmi 資料庫。"
-#: ../urpm/main_loop.pm:95
+#: ../urpm/main_loop.pm:75
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -894,7 +888,7 @@ msgstr ""
"安裝失敗,損毀的套件:\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 "
@@ -904,68 +898,68 @@ msgstr ""
"您的檔案系統沒有足夠的空間下載所有的套件(需要 %s 但只有 %s)。\n"
"您確定要繼續嗎?"
-#: ../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 "安裝失敗"
-
-#: ../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 "下列套件有不正確的簽章"
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:125
#, c-format
msgid "The following packages have bad signatures"
msgstr "下列套件有不正確的簽章"
-#: ../urpm/main_loop.pm:200
+#: ../urpm/main_loop.pm:126
#, c-format
msgid "Do you want to continue installation ?"
msgstr "您要繼續安裝嗎?"
-#: ../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 "安裝失敗"
+
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "removing installed rpms (%s)"
msgstr "正在移除已安裝的套件 (%s)"
-#: ../urpm/main_loop.pm:237
+#: ../urpm/main_loop.pm:160
#, c-format
-msgid "distributing %s"
-msgstr "正在發佈 %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 "正在由 %2$s 安裝 %1$s"
-#: ../urpm/main_loop.pm:254
+#: ../urpm/main_loop.pm:211
#, c-format
msgid "installing %s"
msgstr "正在安裝 %s"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:218
+#, c-format
+msgid "distributing %s"
+msgstr "正在發佈 %s"
+
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Try installation without checking dependencies?"
msgstr "嘗試不檢查相依性直接安裝?"
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Try harder to install (--force)?"
msgstr "嘗試採用強制安裝的方式 (--force)?"
-#: ../urpm/main_loop.pm:345
+#: ../urpm/main_loop.pm:431
#, c-format
msgid "Packages are up to date"
msgstr "套件都已經更新了"
-#: ../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 "可以安裝"
@@ -1490,37 +1484,37 @@ msgstr "要指定所有的套件,您可以用 \"-a\""
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "在 urpmi 資料庫中找到套件 %s,但是並未安裝"
-#: ../urpm/select.pm:555
+#: ../urpm/select.pm:554
#, c-format
msgid "Package %s is already installed"
msgstr "%s 套件已經安裝了"
-#: ../urpm/select.pm:556
+#: ../urpm/select.pm:555
#, c-format
msgid "Packages %s are already installed"
msgstr "%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 "由於與 %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 "由於未滿足 %s"
-#: ../urpm/select.pm:580
+#: ../urpm/select.pm:579
#, c-format
msgid "trying to promote %s"
msgstr "正在試著促進 %s"
-#: ../urpm/select.pm:581
+#: ../urpm/select.pm:580
#, c-format
msgid "in order to keep %s"
msgstr "為了要保留 %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"
@@ -1529,7 +1523,7 @@ msgstr ""
"下列套件必須移除給其他套件來升級:\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"
@@ -1538,12 +1532,12 @@ msgstr ""
"下列套件必須移除給其他套件來升級:\n"
"%s"
-#: ../urpm/select.pm:650
+#: ../urpm/select.pm:649
#, c-format
msgid "in order to install %s"
msgstr "為了要安裝 %s"
-#: ../urpm/select.pm:656
+#: ../urpm/select.pm:655
#, c-format
msgid "due to missing %s"
msgstr "由於遺失了 %s"
@@ -2525,12 +2519,7 @@ msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "繼續安裝這 %d 個套件?"
-#: ../urpmi:642
-#, c-format
-msgid "Cancel"
-msgstr "取消"
-
-#: ../urpmi:650
+#: ../urpmi:643
#, c-format
msgid "Press Enter when mounted..."
msgstr "掛載好後請按 Enter..."
@@ -3233,33 +3222,33 @@ msgstr "--list-nodes 參數只能夠配合 --parallel 參數一起使用"
msgid "use -l to list files"
msgstr "使用 -l 列出檔案"
-#: ../urpmq:424
+#: ../urpmq:420
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
"注意:因為所有搜尋過的媒體都沒有使用 hdlists,所以 urpmf 無法回傳任何結果\n"
-#: ../urpmq:425
+#: ../urpmq:421
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
"注意:因為所有搜尋過的媒體都沒有使用 hdlists,所以 urpmf 無法回傳任何結果\n"
-#: ../urpmq:428
+#: ../urpmq:424
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"注意:因為所有搜尋過的媒體都沒有使用 hdlists,所以 urpmf 無法回傳任何結果\n"
-#: ../urpmq:429
+#: ../urpmq:425
#, fuzzy, c-format
msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"注意:因為所有搜尋過的媒體都沒有使用 hdlists,所以 urpmf 無法回傳任何結果\n"
-#: ../urpmq:496
+#: ../urpmq:492
#, c-format
msgid "No changelog found\n"
msgstr "沒有找到更新紀錄\n"
@@ -3272,6 +3261,18 @@ msgstr "軟體安裝程式"
msgid "Graphical front end to install RPM files"
msgstr "RPM 檔案安裝的圖形化前端"
+#~ msgid ""
+#~ "Installation failed, some files are missing:\n"
+#~ "%s\n"
+#~ "You may want to update your urpmi database"
+#~ msgstr ""
+#~ "安裝失敗,某些檔案遺失:\n"
+#~ "%s\n"
+#~ "您或許要更新您的 urpmi 資料庫"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
#, fuzzy
#~ msgid ""
#~ "# Here are logs of your DUDF uploads.\n"